From: Jie Wang Date: Fri, 19 Jan 2018 14:03:05 +0000 (+0800) Subject: blockjob: Fix a error checking of blockjob status in some case X-Git-Tag: v4.1.0-rc1~214 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75fd48b945eee56b8e68534bd54363dbe261484f;p=thirdparty%2Flibvirt.git blockjob: Fix a error checking of blockjob status in some case Commit id 'bc444666f' added a check if the returned data buffer had an error, but failed to adjust the event from VIR_DOMAIN_BLOCK_JOB_COMPLETED to VIR_DOMAIN_BLOCK_JOB_FAILED in order to propagate an error such as "File descriptor in bad state" that may be returned from QEMU when both @offset and @len are set to 0 such as is the case when performing an async block job read on a read only filesystem. Signed-off-by: Jie Wang Reviewed-by: John Ferlan --- diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 5ddd855750..442b218601 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -889,7 +889,7 @@ qemuMonitorJSONHandleBlockJobImpl(qemuMonitorPtr mon, case VIR_DOMAIN_BLOCK_JOB_COMPLETED: error = virJSONValueObjectGetString(data, "error"); /* Make sure the whole device has been processed */ - if (offset != len) + if (offset != len || error) event = VIR_DOMAIN_BLOCK_JOB_FAILED; break; case VIR_DOMAIN_BLOCK_JOB_CANCELED: