From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49507) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wfibz-0001ha-5H for qemu-devel@nongnu.org; Thu, 01 May 2014 00:28:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wfibq-0002Oa-0p for qemu-devel@nongnu.org; Thu, 01 May 2014 00:28:43 -0400 Received: from mail-ie0-x231.google.com ([2607:f8b0:4001:c03::231]:34970) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wfibp-0002OS-JZ for qemu-devel@nongnu.org; Thu, 01 May 2014 00:28:33 -0400 Received: by mail-ie0-f177.google.com with SMTP id rp18so2968880iec.8 for ; Wed, 30 Apr 2014 21:28:33 -0700 (PDT) From: Wenchao Xia Date: Wed, 30 Apr 2014 21:26:53 -0700 Message-Id: <1398918422-3019-20-git-send-email-wenchaoqemu@gmail.com> In-Reply-To: <1398918422-3019-1-git-send-email-wenchaoqemu@gmail.com> References: <1398918422-3019-1-git-send-email-wenchaoqemu@gmail.com> Subject: [Qemu-devel] [PATCH V5 19/28] qapi event: convert BLOCK_IO_ERROR and BLOCK_JOB_ERROR List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mdroth@linux.vnet.ibm.com, armbru@redhat.com, Wenchao Xia , lcapitulino@redhat.com Signed-off-by: Wenchao Xia --- block.c | 36 ++++-------------------------------- blockjob.c | 6 +++++- include/block/block_int.h | 3 --- 3 files changed, 9 insertions(+), 36 deletions(-) diff --git a/block.c b/block.c index dae5d25..c6c4e4b 100644 --- a/block.c +++ b/block.c @@ -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" @@ -2039,36 +2038,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) { @@ -3509,7 +3478,10 @@ void bdrv_error_action(BlockDriverState *bs, BlockErrorAction action, bool is_read, int error) { assert(error >= 0); - 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, NULL); if (action == BLOCK_ERROR_ACTION_STOP) { vm_stop(RUN_STATE_IO_ERROR); bdrv_iostatus_set_err(bs, error); diff --git a/blockjob.c b/blockjob.c index b8f6662..5c2ae1b 100644 --- a/blockjob.c +++ b/blockjob.c @@ -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, @@ -273,7 +274,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, NULL); if (action == BLOCK_ERROR_ACTION_STOP) { block_job_pause(job); block_job_iostatus_set_err(job, error); diff --git a/include/block/block_int.h b/include/block/block_int.h index cd5bc73..0026825 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -392,9 +392,6 @@ AioContext *bdrv_get_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: -- 1.7.1