blockjob: Fix recent BLOCK_JOB_ERROR regression

Commit 5a2d2cb screwed up the the value of members device and action,
breaking tests/qemu-iotests/041.

Signed-off-by: Markus Armbruster <[email protected]>
Tested-By: Benoit Canet <[email protected]>
Reviewed-by: Kevin Wolf <[email protected]>
Reviewed-by: Luiz Capitulino <[email protected]>
Signed-off-by: Kevin Wolf <[email protected]>

diff --git a/blockjob.c b/blockjob.c
index a32c1c8dd739558331a763c7cf9729776ea6b94a..67a64ea318b59a3f6ecd08d4f10ba5ffa62c753d 100644 (file)
--- a/blockjob.c
+++ b/blockjob.c
@@ -300,7 +300,7 @@ BlockErrorAction block_job_error_action(BlockJob *job, BlockDriverState *bs,
     default:
         abort();
     }
-    qapi_event_send_block_job_error(bdrv_get_device_name(bs),
+    qapi_event_send_block_job_error(bdrv_get_device_name(job->bs),
                                     is_read ? IO_OPERATION_TYPE_READ :
                                     IO_OPERATION_TYPE_WRITE,
                                     action, &error_abort);

diff --git a/qapi/block-core.json b/qapi/block-core.json
index 6f41f84c44142fe66adb35b2a9831237b81f2ead..ff7224f647eeabf3319623857e7e38631c42fb53 100644 (file)
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -1551,7 +1551,7 @@
 { 'event': 'BLOCK_JOB_ERROR',
   'data': { 'device'   : 'str',
             'operation': 'IoOperationType',
-            'action'   : 'BlockdevOnError' } }
+            'action'   : 'BlockErrorAction' } }
 
 ##
 # @BLOCK_JOB_READY