From ccde9ca1f4fa5c2f1a3a2fac53661c27faeaea1c Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Tue, 26 Nov 2019 13:04:30 +0100 Subject: [PATCH] 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 Reviewed-by: Cole Robinson --- src/qemu/qemu_process.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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;