From c74207cb182f0af7ea626579f5be3be48fc9c2d4 Mon Sep 17 00:00:00 2001
From: Jiri Denemark <jdenemar@redhat.com>
Date: Mon, 20 Mar 2017 09:03:58 +0100
Subject: [PATCH] qemu: Don't try to update undefined guest CPU

Calling virCPUUpdateLive on a domain with no guest CPU configuration
does not make sense. Especially when doing so would crash libvirtd.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
 src/qemu/qemu_process.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 780f9587a8..ec0e36d2e9 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -3815,11 +3815,6 @@ qemuProcessVerifyCPUFeatures(virDomainDefPtr def,
 {
     int rc;
 
-    if (!def->cpu ||
-        (def->cpu->mode == VIR_CPU_MODE_CUSTOM &&
-         !def->cpu->model))
-        return 0;
-
     rc = virCPUCheckFeature(def->os.arch, def->cpu, "invtsc");
 
     if (rc < 0) {
@@ -3870,6 +3865,13 @@ qemuProcessUpdateLiveGuestCPU(virQEMUDriverPtr driver,
             qemuProcessVerifyHypervFeatures(def, cpu) < 0)
             goto cleanup;
 
+        if (!def->cpu ||
+            (def->cpu->mode == VIR_CPU_MODE_CUSTOM &&
+             !def->cpu->model)) {
+            ret = 0;
+            goto cleanup;
+        }
+
         if (qemuProcessVerifyCPUFeatures(def, cpu) < 0)
             goto cleanup;