From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48881) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGu0g-0003bu-To for qemu-devel@nongnu.org; Wed, 26 Sep 2012 11:58:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TGu0a-0005DE-Ib for qemu-devel@nongnu.org; Wed, 26 Sep 2012 11:58:50 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:37650) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGu0a-0004VJ-C4 for qemu-devel@nongnu.org; Wed, 26 Sep 2012 11:58:44 -0400 Received: by mail-pa0-f45.google.com with SMTP id fb10so562435pad.4 for ; Wed, 26 Sep 2012 08:58:43 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 26 Sep 2012 17:56:29 +0200 Message-Id: <1348675011-8794-24-git-send-email-pbonzini@redhat.com> In-Reply-To: <1348675011-8794-1-git-send-email-pbonzini@redhat.com> References: <1348675011-8794-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v2 23/45] block: export dirty bitmap information in query-block List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, jcody@redhat.com Signed-off-by: Paolo Bonzini --- v1->v2: new block.c | 6 ++++++ qapi-schema.json | 20 ++++++++++++++++++-- 2 file modificati, 24 inserzioni(+), 2 rimozioni(-) diff --git a/block.c b/block.c index 2c1273c..074325d 100644 --- a/block.c +++ b/block.c @@ -2697,6 +2697,12 @@ BlockInfo *bdrv_query_info(BlockDriverState *bs) info->io_status = bs->iostatus; } + if (bs->dirty_bitmap) { + info->has_dirty = true; + info->dirty = g_malloc0(sizeof(*info->dirty)); + info->dirty->count = bdrv_get_dirty_count(bs) * BDRV_SECTORS_PER_DIRTY_CHUNK; + } + if (bs->drv) { info->has_inserted = true; info->inserted = g_malloc0(sizeof(*info->inserted)); diff --git a/qapi-schema.json b/qapi-schema.json index 26ac21f..dd418b8 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -604,7 +604,7 @@ '*backing_file': 'str', 'backing_file_depth': 'int', 'encrypted': 'bool', 'encryption_key_missing': 'bool', 'bps': 'int', 'bps_rd': 'int', 'bps_wr': 'int', - 'iops': 'int', 'iops_rd': 'int', 'iops_wr': 'int'} } + 'iops': 'int', 'iops_rd': 'int', 'iops_wr': 'int' } } ## # @BlockDeviceIoStatus: @@ -622,6 +622,18 @@ { 'enum': 'BlockDeviceIoStatus', 'data': [ 'ok', 'failed', 'nospace' ] } ## +# @BlockDirtyInfo: +# +# Block dirty bitmap information. +# +# @count: number of dirty sectors according to the dirty bitmap +# +# Since: 1.3 +## +{ 'type': 'BlockDirtyInfo', + 'data': {'count': 'int'} } + +## # @BlockInfo: # # Block device information. This structure describes a virtual device and @@ -640,6 +652,9 @@ # @tray_open: #optional True if the device has a tray and it is open # (only present if removable is true) # +# @dirty: #optional dirty bitmap information (only present if the dirty +# bitmap is enabled) +# # @io-status: #optional @BlockDeviceIoStatus. Only present if the device # supports it and the VM is configured to stop on errors # @@ -651,7 +666,8 @@ { 'type': 'BlockInfo', 'data': {'device': 'str', 'type': 'str', 'removable': 'bool', 'locked': 'bool', '*inserted': 'BlockDeviceInfo', - '*tray_open': 'bool', '*io-status': 'BlockDeviceIoStatus'} } + '*tray_open': 'bool', '*io-status': 'BlockDeviceIoStatus', + '*dirty': 'BlockDirtyInfo' } } ## # @query-block: -- 1.7.12