External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-02 09:55:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuBuildHostdevMediatedDevProps: Format USB host devices via JSON

Browse Source 
The 'usb-host' device has the following types according to QEMU for
properties we control:

  hostdevice=<str>
  hostbus=<uint32>       -  (default: 0)
  hostaddr=<uint32>      -  (default: 0)
  bootindex=<int32>

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-10-01 11:24:04 +02:00
parent 9ac81c58d3
commit 1cbfe4385c
3 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/qemu/qemu_command.c
View File

@ -4789,15 +4789,17 @@ qemuBuildPCIHostdevDevStr(const virDomainDef *def,
} }
char * virJSONValue *
qemuBuildUSBHostdevDevStr(const virDomainDef *def, qemuBuildUSBHostdevDevProps(const virDomainDef *def,
virDomainHostdevDef *dev, virDomainHostdevDef *dev,
virQEMUCaps *qemuCaps) virQEMUCaps *qemuCaps)
{ {
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; g_autoptr(virJSONValue) props = NULL;
virDomainHostdevSubsysUSB *usbsrc = &dev->source.subsys.u.usb; virDomainHostdevSubsysUSB *usbsrc = &dev->source.subsys.u.usb;
unsigned int hostbus = 0;
unsigned int hostaddr = 0;
g_autofree char *hostdevice = NULL;
virBufferAddLit(&buf, "usb-host");
if (!dev->missing) { if (!dev->missing) {
if (usbsrc->bus == 0 && usbsrc->device == 0) { if (usbsrc->bus == 0 && usbsrc->device == 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@ -4806,21 +4808,28 @@ qemuBuildUSBHostdevDevStr(const virDomainDef *def,
} }
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_USB_HOST_HOSTDEVICE)) { if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_USB_HOST_HOSTDEVICE)) {
virBufferAsprintf(&buf, ",hostdevice=/dev/bus/usb/%03d/%03d", hostdevice = g_strdup_printf("/dev/bus/usb/%03d/%03d",
usbsrc->bus, usbsrc->device); usbsrc->bus, usbsrc->device);
} else { } else {
virBufferAsprintf(&buf, ",hostbus=%d,hostaddr=%d", hostbus = usbsrc->bus;
usbsrc->bus, usbsrc->device); hostaddr = usbsrc->device;
} }
} }
virBufferAsprintf(&buf, ",id=%s", dev->info->alias);
if (dev->info->bootIndex)
virBufferAsprintf(&buf, ",bootindex=%u", dev->info->bootIndex);
if (qemuBuildDeviceAddressStr(&buf, def, dev->info) < 0) if (virJSONValueObjectCreate(&props,
"s:driver", "usb-host",
"S:hostdevice", hostdevice,
"p:hostbus", hostbus,
"p:hostaddr", hostaddr,
"s:id", dev->info->alias,
"p:bootindex", dev->info->bootIndex,
NULL) < 0)
return NULL; return NULL;
return virBufferContentAndReset(&buf); if (qemuBuildDeviceAddressProps(props, def, dev->info) < 0)
return NULL;
return g_steal_pointer(&props);
} }
@ -5512,12 +5521,11 @@ qemuBuildHostdevCommandLine(virCommand *cmd,
switch ((virDomainHostdevSubsysType) subsys->type) { switch ((virDomainHostdevSubsysType) subsys->type) {
/* USB */ /* USB */
case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB:
virCommandAddArg(cmd, "-device"); if (!(devprops = qemuBuildUSBHostdevDevProps(def, hostdev, qemuCaps)))
if (!(devstr =
qemuBuildUSBHostdevDevStr(def, hostdev, qemuCaps)))
return -1; return -1;
virCommandAddArg(cmd, devstr);
if (qemuBuildDeviceCommandlineFromJSON(cmd, devprops, qemuCaps) < 0)
return -1;
break; break;
/* PCI */ /* PCI */

7
src/qemu/qemu_command.h
View File

@ -177,9 +177,10 @@ int qemuBuildRNGBackendProps(virDomainRNGDef *rng,
virJSONValue **props); virJSONValue **props);
/* Current, best practice */ /* Current, best practice */
char *qemuBuildUSBHostdevDevStr(const virDomainDef *def, virJSONValue *
virDomainHostdevDef *dev, qemuBuildUSBHostdevDevProps(const virDomainDef *def,
virQEMUCaps *qemuCaps); virDomainHostdevDef *dev,
virQEMUCaps *qemuCaps);
char *qemuBuildSCSIHostdevDevStr(const virDomainDef *def, char *qemuBuildSCSIHostdevDevStr(const virDomainDef *def,
virDomainHostdevDef *dev, virDomainHostdevDef *dev,

6
src/qemu/qemu_hotplug.c
View File

@ -2573,7 +2573,7 @@ qemuDomainAttachHostUSBDevice(virQEMUDriver *driver,
virDomainHostdevDef *hostdev) virDomainHostdevDef *hostdev)
{ {
qemuDomainObjPrivate *priv = vm->privateData; qemuDomainObjPrivate *priv = vm->privateData;
g_autofree char *devstr = NULL; g_autoptr(virJSONValue) devprops = NULL;
bool added = false; bool added = false;
bool teardowncgroup = false; bool teardowncgroup = false;
bool teardownlabel = false; bool teardownlabel = false;
@ -2601,13 +2601,13 @@ qemuDomainAttachHostUSBDevice(virQEMUDriver *driver,
if (qemuAssignDeviceHostdevAlias(vm->def, &hostdev->info->alias, -1) < 0) if (qemuAssignDeviceHostdevAlias(vm->def, &hostdev->info->alias, -1) < 0)
goto cleanup; goto cleanup;
if (!(devstr = qemuBuildUSBHostdevDevStr(vm->def, hostdev, priv->qemuCaps))) if (!(devprops = qemuBuildUSBHostdevDevProps(vm->def, hostdev, priv->qemuCaps)))
goto cleanup; goto cleanup;
VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs+1); VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs+1);
qemuDomainObjEnterMonitor(driver, vm); qemuDomainObjEnterMonitor(driver, vm);
ret = qemuMonitorAddDevice(priv->mon, devstr); ret = qemuMonitorAddDeviceProps(priv->mon, &devprops);
if (qemuDomainObjExitMonitor(driver, vm) < 0) { if (qemuDomainObjExitMonitor(driver, vm) < 0) {
ret = -1; ret = -1;
goto cleanup; goto cleanup;