[libvirt] [PATCH 3/6] qemu: cleanup setvcpus
Remove unnecessary maximum variable and also exclusive flags check as
they are now tested by upper layer for all drivers.
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
src/qemu/qemu_driver.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index cc6656d..4942712 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -4841,7 +4841,6 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus,
virDomainObjPtr vm = NULL;
virDomainDefPtr persistentDef;
int ret = -1;
- bool maximum;
unsigned int maxvcpus = 0;
virQEMUDriverConfigPtr cfg = NULL;
virCapsPtr caps = NULL;
@@ -4897,17 +4896,14 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus,
goto endjob;
}
- maximum = (flags & VIR_DOMAIN_VCPU_MAXIMUM) != 0;
- flags &= ~VIR_DOMAIN_VCPU_MAXIMUM;
-
if (virDomainLiveConfigHelperMethod(caps, driver->xmlopt, vm, &flags,
&persistentDef) < 0)
goto endjob;
/* MAXIMUM cannot be mixed with LIVE. */
- if (maximum && (flags & VIR_DOMAIN_AFFECT_LIVE)) {
+ if ((flags & VIR_DOMAIN_VCPU_MAXIMUM) && (flags &
VIR_DOMAIN_AFFECT_LIVE)) {
virReportError(VIR_ERR_INVALID_ARG, "%s",
- _("cannot adjust maximum on running domain"));
+ _("cannot adjust maximum vcpus on running domain"));
goto endjob;
}
@@ -4917,7 +4913,7 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus,
if (!maxvcpus || maxvcpus > persistentDef->maxvcpus)
maxvcpus = persistentDef->maxvcpus;
}
- if (!maximum && nvcpus > maxvcpus) {
+ if (!(flags & VIR_DOMAIN_VCPU_MAXIMUM) && nvcpus > maxvcpus) {
virReportError(VIR_ERR_INVALID_ARG,
_("requested vcpus is greater than max allowable"
" vcpus for the domain: %d > %d"),
@@ -4928,8 +4924,8 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus,
if (flags & VIR_DOMAIN_VCPU_GUEST) {
if (flags & VIR_DOMAIN_AFFECT_CONFIG) {
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
- _("changing of maximum vCPU count isn't supported
"
- "via guest agent"));
+ _("setting vcpus via guest agent isn't supported
"
+ "on offline domain"));
goto endjob;
}
@@ -4992,7 +4988,7 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus,
i);
}
- if (maximum) {
+ if (flags & VIR_DOMAIN_VCPU_MAXIMUM) {
persistentDef->maxvcpus = nvcpus;
if (nvcpus < persistentDef->vcpus)
persistentDef->vcpus = nvcpus;
--
2.0.5