mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-09-09 01:04:59 +00:00
qemu_domain.c: moving maxCpu validation to qemuDomainDefValidate
Adding maxCpu validation in qemuDomainDefValidate allows the user to spot over the board maxCpus counts at editing time, instead of facing a runtime error when starting the domain. This check is also arch independent. This leaves us with 2 calls to qemuProcessValidateCpuCount: one in qemuProcessStartValidateXML and the new one at qemuDomainDefValidate. The call in qemuProcessStartValidateXML is redundant. Following up in that code, there is a call to virDomainDefValidate, which in turn will call config.domainValidateCallback. In this case, the callback function is qemuDomainDefValidate. This means that, on startup time, qemuProcessValidateCpuCount will be called twice. To avoid that, let's also remove the qemuProcessValidateCpuCount call from qemuProcessStartValidateXML. Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> Reviewed-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
parent
9a8e040264
commit
2c4a6a34a3
@ -4085,6 +4085,9 @@ qemuDomainDefValidate(const virDomainDef *def,
|
||||
}
|
||||
}
|
||||
|
||||
if (qemuProcessValidateCpuCount(def, qemuCaps) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (ARCH_IS_X86(def->os.arch) &&
|
||||
virDomainDefGetVcpusMax(def) > QEMU_MAX_VCPUS_WITHOUT_EIM) {
|
||||
if (!qemuDomainIsQ35(def)) {
|
||||
|
@ -5153,21 +5153,9 @@ qemuProcessStartValidateDisks(virDomainObjPtr vm,
|
||||
static int
|
||||
qemuProcessStartValidateXML(virQEMUDriverPtr driver,
|
||||
virDomainObjPtr vm,
|
||||
virQEMUCapsPtr qemuCaps,
|
||||
virCapsPtr caps,
|
||||
unsigned int flags)
|
||||
{
|
||||
/* The bits we validate here are XML configs that we previously
|
||||
* accepted. We reject them at VM startup time rather than parse
|
||||
* time so that pre-existing VMs aren't rejected and dropped from
|
||||
* the VM list when libvirt is updated.
|
||||
*
|
||||
* If back compat isn't a concern, XML validation should probably
|
||||
* be done at parse time.
|
||||
*/
|
||||
if (qemuProcessValidateCpuCount(vm->def, qemuCaps) < 0)
|
||||
return -1;
|
||||
|
||||
/* checks below should not be executed when starting a qemu process for a
|
||||
* VM that was running before (migration, snapshots, save). It's more
|
||||
* important to start such VM than keep the configuration clean */
|
||||
@ -5217,7 +5205,7 @@ qemuProcessStartValidate(virQEMUDriverPtr driver,
|
||||
|
||||
}
|
||||
|
||||
if (qemuProcessStartValidateXML(driver, vm, qemuCaps, caps, flags) < 0)
|
||||
if (qemuProcessStartValidateXML(driver, vm, caps, flags) < 0)
|
||||
return -1;
|
||||
|
||||
if (qemuProcessStartValidateGraphics(vm) < 0)
|
||||
|
Loading…
Reference in New Issue
Block a user