From patchwork Tue Jul 24 11:04:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 172853 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 41F3B2C0085 for ; Tue, 24 Jul 2012 22:07:02 +1000 (EST) Received: from localhost ([::1]:60867 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StdtE-0001Yh-9D for incoming@patchwork.ozlabs.org; Tue, 24 Jul 2012 08:07:00 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56762) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Stcw1-0007Vp-8i for qemu-devel@nongnu.org; Tue, 24 Jul 2012 07:05:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Stcvv-0005ht-BJ for qemu-devel@nongnu.org; Tue, 24 Jul 2012 07:05:49 -0400 Received: from mail-yx0-f173.google.com ([209.85.213.173]:61960) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Stcvv-00057s-39 for qemu-devel@nongnu.org; Tue, 24 Jul 2012 07:05:43 -0400 Received: by mail-yx0-f173.google.com with SMTP id l1so6601761yen.4 for ; Tue, 24 Jul 2012 04:05:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=wuUxaGH9c+8P/LZw8S7RerjNMCllQrSsMVHQ8yIe+RM=; b=hiwPq0eJl62ccq/itq+UgDbUelKsFdieIXjDaOIWRFU1uxZEbL24PTUSOuNWwf7K4K rioaTgVgFdpwLfiVqOdIQ15Zu0gmw7ybcniCNkqiaM1KjWeIGZk6fH2F+C6onWaaVg0/ agfnB83grMBts3XaWSBMn/EsYNA/ey45QAaraIj3JLSjMRPZJpCK91HLo5Mnb3ZQLEiN wwZjQtwL2qRI6jx95VUFKG8nKBFn5wejN/NT83Gh8Fn9nRb5HIJ1nWZE/cLSlp3YduNi dknVC4VdMGspKmwJ7xQVutCMr7+Nxv1H0tehR7Zt60CQaqCsynIQb/TCE3Jl2CWTYba8 eLvQ== Received: by 10.42.145.7 with SMTP id d7mr14393159icv.45.1343127942378; Tue, 24 Jul 2012 04:05:42 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-189-113.ip51.fastwebnet.it. [93.34.189.113]) by mx.google.com with ESMTPS id if4sm1752561igc.10.2012.07.24.04.05.39 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 24 Jul 2012 04:05:41 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 24 Jul 2012 13:04:00 +0200 Message-Id: <1343127865-16608-23-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1343127865-16608-1-git-send-email-pbonzini@redhat.com> References: <1343127865-16608-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.213.173 Cc: kwolf@redhat.com, jcody@redhat.com, eblake@redhat.com, stefanha@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH 22/47] block: make device optional in BlockInfo 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 Targets of a mirroring operation will not have a device. Once we have -blockdev or equivalent, "detached" block devices and non-anonymous backing files also will not have a device. Signed-off-by: Paolo Bonzini --- qapi-schema.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/qapi-schema.json b/qapi-schema.json index fca1806..b00d8c6 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -443,7 +443,8 @@ # Block device information. This structure describes a virtual device and # the backing device associated with it. # -# @device: The device name associated with the virtual device. +# @device: #optional The device name associated with the virtual device. +# Always included in the output of query-block. # # @type: This field is returned only for compatibility reasons, it should # not be used (always returns 'unknown') @@ -465,7 +466,7 @@ # Since: 0.14.0 ## { 'type': 'BlockInfo', - 'data': {'device': 'str', 'type': 'str', 'removable': 'bool', + 'data': {'*device': 'str', 'type': 'str', 'removable': 'bool', 'locked': 'bool', '*inserted': 'BlockDeviceInfo', '*tray_open': 'bool', '*io-status': 'BlockDeviceIoStatus'} }