From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:58767) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1REktz-0005qj-Bv for qemu-devel@nongnu.org; Fri, 14 Oct 2011 12:46:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1REktx-0001Bp-Bi for qemu-devel@nongnu.org; Fri, 14 Oct 2011 12:46:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:13943) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1REktw-0001Bc-Nr for qemu-devel@nongnu.org; Fri, 14 Oct 2011 12:46:29 -0400 From: Kevin Wolf Date: Fri, 14 Oct 2011 18:49:02 +0200 Message-Id: <1318610959-17971-8-git-send-email-kwolf@redhat.com> In-Reply-To: <1318610959-17971-1-git-send-email-kwolf@redhat.com> References: <1318610959-17971-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 07/24] QMP: query-status: Add 'io-status' key List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Luiz Capitulino Contains the I/O status for the given device. The key is only present if the device supports it and the VM is configured to stop on errors. Please, check the documentation being added in this commit for more information. Signed-off-by: Luiz Capitulino Reviewed-by: Markus Armbruster Signed-off-by: Kevin Wolf --- block.c | 12 ++++++++++++ qmp-commands.hx | 6 ++++++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/block.c b/block.c index 92ec2c3..40621b1 100644 --- a/block.c +++ b/block.c @@ -1893,6 +1893,12 @@ void bdrv_info_print(Monitor *mon, const QObject *data) qlist_iter(qobject_to_qlist(data), bdrv_print_dict, mon); } +static const char *const io_status_name[BDRV_IOS_MAX] = { + [BDRV_IOS_OK] = "ok", + [BDRV_IOS_FAILED] = "failed", + [BDRV_IOS_ENOSPC] = "nospace", +}; + void bdrv_info(Monitor *mon, QObject **ret_data) { QList *bs_list; @@ -1915,6 +1921,12 @@ void bdrv_info(Monitor *mon, QObject **ret_data) qdict_put(bs_dict, "tray-open", qbool_from_int(bdrv_dev_is_tray_open(bs))); } + + if (bdrv_iostatus_is_enabled(bs)) { + qdict_put(bs_dict, "io-status", + qstring_from_str(io_status_name[bs->iostatus])); + } + if (bs->drv) { QObject *obj; diff --git a/qmp-commands.hx b/qmp-commands.hx index ea96191..9c11e87 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -1154,6 +1154,10 @@ Each json-object contain the following: "tftp", "vdi", "vmdk", "vpc", "vvfat" - "backing_file": backing file name (json-string, optional) - "encrypted": true if encrypted, false otherwise (json-bool) +- "io-status": I/O operation status, only present if the device supports it + and the VM is configured to stop on errors. It's always reset + to "ok" when the "cont" command is issued (json_string, optional) + - Possible values: "ok", "failed", "nospace" Example: @@ -1161,6 +1165,7 @@ Example: <- { "return":[ { + "io-status": "ok", "device":"ide0-hd0", "locked":false, "removable":false, @@ -1173,6 +1178,7 @@ Example: "type":"unknown" }, { + "io-status": "ok", "device":"ide1-cd0", "locked":false, "removable":true, -- 1.7.6.4