From patchwork Mon Aug 7 14:45:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 9885605 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 01933602CC for ; Mon, 7 Aug 2017 15:25:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E75D920881 for ; Mon, 7 Aug 2017 15:25:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DC274286B0; Mon, 7 Aug 2017 15:25:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6051020881 for ; Mon, 7 Aug 2017 15:25:36 +0000 (UTC) Received: from localhost ([::1]:37882 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dejuR-0000GH-BD for patchwork-qemu-devel@patchwork.kernel.org; Mon, 07 Aug 2017 11:25:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49308) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dejJJ-0007fB-Iq for qemu-devel@nongnu.org; Mon, 07 Aug 2017 10:47:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dejJ4-000477-5I for qemu-devel@nongnu.org; Mon, 07 Aug 2017 10:47:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37446) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dejIZ-0003fx-HX; Mon, 07 Aug 2017 10:46:27 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 61717BDD0; Mon, 7 Aug 2017 14:46:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 61717BDD0 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=armbru@redhat.com Received: from blackfin.pond.sub.org (ovpn-116-254.ams2.redhat.com [10.36.116.254]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B5BBF90C75; Mon, 7 Aug 2017 14:46:18 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 4D59A11386DF; Mon, 7 Aug 2017 16:46:00 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Mon, 7 Aug 2017 16:45:24 +0200 Message-Id: <1502117160-24655-21-git-send-email-armbru@redhat.com> In-Reply-To: <1502117160-24655-1-git-send-email-armbru@redhat.com> References: <1502117160-24655-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 07 Aug 2017 14:46:26 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC PATCH 20/56] block: Make ImageInfo sizes unsigned in QAPI/QMP X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, famz@redhat.com, qemu-block@nongnu.org, quintela@redhat.com, jcody@redhat.com, dgilbert@redhat.com, mreitz@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, jsnow@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Sizes should use QAPI type 'size' (uint64_t). ImageInfo members @virtual-size, @actual-size, @cluster-size are 'int' (int64_t). bdrv_query_image_info() gets their values from bdrv_getlength(), bdrv_get_allocated_file_size(), bdrv_get_info(), all signed. It ensures the former two are non-negative, but doesn't bother with cluster-size. vmdk_get_extent_info() initializes virtual-size and cluster-size from signed #sectors * BDRV_SECTOR_SIZE without checking for overflow. Perhaps we should be more careful with sizes overflowing into signs, but that's not something I can tackle now. Change these ImageInfo members to 'size'. query-named-block-nodes and query-block would now report image sizes above 2^63-1 correctly instead of their (negative) two's complement, if such values were possible (they aren't; the block layer uses int64_t internally). So would HMP's "info block", except for the ones it formats with get_human_readable_size(), which is still signed. To be fixed next. Same for "qemu-img info". Signed-off-by: Markus Armbruster --- block/qapi.c | 15 ++++++++++----- qapi/block-core.json | 5 +++-- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/block/qapi.c b/block/qapi.c index 5f1a71f..1c6123c 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -235,7 +235,7 @@ void bdrv_query_image_info(BlockDriverState *bs, ImageInfo **p_info, Error **errp) { - int64_t size; + int64_t size, allocated_size; const char *backing_filename; BlockDriverInfo bdi; int ret; @@ -251,12 +251,16 @@ void bdrv_query_image_info(BlockDriverState *bs, goto out; } + allocated_size = bdrv_get_allocated_file_size(bs); + info = g_new0(ImageInfo, 1); info->filename = g_strdup(bs->filename); info->format = g_strdup(bdrv_get_format_name(bs)); info->virtual_size = size; - info->actual_size = bdrv_get_allocated_file_size(bs); - info->has_actual_size = info->actual_size >= 0; + if (allocated_size >= 0) { + info->actual_size = allocated_size; + info->has_actual_size = true; + } if (bdrv_is_encrypted(bs)) { info->encrypted = true; info->has_encrypted = true; @@ -727,6 +731,7 @@ void bdrv_image_info_dump(fprintf_function func_fprintf, void *f, ImageInfo *info) { char size_buf[128], dsize_buf[128]; + if (!info->has_actual_size) { snprintf(dsize_buf, sizeof(dsize_buf), "unavailable"); } else { @@ -737,7 +742,7 @@ void bdrv_image_info_dump(fprintf_function func_fprintf, void *f, func_fprintf(f, "image: %s\n" "file format: %s\n" - "virtual size: %s (%" PRId64 " bytes)\n" + "virtual size: %s (%" PRIu64 " bytes)\n" "disk size: %s\n", info->filename, info->format, size_buf, info->virtual_size, @@ -748,7 +753,7 @@ void bdrv_image_info_dump(fprintf_function func_fprintf, void *f, } if (info->has_cluster_size) { - func_fprintf(f, "cluster_size: %" PRId64 "\n", + func_fprintf(f, "cluster_size: %" PRIu64 "\n", info->cluster_size); } diff --git a/qapi/block-core.json b/qapi/block-core.json index ecfeecd..02e12f7 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -156,8 +156,9 @@ ## { 'struct': 'ImageInfo', 'data': {'filename': 'str', 'format': 'str', '*dirty-flag': 'bool', - '*actual-size': 'int', 'virtual-size': 'int', - '*cluster-size': 'int', '*encrypted': 'bool', '*compressed': 'bool', + '*actual-size': 'size', 'virtual-size': 'size', + '*cluster-size': 'size', + '*encrypted': 'bool', '*compressed': 'bool', '*backing-filename': 'str', '*full-backing-filename': 'str', '*backing-filename-format': 'str', '*snapshots': ['SnapshotInfo'], '*backing-image': 'ImageInfo',