External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-03 12:55:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuBuildUSBControllerDevStr: Format via JSON properties.

Browse Source 
Internally format the PCI controller properties into JSON, but convert
it back to a string as preparation for upcoming refactors.

The following types are declared for the properties we use by QEMU:

'nec-usb-xhci'
  p2=<uint32>            -  (default: 4)
  p3=<uint32>            -  (default: 4)

'ich9-usb-uhci6'
  masterbus=<str>
  firstport=<uint32>     -  (default: 0)

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-05 13:46:03 +02:00
parent 3e8d38237d
commit 4a8319225c
1 changed files with 44 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/qemu/qemu_command.c
View File

@ -2836,37 +2836,51 @@ qemuBuildUSBControllerFindMasterAlias(const virDomainDef *domainDef,
}
static int
qemuBuildUSBControllerDevStr(const virDomainDef *domainDef,
static virJSONValue *
qemuBuildUSBControllerDevProps(const virDomainDef *domainDef,
virDomainControllerDef *def,
virQEMUCaps *qemuCaps,
virBuffer *buf)
virQEMUCaps *qemuCaps)
{
g_autoptr(virJSONValue) props = NULL;
if (qemuValidateDomainDeviceDefControllerUSB(def, qemuCaps) < 0)
return -1;
return NULL;
virBufferAsprintf(buf, "%s", qemuControllerModelUSBTypeToString(def->model));
if (def->opts.usbopts.ports != -1) {
virBufferAsprintf(buf, ",p2=%d,p3=%d",
def->opts.usbopts.ports, def->opts.usbopts.ports);
}
if (virJSONValueObjectCreate(&props,
"s:driver", qemuControllerModelUSBTypeToString(def->model),
"k:p2", def->opts.usbopts.ports,
"k:p3", def->opts.usbopts.ports,
NULL) < 0)
return NULL;
if (def->info.mastertype == VIR_DOMAIN_CONTROLLER_MASTER_USB) {
const char *masterbus;
g_autofree char *masterbus = NULL;
const char *alias;
if (!(masterbus = qemuBuildUSBControllerFindMasterAlias(domainDef, def))) {
if (!(alias = qemuBuildUSBControllerFindMasterAlias(domainDef, def))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("masterbus not found"));
return -1;
}
virBufferAsprintf(buf, ",masterbus=%s.0,firstport=%d",
masterbus, def->info.master.usb.startport);
} else {
virBufferAsprintf(buf, ",id=%s", def->info.alias);
return NULL;
}
return 0;
masterbus = g_strdup_printf("%s.0", alias);
if (virJSONValueObjectAdd(props,
"s:masterbus", masterbus,
"i:firstport", def->info.master.usb.startport,
NULL) < 0)
return NULL;
} else {
if (virJSONValueObjectAdd(props,
"s:id", def->info.alias,
NULL) < 0)
return NULL;
}
if (qemuBuildDeviceAddressProps(props, domainDef, &def->info) < 0)
return NULL;
return g_steal_pointer(&props);
}
@ -3133,9 +3147,19 @@ qemuBuildControllerDevStr(const virDomainDef *domainDef,
break;
case VIR_DOMAIN_CONTROLLER_TYPE_USB:
if (qemuBuildUSBControllerDevStr(domainDef, def, qemuCaps, &buf) == -1)
if (!(props = qemuBuildUSBControllerDevProps(domainDef, def, qemuCaps)))
return -1;
driver = virJSONValueObjectGetString(props, "driver");
virBufferAsprintf(&buf, "%s,", driver);
if (virQEMUBuildCommandLineJSON(props, &buf, "driver", NULL) < 0)
return -1;
*devstr = virBufferContentAndReset(&buf);
return 0;
break;
case VIR_DOMAIN_CONTROLLER_TYPE_PCI: