On 8/20/19 11:30 AM, Michal Privoznik wrote:

KVM style of PCI devices assignment was dropped in kernel in favor of vfio pci (see kernel commit v4.12-rc1~68^2~65). Since vfio is around for quite some time now and is far superior discourage people in using KVM style.

Ideally, I'd make QEMU_CAPS_VFIO_PCI implicitly assumed but turns out qemu-3.0.0 doesn't support vfio-pci device for RISC-V.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 6 ----- src/qemu/qemu_command.c | 26 ++------------------- src/qemu/qemu_command.h | 1 - src/qemu/qemu_driver.c | 14 ++++-------- src/qemu/qemu_hostdev.c | 44 +++--------------------------------- src/qemu/qemu_hostdev.h | 1 - src/qemu/qemu_hotplug.c | 20 ++-------------- tests/domaincapstest.c | 3 +-- 8 files changed, 12 insertions(+), 103 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index c9677315ab..73300128ea 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5338,7 +5338,6 @@ static int virQEMUCapsFillDomainDeviceHostdevCaps(virQEMUCapsPtr qemuCaps, virDomainCapsDeviceHostdevPtr hostdev) { - bool supportsPassthroughKVM = qemuHostdevHostSupportsPassthroughLegacy(); bool supportsPassthroughVFIO = qemuHostdevHostSupportsPassthroughVFIO();

hostdev->supported = VIR_TRISTATE_BOOL_YES; @@ -5374,11 +5373,6 @@ virQEMUCapsFillDomainDeviceHostdevCaps(virQEMUCapsPtr qemuCaps, VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO); }

- if (supportsPassthroughKVM) { - VIR_DOMAIN_CAPS_ENUM_SET(hostdev->pciBackend, - VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT, - VIR_DOMAIN_HOSTDEV_PCI_BACKEND_KVM); - } return 0; }

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index e3f4ef624b..f7b5430db8 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4904,7 +4904,6 @@ char * qemuBuildPCIHostdevDevStr(const virDomainDef *def, virDomainHostdevDefPtr dev, unsigned int bootIndex, /* used iff dev->info->bootIndex == 0 */ - const char *configfd, virQEMUCapsPtr qemuCaps) { virBuffer buf = VIR_BUFFER_INITIALIZER; @@ -4913,16 +4912,11 @@ qemuBuildPCIHostdevDevStr(const virDomainDef *def,

/* caller has to assign proper passthrough backend type */ switch ((virDomainHostdevSubsysPCIBackendType)backend) { - case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_KVM: - virBufferAddLit(&buf, "pci-assign"); - if (configfd && *configfd) - virBufferAsprintf(&buf, ",configfd=%s", configfd); - break; - case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO: virBufferAddLit(&buf, "vfio-pci"); break;

+ case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_KVM: case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT: case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_XEN: case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_TYPE_LAST: @@ -5676,7 +5670,6 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd, } }

- char *configfd_name = NULL; unsigned int bootIndex = hostdev->info->bootIndex;

/* bootNet will be non-0 if boot order was set and no other @@ -5686,27 +5679,12 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd, bootIndex = *bootHostdevNet; *bootHostdevNet = 0; } - if (backend != VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) { - int configfd = qemuOpenPCIConfig(hostdev); - - if (configfd >= 0) { - if (virAsprintf(&configfd_name, "%d", configfd) < 0) { - VIR_FORCE_CLOSE(configfd); - return -1; - } - - virCommandPassFD(cmd, configfd, - VIR_COMMAND_PASS_FD_CLOSE_PARENT); - } - }

if (qemuCommandAddExtDevice(cmd, hostdev->info) < 0) return -1;

virCommandAddArg(cmd, "-device"); - devstr = qemuBuildPCIHostdevDevStr(def, hostdev, bootIndex, - configfd_name, qemuCaps); - VIR_FREE(configfd_name); + devstr = qemuBuildPCIHostdevDevStr(def, hostdev, bootIndex, qemuCaps); if (!devstr) return -1; virCommandAddArg(cmd, devstr); diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 7e2dc5a60a..e3983bedb2 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -148,7 +148,6 @@ char *qemuBuildMemoryDeviceStr(virDomainMemoryDefPtr mem, char *qemuBuildPCIHostdevDevStr(const virDomainDef *def, virDomainHostdevDefPtr dev, unsigned int bootIndex, - const char *configfd, virQEMUCapsPtr qemuCaps);

char *qemuBuildRNGDevStr(const virDomainDef *def, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 11f97dbc65..eb373c14d7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -13517,7 +13517,6 @@ qemuNodeDeviceDetachFlags(virNodeDevicePtr dev, int ret = -1; virNodeDeviceDefPtr def = NULL; char *xml = NULL; - bool legacy = qemuHostdevHostSupportsPassthroughLegacy(); bool vfio = qemuHostdevHostSupportsPassthroughVFIO(); virHostdevManagerPtr hostdev_mgr = driver->hostdevMgr;

@@ -13544,8 +13543,6 @@ qemuNodeDeviceDetachFlags(virNodeDevicePtr dev, if (!driverName) { if (vfio) { driverName = "vfio"; - } else if (legacy) { - driverName = "kvm"; } else { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("neither VFIO nor KVM device assignment is "

Right here comes the error message:             virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",                            _("neither VFIO nor KVM device assignment is "                              "currently supported on this system"));             goto cleanup; I think this message should refer only to VFIO in this case - there's already a KVM device assignment message down below. Thanks, DHB

@@ -13563,13 +13560,10 @@ qemuNodeDeviceDetachFlags(virNodeDevicePtr dev, } virPCIDeviceSetStubDriver(pci, VIR_PCI_STUB_DRIVER_VFIO); } else if (STREQ(driverName, "kvm")) { - if (!legacy) { - virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("KVM device assignment is currently not " - "supported on this system")); - goto cleanup; - } - virPCIDeviceSetStubDriver(pci, VIR_PCI_STUB_DRIVER_KVM); + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("KVM device assignment is currently not " + "supported on this system")); + goto cleanup; } else { virReportError(VIR_ERR_INVALID_ARG, _("unknown driver name '%s'"), driverName); diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index 92b037e1ed..af41c32679 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -133,44 +133,11 @@ qemuHostdevHostSupportsPassthroughVFIO(void) }

-#if HAVE_LINUX_KVM_H -# include <linux/kvm.h> -bool -qemuHostdevHostSupportsPassthroughLegacy(void) -{ - int kvmfd = -1; - bool ret = false; - - if ((kvmfd = open("/dev/kvm", O_RDONLY)) < 0) - goto cleanup; - -# ifdef KVM_CAP_IOMMU - if ((ioctl(kvmfd, KVM_CHECK_EXTENSION, KVM_CAP_IOMMU)) <= 0) - goto cleanup; - - ret = true; -# endif - - cleanup: - VIR_FORCE_CLOSE(kvmfd); - - return ret; -} -#else -bool -qemuHostdevHostSupportsPassthroughLegacy(void) -{ - return false; -} -#endif - - static bool qemuHostdevPreparePCIDevicesCheckSupport(virDomainHostdevDefPtr *hostdevs, size_t nhostdevs, virQEMUCapsPtr qemuCaps) { - bool supportsPassthroughKVM = qemuHostdevHostSupportsPassthroughLegacy(); bool supportsPassthroughVFIO = qemuHostdevHostSupportsPassthroughVFIO(); size_t i;

@@ -189,8 +156,6 @@ qemuHostdevPreparePCIDevicesCheckSupport(virDomainHostdevDefPtr *hostdevs, if (supportsPassthroughVFIO && virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VFIO_PCI)) { *backend = VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO; - } else if (supportsPassthroughKVM) { - *backend = VIR_DOMAIN_HOSTDEV_PCI_BACKEND_KVM; } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("host doesn't support passthrough of " @@ -209,12 +174,9 @@ qemuHostdevPreparePCIDevicesCheckSupport(virDomainHostdevDefPtr *hostdevs, break;

case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_KVM: - if (!supportsPassthroughKVM) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("host doesn't support legacy PCI passthrough")); - return false; - } - + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("host doesn't support legacy PCI passthrough")); + return false; break;

case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_XEN: diff --git a/src/qemu/qemu_hostdev.h b/src/qemu/qemu_hostdev.h index f6d76c1c2a..e99c204961 100644 --- a/src/qemu/qemu_hostdev.h +++ b/src/qemu/qemu_hostdev.h @@ -24,7 +24,6 @@ #include "qemu_conf.h" #include "domain_conf.h"

-bool qemuHostdevHostSupportsPassthroughLegacy(void); bool qemuHostdevHostSupportsPassthroughVFIO(void);

int qemuHostdevUpdateActiveMediatedDevices(virQEMUDriverPtr driver, diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index d8be63b71c..63acb9c451 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1465,8 +1465,6 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver, virDomainDeviceInfoPtr info = hostdev->info; int ret; char *devstr = NULL; - int configfd = -1; - char *configfd_name = NULL; bool releaseaddr = false; bool teardowncgroup = false; bool teardownlabel = false; @@ -1547,13 +1545,6 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver, if (qemuDomainEnsurePCIAddress(vm, &dev, driver) < 0) goto error; releaseaddr = true; - if (backend != VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) { - configfd = qemuOpenPCIConfig(hostdev); - if (configfd >= 0) { - if (virAsprintf(&configfd_name, "fd-%s", info->alias) < 0) - goto error; - } - }

if (!virDomainObjIsActive(vm)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -1561,8 +1552,7 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver, goto error; }

- if (!(devstr = qemuBuildPCIHostdevDevStr(vm->def, hostdev, 0, - configfd_name, priv->qemuCaps))) + if (!(devstr = qemuBuildPCIHostdevDevStr(vm->def, hostdev, 0, priv->qemuCaps))) goto error;

qemuDomainObjEnterMonitor(driver, vm); @@ -1570,10 +1560,8 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver, if ((ret = qemuDomainAttachExtensionDevice(priv->mon, hostdev->info)) < 0) goto exit_monitor;

- if ((ret = qemuMonitorAddDeviceWithFd(priv->mon, devstr, - configfd, configfd_name)) < 0) { + if ((ret = qemuMonitorAddDevice(priv->mon, devstr)) < 0) ignore_value(qemuDomainDetachExtensionDevice(priv->mon, hostdev->info)); - }

exit_monitor: if (qemuDomainObjExitMonitor(driver, vm) < 0) @@ -1586,8 +1574,6 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver, vm->def->hostdevs[vm->def->nhostdevs++] = hostdev;

VIR_FREE(devstr); - VIR_FREE(configfd_name); - VIR_FORCE_CLOSE(configfd);

return 0;

@@ -1607,8 +1593,6 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver, qemuHostdevReAttachPCIDevices(driver, vm->def->name, &hostdev, 1);

VIR_FREE(devstr); - VIR_FREE(configfd_name); - VIR_FORCE_CLOSE(configfd);

cleanup: return -1; diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 45ecfe61ac..77acefa6b0 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -111,8 +111,7 @@ fillQemuCaps(virDomainCapsPtr domCaps, cfg->nfirmwares) < 0) goto cleanup;

- /* The function above tries to query host's KVM & VFIO capabilities by - * calling qemuHostdevHostSupportsPassthroughLegacy() and + /* The function above tries to query host's VFIO capabilities by calling * qemuHostdevHostSupportsPassthroughVFIO() which, however, can't be * successfully mocked as they are not exposed as internal APIs. Therefore, * instead of mocking set the expected values here by hand. */

On Tue, Aug 20, 2019 at 04:30:21PM +0200, Michal Privoznik wrote:

KVM style of PCI devices assignment was dropped in kernel in favor of vfio pci (see kernel commit v4.12-rc1~68^2~65). Since vfio is around for quite some time now and is far superior discourage people in using KVM style.

Ideally, I'd make QEMU_CAPS_VFIO_PCI implicitly assumed but turns out qemu-3.0.0 doesn't support vfio-pci device for RISC-V.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 6 ----- src/qemu/qemu_command.c | 26 ++------------------- src/qemu/qemu_command.h | 1 - src/qemu/qemu_driver.c | 14 ++++-------- src/qemu/qemu_hostdev.c | 44 +++--------------------------------- src/qemu/qemu_hostdev.h | 1 - src/qemu/qemu_hotplug.c | 20 ++-------------- tests/domaincapstest.c | 3 +-- 8 files changed, 12 insertions(+), 103 deletions(-)

diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 7e2dc5a60a..e3983bedb2 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -148,7 +148,6 @@ char *qemuBuildMemoryDeviceStr(virDomainMemoryDefPtr mem, char *qemuBuildPCIHostdevDevStr(const virDomainDef *def, virDomainHostdevDefPtr dev, unsigned int bootIndex, - const char *configfd, virQEMUCapsPtr qemuCaps);

char *qemuBuildRNGDevStr(const virDomainDef *def, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 11f97dbc65..eb373c14d7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -13517,7 +13517,6 @@ qemuNodeDeviceDetachFlags(virNodeDevicePtr dev, int ret = -1; virNodeDeviceDefPtr def = NULL; char *xml = NULL; - bool legacy = qemuHostdevHostSupportsPassthroughLegacy(); bool vfio = qemuHostdevHostSupportsPassthroughVFIO(); virHostdevManagerPtr hostdev_mgr = driver->hostdevMgr;

@@ -13544,8 +13543,6 @@ qemuNodeDeviceDetachFlags(virNodeDevicePtr dev, if (!driverName) { if (vfio) { driverName = "vfio"; - } else if (legacy) { - driverName = "kvm"; } else { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("neither VFIO nor KVM device assignment is "

This whole condition can be just: if (!driverName) driverName = "vfio"; now that we would not be able to pick a different one.

@@ -13563,13 +13560,10 @@ qemuNodeDeviceDetachFlags(virNodeDevicePtr dev, } virPCIDeviceSetStubDriver(pci, VIR_PCI_STUB_DRIVER_VFIO); } else if (STREQ(driverName, "kvm")) { - if (!legacy) { - virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("KVM device assignment is currently not " - "supported on this system")); - goto cleanup; - } - virPCIDeviceSetStubDriver(pci, VIR_PCI_STUB_DRIVER_KVM); + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("KVM device assignment is currently not " + "supported on this system"));

s/currently not/no longer/ d/on this system/

+ goto cleanup; } else { virReportError(VIR_ERR_INVALID_ARG, _("unknown driver name '%s'"), driverName);

Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano

On 8/20/19 11:30 AM, Michal Privoznik wrote:

The KVM assignment was removed in qemu driver in previous commit. Remove it from domaincapstest too which is hard coding it.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml | 1 - tests/domaincapsschemadata/qemu_2.12.0-virt.aarch64.xml | 1 - tests/domaincapsschemadata/qemu_2.12.0.ppc64.xml | 1 - tests/domaincapsschemadata/qemu_2.12.0.s390x.xml | 1 - tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml | 1 - tests/domaincapsschemadata/qemu_2.6.0-virt.aarch64.xml | 1 - tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml | 1 - tests/domaincapsschemadata/qemu_2.6.0.ppc64.xml | 1 - tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml | 1 - tests/domaincapsschemadata/qemu_2.7.0.s390x.xml | 1 - tests/domaincapsschemadata/qemu_2.8.0-tcg.x86_64.xml | 1 - tests/domaincapsschemadata/qemu_2.8.0.s390x.xml | 1 - tests/domaincapsschemadata/qemu_2.8.0.x86_64.xml | 1 - tests/domaincapsschemadata/qemu_2.9.0-q35.x86_64.xml | 1 - tests/domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml | 1 - tests/domaincapsschemadata/qemu_2.9.0.x86_64.xml | 1 - tests/domaincapsschemadata/qemu_3.0.0.s390x.xml | 1 - tests/domaincapsschemadata/qemu_3.1.0.x86_64.xml | 1 - tests/domaincapsschemadata/qemu_4.0.0.s390x.xml | 1 - tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml | 1 - tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml | 1 - tests/domaincapstest.c | 1 - 22 files changed, 22 deletions(-)

Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com> Tested-by: Daniel Henrique Barboza <danielhb413@gmail.com>

diff --git a/tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml b/tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml index f14f245007..a2df336833 100644 --- a/tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml @@ -112,7 +112,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_2.12.0-virt.aarch64.xml b/tests/domaincapsschemadata/qemu_2.12.0-virt.aarch64.xml index cc65977f03..ed1af3224b 100644 --- a/tests/domaincapsschemadata/qemu_2.12.0-virt.aarch64.xml +++ b/tests/domaincapsschemadata/qemu_2.12.0-virt.aarch64.xml @@ -116,7 +116,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_2.12.0.ppc64.xml b/tests/domaincapsschemadata/qemu_2.12.0.ppc64.xml index 8c490fa4d1..99de2b0a8e 100644 --- a/tests/domaincapsschemadata/qemu_2.12.0.ppc64.xml +++ b/tests/domaincapsschemadata/qemu_2.12.0.ppc64.xml @@ -80,7 +80,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml b/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml index 18171f0db4..8d039f3514 100644 --- a/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml +++ b/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml @@ -172,7 +172,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml b/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml index 146041a6c1..109162ffd8 100644 --- a/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml @@ -145,7 +145,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_2.6.0-virt.aarch64.xml b/tests/domaincapsschemadata/qemu_2.6.0-virt.aarch64.xml index 778e27582f..13441b9923 100644 --- a/tests/domaincapsschemadata/qemu_2.6.0-virt.aarch64.xml +++ b/tests/domaincapsschemadata/qemu_2.6.0-virt.aarch64.xml @@ -113,7 +113,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml b/tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml index a01f5ef72f..974739c38e 100644 --- a/tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml +++ b/tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml @@ -111,7 +111,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_2.6.0.ppc64.xml b/tests/domaincapsschemadata/qemu_2.6.0.ppc64.xml index a74cece8b6..9f628a3652 100644 --- a/tests/domaincapsschemadata/qemu_2.6.0.ppc64.xml +++ b/tests/domaincapsschemadata/qemu_2.6.0.ppc64.xml @@ -84,7 +84,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml b/tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml index 949c5f8723..bb1f784328 100644 --- a/tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml @@ -119,7 +119,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_2.7.0.s390x.xml b/tests/domaincapsschemadata/qemu_2.7.0.s390x.xml index 8c66d6582a..322d12c719 100644 --- a/tests/domaincapsschemadata/qemu_2.7.0.s390x.xml +++ b/tests/domaincapsschemadata/qemu_2.7.0.s390x.xml @@ -77,7 +77,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_2.8.0-tcg.x86_64.xml b/tests/domaincapsschemadata/qemu_2.8.0-tcg.x86_64.xml index 6fa74e29b0..b6679a6e64 100644 --- a/tests/domaincapsschemadata/qemu_2.8.0-tcg.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_2.8.0-tcg.x86_64.xml @@ -120,7 +120,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_2.8.0.s390x.xml b/tests/domaincapsschemadata/qemu_2.8.0.s390x.xml index d27977242a..c7a4578f61 100644 --- a/tests/domaincapsschemadata/qemu_2.8.0.s390x.xml +++ b/tests/domaincapsschemadata/qemu_2.8.0.s390x.xml @@ -158,7 +158,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_2.8.0.x86_64.xml b/tests/domaincapsschemadata/qemu_2.8.0.x86_64.xml index b39aecb52b..3af3fcc4a9 100644 --- a/tests/domaincapsschemadata/qemu_2.8.0.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_2.8.0.x86_64.xml @@ -120,7 +120,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_2.9.0-q35.x86_64.xml b/tests/domaincapsschemadata/qemu_2.9.0-q35.x86_64.xml index 66b4a84c3f..aac295a20d 100644 --- a/tests/domaincapsschemadata/qemu_2.9.0-q35.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_2.9.0-q35.x86_64.xml @@ -129,7 +129,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml b/tests/domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml index e41571e11a..12537c039b 100644 --- a/tests/domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml @@ -152,7 +152,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_2.9.0.x86_64.xml b/tests/domaincapsschemadata/qemu_2.9.0.x86_64.xml index f9a8c490aa..80fc7e1657 100644 --- a/tests/domaincapsschemadata/qemu_2.9.0.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_2.9.0.x86_64.xml @@ -129,7 +129,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_3.0.0.s390x.xml b/tests/domaincapsschemadata/qemu_3.0.0.s390x.xml index 6dd5da07a5..0e81e2ea33 100644 --- a/tests/domaincapsschemadata/qemu_3.0.0.s390x.xml +++ b/tests/domaincapsschemadata/qemu_3.0.0.s390x.xml @@ -178,7 +178,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_3.1.0.x86_64.xml b/tests/domaincapsschemadata/qemu_3.1.0.x86_64.xml index 1958eb9beb..402848442f 100644 --- a/tests/domaincapsschemadata/qemu_3.1.0.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_3.1.0.x86_64.xml @@ -147,7 +147,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_4.0.0.s390x.xml b/tests/domaincapsschemadata/qemu_4.0.0.s390x.xml index 30062a2b23..e68f8e8d9a 100644 --- a/tests/domaincapsschemadata/qemu_4.0.0.s390x.xml +++ b/tests/domaincapsschemadata/qemu_4.0.0.s390x.xml @@ -184,7 +184,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml b/tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml index 8c6a622afe..1ffd5e3cc0 100644 --- a/tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml @@ -147,7 +147,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml b/tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml index 80ce931fbf..79b41ef6da 100644 --- a/tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml @@ -151,7 +151,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 77acefa6b0..dc50b326f3 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -117,7 +117,6 @@ fillQemuCaps(virDomainCapsPtr domCaps, * instead of mocking set the expected values here by hand. */ VIR_DOMAIN_CAPS_ENUM_SET(domCaps->hostdev.pciBackend, VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT, - VIR_DOMAIN_HOSTDEV_PCI_BACKEND_KVM, VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO);

/* As of f05b6a918e28 we are expecting to see OVMF_CODE.fd file which

On Tue, Aug 20, 2019 at 04:30:23PM +0200, Michal Privoznik wrote:

There are two places where we need to create virPCIDevice from given virDomainHostdevDef. In both places the code is duplicated. Move them into a single function and call it from those two places.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/util/virhostdev.c | 93 +++++++++++++++++++++++++------------------ 1 file changed, 54 insertions(+), 39 deletions(-)

diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c index 6861b8a84e..e3f48a9a2e 100644 --- a/src/util/virhostdev.c +++ b/src/util/virhostdev.c @@ -212,6 +212,51 @@ virHostdevManagerGetDefault(void) return virObjectRef(manager); }

+/** + * virHostdevGetPCIHostDevice: + * @hostdev: domain hostdev definition + * @pci: returned PCI device + * + * For given @hostdev which represents a PCI device construct its + * virPCIDevice representation and returned it in @pci. If

s/returned/return/

+ * @hostdev does not represent a PCI device then @pci is set to + * NULL and 0 is returned. + * + * Returns: 0 on success (@pci might be NULL though), + * -1 otherwise (with error reported). + */

Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano

On 8/20/19 11:30 AM, Michal Privoznik wrote:

After previous commits, the function is not used anymore. Remove it.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> ---

Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com> Tested-by: Daniel Henrique Barboza <danielhb413@gmail.com>

src/qemu/qemu_command.c | 22 ---------------------- src/qemu/qemu_command.h | 2 -- 2 files changed, 24 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f7b5430db8..500ffff035 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4878,28 +4878,6 @@ qemuBuildVideoCommandLine(virCommandPtr cmd, }

-int -qemuOpenPCIConfig(virDomainHostdevDefPtr dev) -{ - virDomainHostdevSubsysPCIPtr pcisrc = &dev->source.subsys.u.pci; - char *path = NULL; - int configfd = -1; - - if (virAsprintf(&path, "/sys/bus/pci/devices/%04x:%02x:%02x.%01x/config", - pcisrc->addr.domain, pcisrc->addr.bus, - pcisrc->addr.slot, pcisrc->addr.function) < 0) - return -1; - - configfd = open(path, O_RDWR, 0); - - if (configfd < 0) - virReportSystemError(errno, _("Failed opening %s"), path); - - VIR_FREE(path); - - return configfd; -} - char * qemuBuildPCIHostdevDevStr(const virDomainDef *def, virDomainHostdevDefPtr dev, diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index e3983bedb2..6f97e7bc0c 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -157,8 +157,6 @@ int qemuBuildRNGBackendProps(virDomainRNGDefPtr rng, virQEMUCapsPtr qemuCaps, virJSONValuePtr *props);

-int qemuOpenPCIConfig(virDomainHostdevDefPtr dev); - /* Current, best practice */ char *qemuBuildUSBHostdevDevStr(const virDomainDef *def, virDomainHostdevDefPtr dev,

On 8/20/19 11:30 AM, Michal Privoznik wrote:

Now that no one uses KVM style of PCI assignment we can safely remove 'pci-stub' backend.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> ---

Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com> Tested-by: Daniel Henrique Barboza <danielhb413@gmail.com>

src/util/virpci.c | 11 ----------- src/util/virpci.h | 1 - 2 files changed, 12 deletions(-)

diff --git a/src/util/virpci.c b/src/util/virpci.c index 4c7c26f981..9c9ffa55c2 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -54,7 +54,6 @@ VIR_ENUM_IMPL(virPCIStubDriver, VIR_PCI_STUB_DRIVER_LAST, "none", "pciback", /* XEN */ - "pci-stub", /* KVM */ "vfio-pci", /* VFIO */ );

@@ -1541,16 +1540,6 @@ virPCIDeviceReattach(virPCIDevicePtr dev, return -1; }

- /* Wait for device cleanup if it is qemu/kvm */ - if (virPCIDeviceGetStubDriver(dev) == VIR_PCI_STUB_DRIVER_KVM) { - int retries = 100; - while (virPCIDeviceWaitForCleanup(dev, "kvm_assigned_device") - && retries) { - usleep(100*1000); - retries--; - } - } - if (virPCIDeviceUnbindFromStub(dev) < 0) return -1;

diff --git a/src/util/virpci.h b/src/util/virpci.h index 5074851777..4ac0d230a4 100644 --- a/src/util/virpci.h +++ b/src/util/virpci.h @@ -59,7 +59,6 @@ struct _virPCIDeviceAddress { typedef enum { VIR_PCI_STUB_DRIVER_NONE = 0, VIR_PCI_STUB_DRIVER_XEN, - VIR_PCI_STUB_DRIVER_KVM, VIR_PCI_STUB_DRIVER_VFIO, VIR_PCI_STUB_DRIVER_LAST } virPCIStubDriver;

On 8/20/19 11:30 AM, Michal Privoznik wrote:

As stated in 84f9358b18346 all kernels that we are interested in have 'drivers_override'. Drop the other, older style of overriding PCI device driver - newid.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> ---

Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com> Tested-by: Daniel Henrique Barboza <danielhb413@gmail.com>

src/util/virpci.c | 284 +--------------------------------------------- 1 file changed, 2 insertions(+), 282 deletions(-)

diff --git a/src/util/virpci.c b/src/util/virpci.c index ea5be62033..6724a8ad9e 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -218,16 +218,6 @@ virPCIDriverDir(const char *driver) }

-static char * -virPCIDriverFile(const char *driver, const char *file) -{ - char *buffer; - - ignore_value(virAsprintf(&buffer, PCI_SYSFS "drivers/%s/%s", driver, file)); - return buffer; -} - - static char * virPCIFile(const char *device, const char *file) { @@ -1145,104 +1135,6 @@ virPCIDeviceBindWithDriverOverride(virPCIDevicePtr dev, return 0; }

-static int -virPCIDeviceUnbindFromStubWithNewid(virPCIDevicePtr dev) -{ - int result = -1; - VIR_AUTOFREE(char *) drvdir = NULL; - VIR_AUTOFREE(char *) path = NULL; - VIR_AUTOFREE(char *) driver = NULL; - - /* If the device is currently bound to one of the "well known" - * stub drivers, then unbind it, otherwise ignore it. - */ - if (virPCIDeviceGetDriverPathAndName(dev, &drvdir, &driver) < 0) - goto cleanup; - - if (!driver) { - /* The device is not bound to any driver and we are almost done. */ - VIR_DEBUG("PCI device %s is not bound to any driver", dev->name); - goto reprobe; - } - - if (!dev->unbind_from_stub) { - VIR_DEBUG("Unbind from stub skipped for PCI device %s", dev->name); - goto remove_slot; - } - - /* If the device isn't bound to a known stub, skip the unbind. */ - if (virPCIStubDriverTypeFromString(driver) < 0 || - virPCIStubDriverTypeFromString(driver) == VIR_PCI_STUB_DRIVER_NONE) { - VIR_DEBUG("Unbind from stub skipped for PCI device %s because of " - "unknown stub driver", dev->name); - goto remove_slot; - } - - VIR_DEBUG("Unbinding PCI device %s from stub driver %s", - dev->name, driver); - - if (virPCIDeviceUnbind(dev) < 0) - goto cleanup; - dev->unbind_from_stub = false; - - remove_slot: - if (!dev->remove_slot) { - VIR_DEBUG("Slot removal skipped for PCI device %s", dev->name); - goto reprobe; - } - - VIR_DEBUG("Removing slot for PCI device %s", dev->name); - - /* Xen's pciback.ko wants you to use remove_slot on the specific device */ - if (!(path = virPCIDriverFile(driver, "remove_slot"))) - goto cleanup; - - if (virFileExists(path) && virFileWriteStr(path, dev->name, 0) < 0) { - virReportSystemError(errno, - _("Failed to remove slot for PCI device '%s' from %s"), - dev->name, driver); - goto cleanup; - } - dev->remove_slot = false; - - reprobe: - if (!dev->reprobe) { - VIR_DEBUG("Reprobe skipped for PCI device %s", dev->name); - result = 0; - goto cleanup; - } - - VIR_DEBUG("Reprobing for PCI device %s", dev->name); - - /* Trigger a re-probe of the device is not in the stub's dynamic - * ID table. If the stub is available, but 'remove_id' isn't - * available, then re-probing would just cause the device to be - * re-bound to the stub. - */ - VIR_FREE(path); - if (driver && !(path = virPCIDriverFile(driver, "remove_id"))) - goto cleanup; - - if (!driver || !virFileExists(drvdir) || virFileExists(path)) { - if (virFileWriteStr(PCI_SYSFS "drivers_probe", dev->name, 0) < 0) { - virReportSystemError(errno, - _("Failed to trigger a re-probe for PCI device '%s'"), - dev->name); - goto cleanup; - } - } - - result = 0; - - cleanup: - /* do not do it again */ - dev->unbind_from_stub = false; - dev->remove_slot = false; - dev->reprobe = false; - - return result; -} - static int virPCIDeviceUnbindFromStubWithOverride(virPCIDevicePtr dev) { @@ -1257,167 +1149,7 @@ virPCIDeviceUnbindFromStubWithOverride(virPCIDevicePtr dev) static int virPCIDeviceUnbindFromStub(virPCIDevicePtr dev) { - VIR_AUTOFREE(char *) path = NULL; - - /* - * Prefer using the device's driver_override interface, falling back - * to the unpleasant new_id interface. - */ - if (!(path = virPCIFile(dev->name, "driver_override"))) - return -1; - - if (virFileExists(path)) - return virPCIDeviceUnbindFromStubWithOverride(dev); - - return virPCIDeviceUnbindFromStubWithNewid(dev); -} - -static int -virPCIDeviceBindToStubWithNewid(virPCIDevicePtr dev) -{ - int result = -1; - bool reprobe = false; - VIR_AUTOFREE(char *) stubDriverPath = NULL; - VIR_AUTOFREE(char *) driverLink = NULL; - VIR_AUTOFREE(char *) path = NULL; /* reused for different purposes */ - VIR_AUTOPTR(virError) err = NULL; - const char *stubDriverName = NULL; - - /* Check the device is configured to use one of the known stub drivers */ - if (dev->stubDriver == VIR_PCI_STUB_DRIVER_NONE) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("No stub driver configured for PCI device %s"), - dev->name); - return -1; - } else if (!(stubDriverName = virPCIStubDriverTypeToString(dev->stubDriver))) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown stub driver configured for PCI device %s"), - dev->name); - return -1; - } - - if (!(stubDriverPath = virPCIDriverDir(stubDriverName)) || - !(driverLink = virPCIFile(dev->name, "driver"))) - goto cleanup; - - if (virFileExists(driverLink)) { - if (virFileLinkPointsTo(driverLink, stubDriverPath)) { - /* The device is already bound to the correct driver */ - VIR_DEBUG("Device %s is already bound to %s", - dev->name, stubDriverName); - result = 0; - goto cleanup; - } - reprobe = true; - } - - /* Add the PCI device ID to the stub's dynamic ID table; - * this is needed to allow us to bind the device to the stub. - * Note: if the device is not currently bound to any driver, - * stub will immediately be bound to the device. Also, note - * that if a new device with this ID is hotplugged, or if a probe - * is triggered for such a device, it will also be immediately - * bound by the stub. - */ - if (!(path = virPCIDriverFile(stubDriverName, "new_id"))) - goto cleanup; - - if (virFileWriteStr(path, dev->id, 0) < 0) { - virReportSystemError(errno, - _("Failed to add PCI device ID '%s' to %s"), - dev->id, stubDriverName); - goto cleanup; - } - - /* check whether the device is bound to pci-stub when we write dev->id to - * ${stubDriver}/new_id. - */ - if (virFileLinkPointsTo(driverLink, stubDriverPath)) { - dev->unbind_from_stub = true; - dev->remove_slot = true; - result = 0; - goto remove_id; - } - - if (virPCIDeviceUnbind(dev) < 0) - goto remove_id; - - /* If the device was bound to a driver we'll need to reprobe later */ - dev->reprobe = reprobe; - - /* If the device isn't already bound to pci-stub, try binding it now. - */ - if (!virFileLinkPointsTo(driverLink, stubDriverPath)) { - /* Xen's pciback.ko wants you to use new_slot first */ - VIR_FREE(path); - if (!(path = virPCIDriverFile(stubDriverName, "new_slot"))) - goto remove_id; - - if (virFileExists(path) && virFileWriteStr(path, dev->name, 0) < 0) { - virReportSystemError(errno, - _("Failed to add slot for " - "PCI device '%s' to %s"), - dev->name, stubDriverName); - goto remove_id; - } - dev->remove_slot = true; - - VIR_FREE(path); - if (!(path = virPCIDriverFile(stubDriverName, "bind"))) - goto remove_id; - - if (virFileWriteStr(path, dev->name, 0) < 0) { - virReportSystemError(errno, - _("Failed to bind PCI device '%s' to %s"), - dev->name, stubDriverName); - goto remove_id; - } - dev->unbind_from_stub = true; - } - - result = 0; - - remove_id: - err = virSaveLastError(); - - /* If 'remove_id' exists, remove the device id from pci-stub's dynamic - * ID table so that 'drivers_probe' works below. - */ - VIR_FREE(path); - if (!(path = virPCIDriverFile(stubDriverName, "remove_id"))) { - /* We do not remove PCI ID from pci-stub, and we cannot reprobe it */ - if (dev->reprobe) { - VIR_WARN("Could not remove PCI ID '%s' from %s, and the device " - "cannot be probed again.", dev->id, stubDriverName); - } - dev->reprobe = false; - result = -1; - goto cleanup; - } - - if (virFileExists(path) && virFileWriteStr(path, dev->id, 0) < 0) { - virReportSystemError(errno, - _("Failed to remove PCI ID '%s' from %s"), - dev->id, stubDriverName); - - /* remove PCI ID from pci-stub failed, and we cannot reprobe it */ - if (dev->reprobe) { - VIR_WARN("Failed to remove PCI ID '%s' from %s, and the device " - "cannot be probed again.", dev->id, stubDriverName); - } - dev->reprobe = false; - result = -1; - goto cleanup; - } - - cleanup: - if (result < 0) - virPCIDeviceUnbindFromStub(dev); - - if (err) - virSetError(err); - - return result; + return virPCIDeviceUnbindFromStubWithOverride(dev); }

static int @@ -1463,19 +1195,7 @@ virPCIDeviceBindToStubWithOverride(virPCIDevicePtr dev) static int virPCIDeviceBindToStub(virPCIDevicePtr dev) { - VIR_AUTOFREE(char *) path = NULL; - - /* - * Prefer using the device's driver_override interface, falling back - * to the unpleasant new_id interface. - */ - if (!(path = virPCIFile(dev->name, "driver_override"))) - return -1; - - if (virFileExists(path)) - return virPCIDeviceBindToStubWithOverride(dev); - - return virPCIDeviceBindToStubWithNewid(dev); + return virPCIDeviceBindToStubWithOverride(dev); }

/* virPCIDeviceDetach:

On 8/20/19 11:30 AM, Michal Privoznik wrote:

Now that PCI attach/detach happens solely via driver_override these two files are no longer needed.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> ---

Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com> Tested-by: Daniel Henrique Barboza <danielhb413@gmail.com>

tests/virpcimock.c | 112 --------------------------------------------- 1 file changed, 112 deletions(-)

diff --git a/tests/virpcimock.c b/tests/virpcimock.c index bbec77975a..3157037913 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -68,14 +68,6 @@ char *fakerootdir; * created by us. There are some actions that we must take if some special * files are written to. Here's the list of files we watch: * - * /sys/bus/pci/drivers/<driver>/new_id: - * Learn the driver new vendor and device combination. - * Data in format "VVVV DDDD". - * - * /sys/bus/pci/drivers/<driver>/remove_id - * Make the driver forget about vendor and device. - * Data in format "VVVV DDDD". - * * /sys/bus/pci/drivers/<driver>/bind * Check if driver supports the device and bind driver to it (create symlink * called 'driver' pointing to the /sys/but/pci/drivers/<driver>). @@ -168,8 +160,6 @@ static int pci_driver_unbind(struct pciDriver *driver, struct pciDevice *dev); static int pci_driver_handle_change(int fd, const char *path); static int pci_driver_handle_bind(const char *path); static int pci_driver_handle_unbind(const char *path); -static int pci_driver_handle_new_id(const char *path); -static int pci_driver_handle_remove_id(const char *path);

/* @@ -640,8 +630,6 @@ pci_driver_new(const char *name, int fail, ...)

make_file(driverpath, "bind", NULL, -1); make_file(driverpath, "unbind", NULL, -1); - make_file(driverpath, "new_id", NULL, -1); - make_file(driverpath, "remove_id", NULL, -1);

if (VIR_APPEND_ELEMENT_QUIET(pciDrivers, nPCIDrivers, driver) < 0) ABORT_OOM(); @@ -801,10 +789,6 @@ pci_driver_handle_change(int fd ATTRIBUTE_UNUSED, const char *path) ret = pci_driver_handle_bind(path); else if (STREQ(file, "unbind")) ret = pci_driver_handle_unbind(path); - else if (STREQ(file, "new_id")) - ret = pci_driver_handle_new_id(path); - else if (STREQ(file, "remove_id")) - ret = pci_driver_handle_remove_id(path); else if (STREQ(file, "drivers_probe")) ret = pci_driver_handle_drivers_probe(path); else if (STREQ(file, "driver_override")) @@ -849,102 +833,6 @@ pci_driver_handle_unbind(const char *path) return ret; }

-static int -pci_driver_handle_new_id(const char *path) -{ - int ret = -1; - struct pciDriver *driver = pci_driver_find_by_path(path); - size_t i; - int vendor, device; - char buf[32]; - - if (!driver || PCI_ACTION_NEW_ID & driver->fail) { - errno = ENODEV; - goto cleanup; - } - - if (pci_read_file(path, buf, sizeof(buf), true) < 0) - goto cleanup; - - if (sscanf(buf, "%x %x", &vendor, &device) < 2) { - errno = EINVAL; - goto cleanup; - } - - for (i = 0; i < driver->len; i++) { - if (driver->vendor[i] == vendor && - driver->device[i] == device) - break; - } - - if (i == driver->len) { - if (VIR_REALLOC_N_QUIET(driver->vendor, driver->len + 1) < 0 || - VIR_REALLOC_N_QUIET(driver->device, driver->len + 1) < 0) { - errno = ENOMEM; - goto cleanup; - } - - driver->vendor[driver->len] = vendor; - driver->device[driver->len] = device; - driver->len++; - } - - for (i = 0; i < nPCIDevices; i++) { - struct pciDevice *dev = pciDevices[i]; - - if (!dev->driver && - dev->vendor == vendor && - dev->device == device && - pci_driver_bind(driver, dev) < 0) - goto cleanup; - } - - ret = 0; - cleanup: - return ret; -} - -static int -pci_driver_handle_remove_id(const char *path) -{ - int ret = -1; - struct pciDriver *driver = pci_driver_find_by_path(path); - size_t i; - int vendor, device; - char buf[32]; - - if (!driver || PCI_ACTION_REMOVE_ID & driver->fail) { - errno = ENODEV; - goto cleanup; - } - - if (pci_read_file(path, buf, sizeof(buf), true) < 0) - goto cleanup; - - if (sscanf(buf, "%x %x", &vendor, &device) < 2) { - errno = EINVAL; - goto cleanup; - } - - for (i = 0; i < driver->len; i++) { - if (driver->vendor[i] == vendor && - driver->device[i] == device) - continue; - } - - if (i != driver->len) { - if (VIR_DELETE_ELEMENT(driver->vendor, i, driver->len) < 0) - goto cleanup; - driver->len++; - if (VIR_DELETE_ELEMENT(driver->device, i, driver->len) < 0) - goto cleanup; - } - - ret = 0; - cleanup: - return ret; -} -

/* * Functions to load the symbols and init the environment

On 8/20/19 11:30 AM, Michal Privoznik wrote:

Signed-off-by: Michal Privoznik <mprivozn@redhat.com> ---

Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com> Tested-by: Daniel Henrique Barboza <danielhb413@gmail.com>

docs/news.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+)

diff --git a/docs/news.xml b/docs/news.xml index d63fca3b48..6137ebd943 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -51,6 +51,19 @@ </description> </change> </section> + <section title="Removed features"> + <change> + <summary> + Remove KVM assignment support + </summary> + <description> + The KVM style of PCI device assignment was removed from + kernel in kernel 4.12.0 after being deprecated since 4.2.0. + Libvirt defaults to VFIO for a long time. Remove support for + KVM device assignment then. + </description> + </change> + </section> <section title="Improvements"> </section> <section title="Bug fixes">