openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qemuBuildVMGenIDCommandLine: Generate via JSON 

QEMU declares the 'guid' property as:

  guid=<str>             - UUID (aka GUID) or "auto" for random value (default) (default: "auto")

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:08:24 +02:00
parent 1b61610784
commit 304ffa2dff
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/qemu/qemu_command.c
View File

@ -6144,19 +6144,26 @@ qemuBuildSysinfoCommandLine(virCommand *cmd,
static int
qemuBuildVMGenIDCommandLine(virCommand *cmd,
const virDomainDef *def)
const virDomainDef *def,
virQEMUCaps *qemuCaps)
{
g_auto(virBuffer) opts = VIR_BUFFER_INITIALIZER;
g_autoptr(virJSONValue) props = NULL;
char guid[VIR_UUID_STRING_BUFLEN];
if (!def->genidRequested)
return 0;
virUUIDFormat(def->genid, guid);
virBufferAsprintf(&opts, "vmgenid,guid=%s,id=vmgenid0", guid);
virCommandAddArg(cmd, "-device");
virCommandAddArgBuffer(cmd, &opts);
if (virJSONValueObjectCreate(&props,
"s:driver", "vmgenid",
"s:guid", guid,
"s:id", "vmgenid0",
NULL) < 0)
return -1;
if (qemuBuildDeviceCommandlineFromJSON(cmd, props, qemuCaps) < 0)
return -1;
return 0;
}
@ -10658,7 +10665,7 @@ qemuBuildCommandLine(virQEMUDriver *driver,
if (qemuBuildSysinfoCommandLine(cmd, def) < 0)
return NULL;
if (qemuBuildVMGenIDCommandLine(cmd, def) < 0)
if (qemuBuildVMGenIDCommandLine(cmd, def, qemuCaps) < 0)
return NULL;
/*