From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 26 Nov 2019 12:04:30 +0000 (+0100)
Subject: qemu: process: Move block job refresh after async job recovery
X-Git-Tag: v5.10.0-rc2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ccde9ca1f4fa5c2f1a3a2fac53661c27faeaea1c;p=thirdparty%2Flibvirt.git

qemu: process: Move block job refresh after async job recovery

Block jobs may be members of async jobs so it makes more sense to
refresh block job state after we do steps for async job recovery.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Cole Robinson <crobinso@redhat.com>
---

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index cb11da2401..a588ee25f8 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -8143,9 +8143,6 @@ qemuProcessReconnect(void *opaque)
         qemuBlockNodeNamesDetect(driver, obj, QEMU_ASYNC_JOB_NONE) < 0)
         goto error;
 
-    if (qemuProcessRefreshBlockjobs(driver, obj) < 0)
-        goto error;
-
     if (qemuRefreshVirtioChannelState(driver, obj, QEMU_ASYNC_JOB_NONE) < 0)
         goto error;
 
@@ -8158,6 +8155,9 @@ qemuProcessReconnect(void *opaque)
     if (qemuProcessRecoverJob(driver, obj, &oldjob, &stopFlags) < 0)
         goto error;
 
+    if (qemuProcessRefreshBlockjobs(driver, obj) < 0)
+        goto error;
+
     if (qemuProcessUpdateDevices(driver, obj) < 0)
         goto error;