External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-11 15:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: command: move vmGenID validation to qemu_domain.c

Browse Source 
QEMU_CAPS_DEVICE_VMGENID is now being validated by
qemuDomainDefValidate().

Reviewed-by: Cole Robinson <crobinso@redhat.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
Daniel Henrique Barboza 2019-12-09 20:15:19 -03:00 committed by Cole Robinson
parent 3d21545f6d
commit f64d67cdc5
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/qemu/qemu_command.c
View File

@ -6048,8 +6048,7 @@ qemuBuildSmbiosCommandLine(virCommandPtr cmd,
static int static int
qemuBuildVMGenIDCommandLine(virCommandPtr cmd, qemuBuildVMGenIDCommandLine(virCommandPtr cmd,
const virDomainDef *def, const virDomainDef *def)
virQEMUCapsPtr qemuCaps)
{ {
g_auto(virBuffer) opts = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) opts = VIR_BUFFER_INITIALIZER;
char guid[VIR_UUID_STRING_BUFLEN]; char guid[VIR_UUID_STRING_BUFLEN];
@ -6057,12 +6056,6 @@ qemuBuildVMGenIDCommandLine(virCommandPtr cmd,
if (!def->genidRequested) if (!def->genidRequested)
return 0; return 0;
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VMGENID)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("this QEMU does not support the 'genid' capability"));
return -1;
}
virUUIDFormat(def->genid, guid); virUUIDFormat(def->genid, guid);
virBufferAsprintf(&opts, "vmgenid,guid=%s,id=vmgenid0", guid); virBufferAsprintf(&opts, "vmgenid,guid=%s,id=vmgenid0", guid);
@ -10070,7 +10063,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
if (qemuBuildSmbiosCommandLine(cmd, driver, def) < 0) if (qemuBuildSmbiosCommandLine(cmd, driver, def) < 0)
return NULL; return NULL;
if (qemuBuildVMGenIDCommandLine(cmd, def, qemuCaps) < 0) if (qemuBuildVMGenIDCommandLine(cmd, def) < 0)
return NULL; return NULL;
/* /*

7
src/qemu/qemu_domain.c
View File

@ -5458,6 +5458,13 @@ qemuDomainDefValidate(const virDomainDef *def,
} }
} }
if (def->genidRequested &&
!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VMGENID)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("this QEMU does not support the 'genid' capability"));
goto cleanup;
}
/* QEMU 2.7 (detected via the availability of query-hotpluggable-cpus) /* QEMU 2.7 (detected via the availability of query-hotpluggable-cpus)
* enforces stricter rules than previous versions when it comes to guest * enforces stricter rules than previous versions when it comes to guest
* CPU topology. Verify known constraints are respected */ * CPU topology. Verify known constraints are respected */