From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 31 Mar 2017 11:13:14 +0000 (+0200)
Subject: qemu: hotplug: Add validation for coldplug of individual vcpus
X-Git-Tag: v3.3.0-rc1~293
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee86d45de35bff5f75d1583701cc9514b59e747c;p=thirdparty%2Flibvirt.git

qemu: hotplug: Add validation for coldplug of individual vcpus

Validate that users don't try to disable vcpu 0.
---

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 5488b1dd4d..999c8b8049 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -5875,6 +5875,21 @@ qemuDomainFilterHotplugVcpuEntities(virDomainDefPtr def,
 }
 
 
+static int
+qemuDomainVcpuValidateConfig(virBitmapPtr map,
+                             bool state)
+{
+    /* vcpu 0 can't be disabled */
+    if (!state && virBitmapIsBitSet(map, 0)) {
+        virReportError(VIR_ERR_INVALID_ARG, "%s",
+                       _("vCPU '0' must be enabled"));
+        return -1;
+    }
+
+    return 0;
+}
+
+
 int
 qemuDomainSetVcpuInternal(virQEMUDriverPtr driver,
                           virDomainObjPtr vm,
@@ -5909,6 +5924,11 @@ qemuDomainSetVcpuInternal(virQEMUDriverPtr driver,
         }
     }
 
+    if (persistentDef) {
+        if (qemuDomainVcpuValidateConfig(map, state) < 0)
+            goto cleanup;
+    }
+
     if (livevcpus &&
         qemuDomainSetVcpusLive(driver, cfg, vm, livevcpus, state) < 0)
         goto cleanup;