From patchwork Tue Jul 5 18:17:50 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 103385 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 88A0EB6EE8 for ; Wed, 6 Jul 2011 06:55:19 +1000 (EST) Received: from localhost ([::1]:34641 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QeCeJ-00011N-Nx for incoming@patchwork.ozlabs.org; Tue, 05 Jul 2011 16:55:15 -0400 Received: from eggs.gnu.org ([140.186.70.92]:33843) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QeACY-0000Dq-5u for qemu-devel@nongnu.org; Tue, 05 Jul 2011 14:18:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QeACV-00029l-Nf for qemu-devel@nongnu.org; Tue, 05 Jul 2011 14:18:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:2172) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QeACV-00029Q-4s for qemu-devel@nongnu.org; Tue, 05 Jul 2011 14:18:23 -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 p65IIJv2016826 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 5 Jul 2011 14:18:19 -0400 Received: from localhost (ovpn-113-99.phx2.redhat.com [10.3.113.99]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p65IIIJI003642; Tue, 5 Jul 2011 14:18:18 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Tue, 5 Jul 2011 15:17:50 -0300 Message-Id: <1309889871-6267-8-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1309889871-6267-1-git-send-email-lcapitulino@redhat.com> References: <1309889871-6267-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, jan.kiszka@siemens.com, armbru@redhat.com, stefanha@gmail.com, jdenemar@redhat.com Subject: [Qemu-devel] [PATCH 7/8] 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 last I/O status for the given device. Currently this is only supported by ide, scsi and virtio block devices. Signed-off-by: Luiz Capitulino --- block.c | 15 ++++++++++++++- block.h | 2 +- qmp-commands.hx | 6 ++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index cc0a34e..28df3d8 100644 --- a/block.c +++ b/block.c @@ -1720,6 +1720,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; @@ -1729,15 +1735,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 }", @@ -1752,6 +1759,12 @@ void bdrv_info(Monitor *mon, QObject **ret_data) qdict_put_obj(bs_dict, "inserted", obj); } + + if (bs->iostatus_enabled) { + qdict_put(bs_dict, "io-status", + qstring_from_str(io_status_name[bs->iostatus])); + } + qlist_append_obj(bs_list, bs_obj); } diff --git a/block.h b/block.h index 0dca1bb..0141fe6 100644 --- a/block.h +++ b/block.h @@ -51,7 +51,7 @@ typedef enum { } BlockMonEventAction; typedef enum { - BDRV_IOS_OK, BDRV_IOS_FAILED, BDRV_IOS_ENOSPC + BDRV_IOS_OK, BDRV_IOS_FAILED, BDRV_IOS_ENOSPC, BDRV_IOS_MAX } BlockIOStatus; void bdrv_iostatus_update(BlockDriverState *bs, int error); diff --git a/qmp-commands.hx b/qmp-commands.hx index 6b8eb0a..1746b6d 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -1082,6 +1082,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": last executed I/O operation status, only present if the device + supports it (json_string, optional) + - Possible values: "ok", "failed", "nospace" Example: @@ -1089,6 +1092,7 @@ Example: <- { "return":[ { + "io-status": "ok", "device":"ide0-hd0", "locked":false, "removable":false, @@ -1101,12 +1105,14 @@ Example: "type":"unknown" }, { + "io-status": "ok", "device":"ide1-cd0", "locked":false, "removable":true, "type":"unknown" }, { + "io-status": "ok", "device":"floppy0", "locked":false, "removable":true,