[PATCH 2/2] qemu: Use .hostdevice attribute for usb-host
This originally started as bug 1595525 in which namespaces and
libusb used in QEMU were not playing nicely with each other. The
problem was that libusb built a cache of USB devices it saw
(which was a very limited set because of the namespace) and then
expected to receive udev events to keep the cache in sync. But
those udev events didn't come because on hotplug when we mknod()
devices in the namespace no udev event is generated. And what is
worse - libusb failed to open a device that wasn't in the cache.
Without going further into what the problem was, libusb added a
new API for opening USB devices that avoids using cache which
QEMU incorporated and exposes under "hostdevice" attribute.
What is even nicer is that QEMU uses qemu_open() for path
provided in the attribute and thus FD passing could be used.
Except qemu_open() expects so called FD sets instead of `getfd'
and these are not implemented in Libvirt, yet.
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1877218
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/qemu/qemu_command.c | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index bd98b0a97c..4f85848d32 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -4460,16 +4460,21 @@ qemuBuildUSBHostdevDevStr(const virDomainDef *def,
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
virDomainHostdevSubsysUSBPtr usbsrc = &dev->source.subsys.u.usb;
- if (!dev->missing && !usbsrc->bus && !usbsrc->device) {
- virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("USB host device is missing bus/device
information"));
- return NULL;
- }
-
virBufferAddLit(&buf, "usb-host");
if (!dev->missing) {
- virBufferAsprintf(&buf, ",hostbus=%d,hostaddr=%d",
- usbsrc->bus, usbsrc->device);
+ if (usbsrc->bus == 0 && usbsrc->device == 0) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("USB host device is missing bus/device
information"));
+ return NULL;
+ }
+
+ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_USB_HOST_HOSTDEVICE)) {
+ virBufferAsprintf(&buf, ",hostdevice=/dev/bus/usb/%03d/%03d",
+ usbsrc->bus, usbsrc->device);
+ } else {
+ virBufferAsprintf(&buf, ",hostbus=%d,hostaddr=%d",
+ usbsrc->bus, usbsrc->device);
+ }
}
virBufferAsprintf(&buf, ",id=%s", dev->info->alias);
if (dev->info->bootIndex)
--
2.26.2