From: Daniel Henrique Barboza <danielhb413@gmail.com>
Date: Wed, 18 Nov 2020 17:56:24 +0000 (-0300)
Subject: qemu_process.c: check migrateURI when setting VIR_QEMU_PROCESS_START_NEW
X-Git-Tag: v7.0.0-rc1~331
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3bb9ed8bc272d96a3bcdc1ff504c1dd000e1e1f0;p=thirdparty%2Flibvirt.git

qemu_process.c: check migrateURI when setting VIR_QEMU_PROCESS_START_NEW

qemuProcessCreatePretendCmdPrepare() is setting the
VIR_QEMU_PROCESS_START_NEW regardless of whether this is
a migration case or not. This behavior differs from what we're
doing in qemuProcessStart(), where the flag is set only
if !migrate && !snapshot.

Fix it by making the flag setting consistent with what we're
doing in qemuProcessStart().

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 01afe66ec9..27a22c950d 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -7436,7 +7436,10 @@ qemuProcessCreatePretendCmdPrepare(virQEMUDriverPtr driver,
                   VIR_QEMU_PROCESS_START_AUTODESTROY, -1);
 
     flags |= VIR_QEMU_PROCESS_START_PRETEND;
-    flags |= VIR_QEMU_PROCESS_START_NEW;
+
+    if (!migrateURI)
+        flags |= VIR_QEMU_PROCESS_START_NEW;
+
     if (standalone)
         flags |= VIR_QEMU_PROCESS_START_STANDALONE;