From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:35346) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwjoK-0003YO-Dz for qemu-devel@nongnu.org; Wed, 01 Aug 2012 21:02:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SwjoJ-0003Gn-3l for qemu-devel@nongnu.org; Wed, 01 Aug 2012 21:02:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:15795) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwjoI-0003GW-Rv for qemu-devel@nongnu.org; Wed, 01 Aug 2012 21:02:43 -0400 From: Luiz Capitulino Date: Wed, 1 Aug 2012 22:02:31 -0300 Message-Id: <1343869374-23417-12-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1343869374-23417-1-git-send-email-lcapitulino@redhat.com> References: <1343869374-23417-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 11/34] qmp: query-block: add 'valid_encryption_key' field List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, aliguori@us.ibm.com, armbru@redhat.com, mdroth@linux.vnet.ibm.com, pbonzini@redhat.com, eblake@redhat.com Signed-off-by: Luiz Capitulino --- block.c | 1 + qapi-schema.json | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index b38940b..9c113b8 100644 --- a/block.c +++ b/block.c @@ -2445,6 +2445,7 @@ BlockInfoList *qmp_query_block(Error **errp) info->value->inserted->ro = bs->read_only; info->value->inserted->drv = g_strdup(bs->drv->format_name); info->value->inserted->encrypted = bs->encrypted; + info->value->inserted->valid_encryption_key = bs->valid_key; if (bs->backing_file[0]) { info->value->inserted->has_backing_file = true; info->value->inserted->backing_file = g_strdup(bs->backing_file); diff --git a/qapi-schema.json b/qapi-schema.json index bc55ed2..1b2d7f5 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -400,6 +400,8 @@ # # @encrypted: true if the backing device is encrypted # +# @valid_encryption_key: true if a valid encryption key has been set +# # @bps: total throughput limit in bytes per second is specified # # @bps_rd: read throughput limit in bytes per second is specified @@ -419,8 +421,9 @@ { 'type': 'BlockDeviceInfo', 'data': { 'file': 'str', 'ro': 'bool', 'drv': 'str', '*backing_file': 'str', 'encrypted': 'bool', - 'bps': 'int', 'bps_rd': 'int', 'bps_wr': 'int', - 'iops': 'int', 'iops_rd': 'int', 'iops_wr': 'int'} } + 'valid_encryption_key': 'bool', 'bps': 'int', + 'bps_rd': 'int', 'bps_wr': 'int', 'iops': 'int', + 'iops_rd': 'int', 'iops_wr': 'int'} } ## # @BlockDeviceIoStatus: -- 1.7.11.2.249.g31c7954.dirty