Commit 5a2d2cbd authored by Wenchao Xia's avatar Wenchao Xia Committed by Luiz Capitulino
Browse files

qapi event: convert BLOCK_IO_ERROR and BLOCK_JOB_ERROR 



Signed-off-by: default avatarWenchao Xia <wenchaoqemu@gmail.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
parent a5ee7bd4

block.c

+8 −33
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include "config-host.h"

#include "qemu-common.h"

#include "trace.h"

#include "monitor/monitor.h"

#include "block/block_int.h"

#include "block/blockjob.h"

#include "qemu/module.h"
@@ -2133,36 +2132,6 @@ void bdrv_set_dev_ops(BlockDriverState *bs, const BlockDevOps *ops, 
    bs->dev_opaque = opaque;

}



void bdrv_emit_qmp_error_event(const BlockDriverState *bdrv,

                               enum MonitorEvent ev,

                               BlockErrorAction action, bool is_read)

{

    QObject *data;

    const char *action_str;



    switch (action) {

    case BLOCK_ERROR_ACTION_REPORT:

        action_str = "report";

        break;

    case BLOCK_ERROR_ACTION_IGNORE:

        action_str = "ignore";

        break;

    case BLOCK_ERROR_ACTION_STOP:

        action_str = "stop";

        break;

    default:

        abort();

    }



    data = qobject_from_jsonf("{ 'device': %s, 'action': %s, 'operation': %s }",

                              bdrv->device_name,

                              action_str,

                              is_read ? "read" : "write");

    monitor_protocol_event(ev, data);



    qobject_decref(data);

}



static void bdrv_dev_change_media_cb(BlockDriverState *bs, bool load)

{

    if (bs->dev_ops && bs->dev_ops->change_media_cb) {
@@ -3636,10 +3605,16 @@ void bdrv_error_action(BlockDriverState *bs, BlockErrorAction action, 
         * also ensures that the STOP/RESUME pair of events is emitted.

         */

        qemu_system_vmstop_request_prepare();

        bdrv_emit_qmp_error_event(bs, QEVENT_BLOCK_IO_ERROR, action, is_read);

        qapi_event_send_block_io_error(bdrv_get_device_name(bs),

                                       is_read ? IO_OPERATION_TYPE_READ :

                                       IO_OPERATION_TYPE_WRITE,

                                       action, &error_abort);

        qemu_system_vmstop_request(RUN_STATE_IO_ERROR);

    } else {

        bdrv_emit_qmp_error_event(bs, QEVENT_BLOCK_IO_ERROR, action, is_read);

        qapi_event_send_block_io_error(bdrv_get_device_name(bs),

                                       is_read ? IO_OPERATION_TYPE_READ :

                                       IO_OPERATION_TYPE_WRITE,

                                       action, &error_abort);

    }

}

blockjob.c

+5 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include "block/coroutine.h"

#include "qmp-commands.h"

#include "qemu/timer.h"

#include "qapi-event.h"



void *block_job_create(const BlockJobDriver *driver, BlockDriverState *bs,

                       int64_t speed, BlockDriverCompletionFunc *cb,
@@ -277,7 +278,10 @@ BlockErrorAction block_job_error_action(BlockJob *job, BlockDriverState *bs, 
    default:

        abort();

    }

    bdrv_emit_qmp_error_event(job->bs, QEVENT_BLOCK_JOB_ERROR, action, is_read);

    qapi_event_send_block_job_error(bdrv_get_device_name(bs),

                                    is_read ? IO_OPERATION_TYPE_READ :

                                    IO_OPERATION_TYPE_WRITE,

                                    action, &error_abort);

    if (action == BLOCK_ERROR_ACTION_STOP) {

        block_job_pause(job);

        block_job_iostatus_set_err(job, error);

docs/qmp/qmp-events.txt

+0 −47
Original line number Diff line number Diff line
@@ -50,31 +50,6 @@ Example: 
        "size": 65536 },

    "timestamp": { "seconds": 1378126126, "microseconds": 966463 } }



BLOCK_IO_ERROR

--------------



Emitted when a disk I/O error occurs.



Data:



- "device": device name (json-string)

- "operation": I/O operation (json-string, "read" or "write")

- "action": action that has been taken, it's one of the following (json-string):

    "ignore": error has been ignored

    "report": error has been reported to the device

    "stop": the VM is going to stop because of the error



Example:



{ "event": "BLOCK_IO_ERROR",

    "data": { "device": "ide0-hd1",

              "operation": "write",

              "action": "stop" },

    "timestamp": { "seconds": 1265044230, "microseconds": 450486 } }



Note: If action is "stop", a STOP event will eventually follow the

BLOCK_IO_ERROR event.



BLOCK_JOB_CANCELLED

-------------------
@@ -128,28 +103,6 @@ Example: 
               "speed": 0 },

     "timestamp": { "seconds": 1267061043, "microseconds": 959568 } }



BLOCK_JOB_ERROR

---------------



Emitted when a block job encounters an error.



Data:



- "device": device name (json-string)

- "operation": I/O operation (json-string, "read" or "write")

- "action": action that has been taken, it's one of the following (json-string):

    "ignore": error has been ignored, the job may fail later

    "report": error will be reported and the job canceled

    "stop": error caused job to be paused



Example:



{ "event": "BLOCK_JOB_ERROR",

    "data": { "device": "ide0-hd1",

              "operation": "write",

              "action": "stop" },

    "timestamp": { "seconds": 1265044230, "microseconds": 450486 } }



BLOCK_JOB_READY

---------------

include/block/block_int.h

+0 −3
Original line number Diff line number Diff line
@@ -425,9 +425,6 @@ void bdrv_attach_aio_context(BlockDriverState *bs, 
#ifdef _WIN32

int is_windows_drive(const char *filename);

#endif

void bdrv_emit_qmp_error_event(const BlockDriverState *bdrv,

                               enum MonitorEvent ev,

                               BlockErrorAction action, bool is_read);



/**

 * stream_start:

qapi-schema.json

+14 −0
Original line number Diff line number Diff line
@@ -3371,4 +3371,18 @@ 
{ 'enum': 'WatchdogExpirationAction',

  'data': [ 'reset', 'shutdown', 'poweroff', 'pause', 'debug', 'none' ] }



##

# @IoOperationType

#

# An enumeration of the I/O operation types

#

# @read: read operation

#

# @write: write operation

#

# Since: 2.1

##

{ 'enum': 'IoOperationType',

  'data': [ 'read', 'write' ] }



{ 'include': 'qapi-event.json' }