[PATCH 2/3] qemu: use blockjob completed event's error field to detect errors

[Nikolay Shirokovskiy <nshirokovskiy@xxxxxxxxxxxxx>]

BLOCK_JOB_COMPLETED has error field set on error from day one (12bd451f)
thus there is no need to guess for error. Is it true that when
len == offset then can be no error?
---
 src/qemu/qemu_monitor_json.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 6c2884d..8218e12 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -801,6 +801,7 @@ qemuMonitorJSONHandleBlockJobImpl(qemuMonitorPtr mon,
                                   int event)
 {
     const char *device;
+    const char *error = NULL;
     const char *type_str;
     int type = VIR_DOMAIN_BLOCK_JOB_TYPE_UNKNOWN;
     unsigned long long offset, len;
@@ -834,8 +835,7 @@ qemuMonitorJSONHandleBlockJobImpl(qemuMonitorPtr mon,
 
     switch ((virConnectDomainEventBlockJobStatus) event) {
     case VIR_DOMAIN_BLOCK_JOB_COMPLETED:
-        /* Make sure the whole device has been processed */
-        if (offset != len)
+        if ((error = virJSONValueObjectGetString(data, "error")))
             event = VIR_DOMAIN_BLOCK_JOB_FAILED;
         break;
     case VIR_DOMAIN_BLOCK_JOB_CANCELED:
-- 
1.8.3.1

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list