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

qemuBuildInputDevStr: Don't mix generators for -object and -device

Browse Source 
Input devices of VIR_DOMAIN_INPUT_TYPE_EVDEV type are instantiated via
an '-object' rather than a '-device'. Mixing them in one function is a
bad idea as the caller then needs to use the string correctly which is
not the case in 'qemuDomainAttachInputDevice'.

Generate a JSON object for '-object' explicitly.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-09-24 15:52:03 +02:00
parent d8f3fb187d
commit f8f9c49302
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/qemu/qemu_command.c
View File

@ -3887,12 +3887,10 @@ qemuBuildUSBInputDevStr(const virDomainDef *def,
} }
static char * static virJSONValue *
qemuBuildObjectInputDevStr(virDomainInputDef *dev, qemuBuildInputEvdevProps(virDomainInputDef *dev)
virQEMUCaps *qemuCaps)
{ {
g_autoptr(virJSONValue) props = NULL; g_autoptr(virJSONValue) props = NULL;
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
if (qemuMonitorCreateObjectProps(&props, "input-linux", dev->info.alias, if (qemuMonitorCreateObjectProps(&props, "input-linux", dev->info.alias,
"s:evdev", dev->source.evdev, "s:evdev", dev->source.evdev,
@ -3908,10 +3906,7 @@ qemuBuildObjectInputDevStr(virDomainInputDef *dev,
virDomainInputSourceGrabToggleTypeToString(dev->source.grabToggle), virDomainInputSourceGrabToggleTypeToString(dev->source.grabToggle),
NULL); NULL);
if (qemuBuildObjectCommandlineFromJSON(&buf, props, qemuCaps) < 0) return g_steal_pointer(&props);
return NULL;
return virBufferContentAndReset(&buf);
} }
@ -3931,10 +3926,6 @@ qemuBuildInputDevStr(char **devstr,
if (!(*devstr = qemuBuildVirtioInputDevStr(def, input, qemuCaps))) if (!(*devstr = qemuBuildVirtioInputDevStr(def, input, qemuCaps)))
return -1; return -1;
break; break;
case VIR_DOMAIN_INPUT_BUS_NONE:
if (!(*devstr = qemuBuildObjectInputDevStr(input, qemuCaps)))
return -1;
break;
} }
return 0; return 0;
} }
@ -3949,20 +3940,32 @@ qemuBuildInputCommandLine(virCommand *cmd,
for (i = 0; i < def->ninputs; i++) { for (i = 0; i < def->ninputs; i++) {
virDomainInputDef *input = def->inputs[i]; virDomainInputDef *input = def->inputs[i];
g_autofree char *devstr = NULL;
if (qemuCommandAddExtDevice(cmd, &input->info) < 0) if (qemuCommandAddExtDevice(cmd, &input->info) < 0)
return -1; return -1;
if (qemuBuildInputDevStr(&devstr, def, input, qemuCaps) < 0) if (input->type == VIR_DOMAIN_INPUT_TYPE_EVDEV) {
return -1; g_autoptr(virJSONValue) props = NULL;
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
if (devstr) { if (!(props = qemuBuildInputEvdevProps(input)))
if (input->type == VIR_DOMAIN_INPUT_TYPE_EVDEV) return -1;
virCommandAddArg(cmd, "-object");
else if (qemuBuildObjectCommandlineFromJSON(&buf, props, qemuCaps) < 0)
return -1;
virCommandAddArg(cmd, "-object");
virCommandAddArgBuffer(cmd, &buf);
} else {
g_autofree char *devstr = NULL;
if (qemuBuildInputDevStr(&devstr, def, input, qemuCaps) < 0)
return -1;
if (devstr) {
virCommandAddArg(cmd, "-device"); virCommandAddArg(cmd, "-device");
virCommandAddArg(cmd, devstr); virCommandAddArg(cmd, devstr);
}
} }
} }