[libvirt] [PATCH] Don't ignore guest CPU selection when unsupported by HV

[Jiri Denemark <jdenemar@xxxxxxxxxx>]

When qemu libvirt driver doesn't support guest CPU selection with given
qemu binary, guests requiring specific CPU should fail to start instead
of being silently supplied with a default CPU.
---
 src/qemu/qemu_conf.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 592360f..3fb0074 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -3249,9 +3249,16 @@ qemuBuildCpuArgStr(const struct qemud_driver *driver,
     virBuffer buf = VIR_BUFFER_INITIALIZER;
     int i;
 
-    if (def->cpu && def->cpu->model
-        && qemudProbeCPUModels(emulator, ut->machine, &ncpus, &cpus) < 0)
-        goto cleanup;
+    if (def->cpu && def->cpu->model) {
+        if (qemudProbeCPUModels(emulator, ut->machine, &ncpus, &cpus) < 0)
+            goto cleanup;
+
+        if (!ncpus || !host) {
+            qemuReportError(VIR_ERR_NO_SUPPORT, "%s",
+                            _("CPU specification not supported by hypervisor"));
+            goto cleanup;
+        }
+    }
 
     if (ncpus > 0 && host) {
         virCPUCompareResult cmp;
-- 
1.7.0.4

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list