]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: process: Move block job refresh after async job recovery
authorPeter Krempa <pkrempa@redhat.com>
Tue, 26 Nov 2019 12:04:30 +0000 (13:04 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Wed, 27 Nov 2019 14:59:33 +0000 (15:59 +0100)
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>
src/qemu/qemu_process.c

index cb11da2401b5a8aff2d9d1a751c537fe1b3042ff..a588ee25f8e920fdf97c9c6100e94f2412e2f31b 100644 (file)
@@ -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;