hostdev: skip ACS check when using VFIO for device assignment

The ACS checks are meaningless when using the more modern VFIO driver
for device assignment since VFIO has its own more complete and exact
checks, but I didn't realize that when I added support for VFIO. This
patch eliminates the ACS check when preparing PCI devices for
assignment if VFIO is being used.

This resolves:

  https://bugzilla.redhat.com/show_bug.cgi?id=1256486

(cherry picked from commit 108d591b1144bc6cb5d1199f6fc23ee972b76e86)
This commit is contained in:
Laine Stump 2015-08-26 02:04:23 -04:00 committed by Cole Robinson
parent 2c1a8f02bf
commit 4a03dc50a3

View File

@ -1,6 +1,6 @@
/* virhostdev.c: hostdev management /* virhostdev.c: hostdev management
* *
* Copyright (C) 2006-2007, 2009-2013 Red Hat, Inc. * Copyright (C) 2006-2007, 2009-2015 Red Hat, Inc.
* Copyright (C) 2006 Daniel P. Berrange * Copyright (C) 2006 Daniel P. Berrange
* Copyright (C) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. * Copyright (C) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
* *
@ -230,7 +230,6 @@ virHostdevGetPCIHostDeviceList(virDomainHostdevDefPtr *hostdevs, int nhostdevs)
virObjectUnref(list); virObjectUnref(list);
return NULL; return NULL;
} }
if (virPCIDeviceListAdd(list, dev) < 0) { if (virPCIDeviceListAdd(list, dev) < 0) {
virPCIDeviceFree(dev); virPCIDeviceFree(dev);
virObjectUnref(list); virObjectUnref(list);
@ -579,7 +578,7 @@ virHostdevPreparePCIDevices(virHostdevManagerPtr hostdev_mgr,
struct virHostdevIsPCINodeDeviceUsedData data = {hostdev_mgr, dom_name, struct virHostdevIsPCINodeDeviceUsedData data = {hostdev_mgr, dom_name,
usesVfio}; usesVfio};
if (!virPCIDeviceIsAssignable(dev, strict_acs_check)) { if (!usesVfio && !virPCIDeviceIsAssignable(dev, strict_acs_check)) {
virReportError(VIR_ERR_OPERATION_INVALID, virReportError(VIR_ERR_OPERATION_INVALID,
_("PCI device %s is not assignable"), _("PCI device %s is not assignable"),
virPCIDeviceGetName(dev)); virPCIDeviceGetName(dev));