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

qemuBuildVMCoreInfoCommandLine: Generate via JSON

Browse Source 
While this device doesn't have any properties it must be converted to
use qemuBuildDeviceCommandlineFromJSON so that we can validate it in the
future.

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-11 16:21:31 +02:00
parent 5e24a5021c
commit 5d51f836b0
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/qemu/qemu_command.c
View File

@ -10097,14 +10097,22 @@ qemuBuildSecCommandLine(virDomainObj *vm, virCommand *cmd,
static int
qemuBuildVMCoreInfoCommandLine(virCommand *cmd,
const virDomainDef *def)
const virDomainDef *def,
virQEMUCaps *qemuCaps)
{
virTristateSwitch vmci = def->features[VIR_DOMAIN_FEATURE_VMCOREINFO];
g_autoptr(virJSONValue) props = NULL;
if (vmci != VIR_TRISTATE_SWITCH_ON)
if (def->features[VIR_DOMAIN_FEATURE_VMCOREINFO] != VIR_TRISTATE_SWITCH_ON)
return 0;
virCommandAddArgList(cmd, "-device", "vmcoreinfo", NULL);
if (virJSONValueObjectCreate(&props,
"s:driver", "vmcoreinfo",
NULL) < 0)
return -1;
if (qemuBuildDeviceCommandlineFromJSON(cmd, props, qemuCaps) < 0)
return -1;
return 0;
}
@ -10785,7 +10793,7 @@ qemuBuildCommandLine(virQEMUDriver *driver,
if (qemuBuildNVRAMCommandLine(cmd, def) < 0)
return NULL;
if (qemuBuildVMCoreInfoCommandLine(cmd, def) < 0)
if (qemuBuildVMCoreInfoCommandLine(cmd, def, qemuCaps) < 0)
return NULL;
if (qemuBuildSecCommandLine(vm, cmd, def->sec) < 0)