External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemuBuildHostdevCommandLine: Build mediated device commandline via JSON

Browse Source 
The 'vfio-pci-nohotplug' device has the following property types
according to QEMU:

  display=<OnOffAuto>    - on/off/auto (default: "off")
  sysfsdev=<str>
  ramfb=<bool>
  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 10:17:01 +02:00
parent 172f64bb81
commit 73c352ab8c
3 changed files with 27 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/qemu/qemu_command.c
View File

@ -5348,40 +5348,34 @@ qemuBuildHostdevMdevModelTypeString(virDomainHostdevSubsysMediatedDev *mdev)
} }
char * virJSONValue *
qemuBuildHostdevMediatedDevStr(const virDomainDef *def, qemuBuildHostdevMediatedDevProps(const virDomainDef *def,
virDomainHostdevDef *dev, virDomainHostdevDef *dev)
virQEMUCaps *qemuCaps G_GNUC_UNUSED)
{ {
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; g_autoptr(virJSONValue) props = NULL;
virDomainHostdevSubsysMediatedDev *mdevsrc = &dev->source.subsys.u.mdev; virDomainHostdevSubsysMediatedDev *mdevsrc = &dev->source.subsys.u.mdev;
g_autofree char *mdevPath = NULL; g_autofree char *mdevPath = NULL;
const char *dev_str = NULL;
mdevPath = virMediatedDeviceGetSysfsPath(mdevsrc->uuidstr); mdevPath = virMediatedDeviceGetSysfsPath(mdevsrc->uuidstr);
dev_str = qemuBuildHostdevMdevModelTypeString(mdevsrc);
if (!dev_str) if (virJSONValueObjectCreate(&props,
"s:driver", qemuBuildHostdevMdevModelTypeString(mdevsrc),
"s:id", dev->info->alias,
"s:sysfsdev", mdevPath,
"S:display", qemuOnOffAuto(mdevsrc->display),
NULL) < 0)
return NULL; return NULL;
virBufferAdd(&buf, dev_str, -1); if (qemuBuildDeviceAddressProps(props, def, dev->info) < 0)
virBufferAsprintf(&buf, ",id=%s,sysfsdev=%s", dev->info->alias, mdevPath);
if (mdevsrc->display != VIR_TRISTATE_SWITCH_ABSENT)
virBufferAsprintf(&buf, ",display=%s",
virTristateSwitchTypeToString(mdevsrc->display));
if (qemuBuildDeviceAddressStr(&buf, def, dev->info) < 0)
return NULL; return NULL;
if (dev->info->bootIndex) if (virJSONValueObjectAdd(props,
virBufferAsprintf(&buf, ",bootindex=%u", dev->info->bootIndex); "T:ramfb", mdevsrc->ramfb,
"p:bootindex", dev->info->bootIndex,
NULL) < 0)
return NULL;
if (mdevsrc->ramfb == VIR_TRISTATE_SWITCH_ON) return g_steal_pointer(&props);
virBufferAsprintf(&buf, ",ramfb=%s",
virTristateSwitchTypeToString(mdevsrc->ramfb));
return virBufferContentAndReset(&buf);
} }
@ -5512,6 +5506,7 @@ qemuBuildHostdevCommandLine(virCommand *cmd,
virDomainHostdevSubsys *subsys = &hostdev->source.subsys; virDomainHostdevSubsys *subsys = &hostdev->source.subsys;
virDomainHostdevSubsysMediatedDev *mdevsrc = &subsys->u.mdev; virDomainHostdevSubsysMediatedDev *mdevsrc = &subsys->u.mdev;
g_autofree char *devstr = NULL; g_autofree char *devstr = NULL;
g_autoptr(virJSONValue) devprops = NULL;
g_autofree char *vhostfdName = NULL; g_autofree char *vhostfdName = NULL;
int vhostfd = -1; int vhostfd = -1;
@ -5591,12 +5586,11 @@ qemuBuildHostdevCommandLine(virCommand *cmd,
return -1; return -1;
} }
virCommandAddArg(cmd, "-device"); if (!(devprops = qemuBuildHostdevMediatedDevProps(def, hostdev)))
if (!(devstr =
qemuBuildHostdevMediatedDevStr(def, hostdev, qemuCaps)))
return -1; return -1;
virCommandAddArg(cmd, devstr);
if (qemuBuildDeviceCommandlineFromJSON(cmd, devprops, qemuCaps) < 0)
return -1;
break; break;
case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST:

7
src/qemu/qemu_command.h
View File

@ -199,10 +199,9 @@ qemuBuildSCSIVHostHostdevDevStr(const virDomainDef *def,
virQEMUCaps *qemuCaps, virQEMUCaps *qemuCaps,
char *vhostfdName); char *vhostfdName);
char * virJSONValue *
qemuBuildHostdevMediatedDevStr(const virDomainDef *def, qemuBuildHostdevMediatedDevProps(const virDomainDef *def,
virDomainHostdevDef *dev, virDomainHostdevDef *dev);
virQEMUCaps *qemuCaps);
char *qemuBuildRedirdevDevStr(const virDomainDef *def, char *qemuBuildRedirdevDevStr(const virDomainDef *def,
virDomainRedirdevDef *dev, virDomainRedirdevDef *dev,

7
src/qemu/qemu_hotplug.c
View File

@ -2855,7 +2855,7 @@ qemuDomainAttachMediatedDevice(virQEMUDriver *driver,
virDomainHostdevDef *hostdev) virDomainHostdevDef *hostdev)
{ {
int ret = -1; int ret = -1;
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;
@ -2901,8 +2901,7 @@ qemuDomainAttachMediatedDevice(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 = qemuBuildHostdevMediatedDevStr(vm->def, hostdev, if (!(devprops = qemuBuildHostdevMediatedDevProps(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);
@ -2912,7 +2911,7 @@ qemuDomainAttachMediatedDevice(virQEMUDriver *driver,
teardownmemlock = true; teardownmemlock = true;
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;