From c01cfac552861ca4d82e359791a2d79da7f80cb5 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Wed, 23 Dec 2009 14:40:20 -0800 Subject: device assignment: default requires IOMMU The default mode for device assignment is to rely on an IOMMU for proper translations and a functioning device in the guest. The current logic makes this requirement advisory, and simply disables the request for IOMMU if one is not found on the host. This makes for a confused user when the device assignment appears to work, but the device in the guest is not functioning (I've seen about a half-dozen reports with this failure mode). Change the logic such that the default requires the IOMMU. Period. If the host does not have an IOMMU, device assignment will fail. This is a user visible change, however I think the current situation is simply broken. And, of course, disabling the IOMMU requirement using the old: -pcidevice host=[addr],dma=none or the newer: -device pci-assign,host=[addr],iommu=0 will do what it always did (not require an IOMMU, and fail to work properly). Cc: Alexander Graf Cc: Dmitri Seletski Cc: Sheng Yang Signed-off-by: Chris Wright Signed-off-by: Marcelo Tosatti --- hw/device-assignment.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/hw/device-assignment.c b/hw/device-assignment.c index fb04047aa..5564504d9 100644 --- a/hw/device-assignment.c +++ b/hw/device-assignment.c @@ -639,14 +639,15 @@ static int assign_device(AssignedDevice *dev) assigned_dev_data.devfn = dev->h_devfn; #ifdef KVM_CAP_IOMMU - /* We always enable the IOMMU if present - * (or when not disabled on the command line) - */ - r = kvm_check_extension(kvm_state, KVM_CAP_IOMMU); - if (!r) - dev->use_iommu = 0; - if (dev->use_iommu) - assigned_dev_data.flags |= KVM_DEV_ASSIGN_ENABLE_IOMMU; + /* We always enable the IOMMU unless disabled on the command line */ + if (dev->use_iommu) { + if (!kvm_check_extension(kvm_state, KVM_CAP_IOMMU)) { + fprintf(stderr, "No IOMMU found. Unable to assign device \"%s\"\n", + dev->dev.qdev.id); + return -ENODEV; + } + assigned_dev_data.flags |= KVM_DEV_ASSIGN_ENABLE_IOMMU; + } #else dev->use_iommu = 0; #endif -- cgit v1.2.3