From patchwork Thu Sep 1 18:37:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 112955 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 02019B6F76 for ; Fri, 2 Sep 2011 04:38:31 +1000 (EST) Received: from localhost ([::1]:50716 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QzC9j-00014Y-6b for incoming@patchwork.ozlabs.org; Thu, 01 Sep 2011 14:38:27 -0400 Received: from eggs.gnu.org ([140.186.70.92]:47100) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QzC9Y-0000s1-O0 for qemu-devel@nongnu.org; Thu, 01 Sep 2011 14:38:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QzC9X-0004Nw-Jr for qemu-devel@nongnu.org; Thu, 01 Sep 2011 14:38:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32929) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QzC9X-0004Ng-Cn for qemu-devel@nongnu.org; Thu, 01 Sep 2011 14:38:15 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p81IcEW7018187 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 1 Sep 2011 14:38:14 -0400 Received: from localhost (ovpn-113-117.phx2.redhat.com [10.3.113.117]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p81IcDxp016496; Thu, 1 Sep 2011 14:38:14 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Thu, 1 Sep 2011 15:37:54 -0300 Message-Id: <1314902275-5240-6-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1314902275-5240-1-git-send-email-lcapitulino@redhat.com> References: <1314902275-5240-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, aliguori@us.ibm.com, armbru@redhat.com Subject: [Qemu-devel] [PATCH 5/6] QMP: query-status: Add 'io-status' key X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- block.c | 15 ++++++++++++++- qmp-commands.hx | 5 +++++ 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/block.c b/block.c index c54caf2..77579b6 100644 --- a/block.c +++ b/block.c @@ -1865,6 +1865,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; @@ -1874,15 +1880,16 @@ void bdrv_info(Monitor *mon, QObject **ret_data) QTAILQ_FOREACH(bs, &bdrv_states, list) { QObject *bs_obj; + QDict *bs_dict; bs_obj = qobject_from_jsonf("{ 'device': %s, 'type': 'unknown', " "'removable': %i, 'locked': %i }", bs->device_name, bs->removable, bs->locked); + bs_dict = qobject_to_qdict(bs_obj); if (bs->drv) { QObject *obj; - QDict *bs_dict = qobject_to_qdict(bs_obj); obj = qobject_from_jsonf("{ 'file': %s, 'ro': %i, 'drv': %s, " "'encrypted': %i }", @@ -1897,6 +1904,12 @@ void bdrv_info(Monitor *mon, QObject **ret_data) qdict_put_obj(bs_dict, "inserted", obj); } + + if (bdrv_iostatus_is_enabled(bs)) { + qdict_put(bs_dict, "io-status", + qstring_from_str(io_status_name[bs->iostatus])); + } + qlist_append_obj(bs_list, bs_obj); } diff --git a/qmp-commands.hx b/qmp-commands.hx index 1fbda8c..c045043 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -1143,6 +1143,9 @@ 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 (json_string,optional) + - Possible values: "ok", "failed", "nospace" Example: @@ -1150,6 +1153,7 @@ Example: <- { "return":[ { + "io-status": "ok", "device":"ide0-hd0", "locked":false, "removable":false, @@ -1162,6 +1166,7 @@ Example: "type":"unknown" }, { + "io-status": "ok", "device":"ide1-cd0", "locked":false, "removable":true,