From patchwork Thu May 12 15:05:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 95327 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 606D5B6F4B for ; Fri, 13 May 2011 01:06:49 +1000 (EST) Received: from localhost ([::1]:50500 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QKXTS-000424-HZ for incoming@patchwork.ozlabs.org; Thu, 12 May 2011 11:06:46 -0400 Received: from eggs.gnu.org ([140.186.70.92]:54776) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QKXS4-0001yl-Qr for qemu-devel@nongnu.org; Thu, 12 May 2011 11:05:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QKXS3-0005CB-4M for qemu-devel@nongnu.org; Thu, 12 May 2011 11:05:20 -0400 Received: from oxygen.pond.sub.org ([213.239.205.148]:40279) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QKXS2-0005BT-Rq for qemu-devel@nongnu.org; Thu, 12 May 2011 11:05:19 -0400 Received: from blackfin.pond.sub.org (p5B32A28A.dip.t-dialin.net [91.50.162.138]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 1A6712DD48C; Thu, 12 May 2011 17:05:16 +0200 (CEST) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id 9D8A42AB; Thu, 12 May 2011 17:05:15 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Thu, 12 May 2011 17:05:12 +0200 Message-Id: <1305212715-26767-4-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1305212715-26767-1-git-send-email-armbru@redhat.com> References: <1305212715-26767-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 213.239.205.148 Cc: kwolf@redhat.com, kraxel@redhat.com, hch@lst.de Subject: [Qemu-devel] [PATCH v3 3/6] block QMP: Drop query-block member "type" (type= in info block) 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 Its value is unreliable: a block device used as floppy has type "floppy" if created with if=floppy, but type "hd" if created with if=none. That's because with if=none, the type is at best a declaration of intent: the drive can be connected to any guest device. Its type is really the guest device's business. Reporting it here is wrong. Signed-off-by: Markus Armbruster --- block.c | 20 +++----------------- qmp-commands.hx | 6 ------ 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/block.c b/block.c index f731c7a..c6dc42a 100644 --- a/block.c +++ b/block.c @@ -1704,9 +1704,8 @@ static void bdrv_print_dict(QObject *obj, void *opaque) bs_dict = qobject_to_qdict(obj); - monitor_printf(mon, "%s: type=%s removable=%d", + monitor_printf(mon, "%s: removable=%d", qdict_get_str(bs_dict, "device"), - qdict_get_str(bs_dict, "type"), qdict_get_bool(bs_dict, "removable")); if (qdict_get_bool(bs_dict, "removable")) { @@ -1747,23 +1746,10 @@ void bdrv_info(Monitor *mon, QObject **ret_data) QTAILQ_FOREACH(bs, &bdrv_states, list) { QObject *bs_obj; - const char *type = "unknown"; - - switch(bs->type) { - case BDRV_TYPE_HD: - type = "hd"; - break; - case BDRV_TYPE_CDROM: - type = "cdrom"; - break; - case BDRV_TYPE_FLOPPY: - type = "floppy"; - break; - } - bs_obj = qobject_from_jsonf("{ 'device': %s, 'type': %s, " + bs_obj = qobject_from_jsonf("{ 'device': %s, " "'removable': %i, 'locked': %i }", - bs->device_name, type, bs->removable, + bs->device_name, bs->removable, bs->locked); if (bs->drv) { diff --git a/qmp-commands.hx b/qmp-commands.hx index fbd98ee..b1c8206 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -1038,8 +1038,6 @@ is a json-array of all devices. Each json-object contain the following: - "device": device name (json-string) -- "type": device type (json-string) - - Possible values: "hd", "cdrom", "floppy", "unknown" - "removable": true if the device is removable, false otherwise (json-bool) - "locked": true if the device is locked, false otherwise (json-bool) - "inserted": only present if the device is inserted, it is a json-object @@ -1070,25 +1068,21 @@ Example: "encrypted":false, "file":"disks/test.img" }, - "type":"hd" }, { "device":"ide1-cd0", "locked":false, "removable":true, - "type":"cdrom" }, { "device":"floppy0", "locked":false, "removable":true, - "type": "floppy" }, { "device":"sd0", "locked":false, "removable":true, - "type":"floppy" } ] }