From nobody Wed Nov 5 10:30:11 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1533882703469910.0011644185709; Thu, 9 Aug 2018 23:31:43 -0700 (PDT) Received: from localhost ([::1]:54563 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fo0xa-0001Sg-9S for importer@patchew.org; Fri, 10 Aug 2018 02:31:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49398) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fo0tV-0006mX-0f for qemu-devel@nongnu.org; Fri, 10 Aug 2018 02:27:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fo0tS-0001db-Cp for qemu-devel@nongnu.org; Fri, 10 Aug 2018 02:27:29 -0400 Received: from mail-by2nam01on0127.outbound.protection.outlook.com ([104.47.34.127]:33504 helo=NAM01-BY2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fo0tS-0001cN-12; Fri, 10 Aug 2018 02:27:26 -0400 Received: from Jupiter.local (141.226.29.227) by SN2PR07MB2623.namprd07.prod.outlook.com (2603:10b6:804:8::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1038.21; Fri, 10 Aug 2018 06:27:21 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=janustech.onmicrosoft.com; s=selector1-janustech-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4+9tTJYSjVlDNnJ+HpINYXXuhSo9mGOApIc8y0i1XYc=; b=aFRAVu2Ry48WN/1wXKq062fjEdMovmjUP2WI16yBl5cUL/D5B0A3DWUbpX4zJMtaiXuJA9x6J6qtnAwXkJGiXxdzlQCwUCuhj1kH1kdYY/R+vGTjamGP012N2cbyNyH85JvcbvoTc4frVMuK1hmLBTQjzehuZKjxG1uVdFz/N+4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=lbloch@janustech.com; From: Leonid Bloch To: qemu-devel@nongnu.org Date: Fri, 10 Aug 2018 09:26:41 +0300 Message-Id: <20180810062647.23211-4-lbloch@janustech.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180810062647.23211-1-lbloch@janustech.com> References: <20180810062647.23211-1-lbloch@janustech.com> MIME-Version: 1.0 X-Originating-IP: [141.226.29.227] X-ClientProxiedBy: HE1PR05CA0232.eurprd05.prod.outlook.com (2603:10a6:3:fa::32) To SN2PR07MB2623.namprd07.prod.outlook.com (2603:10b6:804:8::7) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 70b11761-64ef-40ca-524d-08d5fe8a5583 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(7021125)(8989117)(4534165)(7022125)(4603075)(4627221)(201702281549075)(8990107)(7048125)(7024125)(7027125)(7028125)(7023125)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:SN2PR07MB2623; X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB2623; 3:4SGoUOp/3qYBDnHhwf4bVXlGyfyjrf/fMVtYv8mhEumqrTxMVMLzEcnK0fEHvPP+CUsIHXCVXVZpJwsAXOjDZcfhgERZXUeTJ23q2k5oxAnFvEN1nwS7jJbrsQ7wK3KlH8pe6hBpzmqXqqLS7A1tgluXMHMj6nRAbZewWOADw6Kz/HIcZpfTEwp3L2lklYI2u8ioSoK5bEwF92mhLyCJTBd1fzz9Eu6f4wpUBl00zUMsW68nGyvvZlvx2rcJSVUu; 25:FFlEmEMsKCIgIljsJn0xzZxMb0THJUcCfpu4SYLhjMwNUMKmVZusoNljrsLy8gDx8HKVGbuJ+ZCTqfHy5EnpsSvDzJ6wEmhFwXDr/quYTZO5Qj8O4br77iqUYpGsQu8nI9jnF4QR0BTcw7g+TS5xsIP4hVaqZ1Dv7QSTWDc87NytIpHPTmn+YS6oIOxxmJnuR1TX92JQXCbEc2t2+mdcGqQXBxJgH6y7rcsYWGdWZk76jSHNNUy3jybj5yIViWq0lGtyXqtTLWSbWYQiIVmDIc02H5N4LGrcoDBHe4YRknc0neZUyoQNucF5rrRq/XYOeL/9Hki/KXgfpP2f9cgF1A==; 31:6tJtv7RvODiA52tDzJO9Y4/cKtidm9iqMhzuB+k3O79oQkUOAsK2ETzlaHnhMAOYVZGhwYJDMVrp/LAqryZa1SPr8Olb+i1jDyUQ6CSwvIn3w+imQGet4JLkIE+bx0/cqMMW7e081EXftqcsJLCyx6AZRA8f6d6+nxo7rVJHLLh3cgr57iXT0Au1pyzqaHwHWLxDwcYITlvYUaZE7xl1PLii+rnK0VCQdlWX51MjDrs= X-MS-TrafficTypeDiagnostic: SN2PR07MB2623: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3002001)(10201501046)(3231311)(944501410)(52105095)(93006095)(93001095)(149027)(150027)(6041310)(2016111802025)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(6043046)(6072148)(201708071742011)(7699016); SRVR:SN2PR07MB2623; BCL:0; PCL:0; RULEID:; SRVR:SN2PR07MB2623; X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB2623; 4:qieaJ4rgOs2oMIDP5UNjohRCVH4GCaAC/MTq2E99vaXJkzrIQUH17GDv9jG9KRw4/xJEQ7266t92X3EPxkRgHt9RpmFkon0uca6agoNkjHhgJIuEMXd3JaTC9pSN1AVLxv3e8p1Y+bTROT5iKsUNGiLoSSbORujPo+T36gmZHx7yO05uE3TKHTxF8CHm9k3IQWG3vDwBB5VRGp9WgcsOQex1fHmoDr0Pzm9iWS9UNyx+rNibja7aWvqzecOOyZsw1pJeF1n21zd1rExqoESw+A== X-Forefront-PRVS: 07607ED19A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39830400003)(366004)(396003)(346002)(136003)(376002)(199004)(189003)(36756003)(2361001)(68736007)(47776003)(107886003)(105586002)(4326008)(5660300001)(186003)(106356001)(16586007)(2351001)(6506007)(316002)(26005)(76176011)(16526019)(86362001)(6916009)(54906003)(6666003)(386003)(25786009)(478600001)(11346002)(6116002)(8676002)(3846002)(81166006)(50466002)(2906002)(81156014)(2616005)(53936002)(51416003)(446003)(48376002)(6486002)(66066001)(486006)(7736002)(476003)(305945005)(52116002)(50226002)(97736004)(1076002)(956004)(8936002)(6512007); DIR:OUT; SFP:1102; SCL:1; SRVR:SN2PR07MB2623; H:Jupiter.local; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: None (protection.outlook.com: janustech.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN2PR07MB2623; 23:p3A/8SqKIcLzZp0vAvM+V1DN1/XSZ38ND4hWEnMu9?= =?us-ascii?Q?dMmx1bL+1Izl2KTmn3grLcpBE+1pO14XXcIpcZWgUmjHXvSt01IPqc/zjTvx?= =?us-ascii?Q?xpvEoyAhck0hohyn9Tq+IRRnfWm7GQ3t7h22BXoTre9t3Kd5f6JAnN+s3c5O?= =?us-ascii?Q?+bkJri42F/yzQ7xXxHJMR3DQeQLp1HF/CKDZ3s2BwUrJakXhAguG6pSwz8Gh?= =?us-ascii?Q?tvRtrM8d1NfiabM8UIM2r3TAYEvVshSGkQF6LB1w7N8bdpU97I5co+bioPqD?= =?us-ascii?Q?tgYDjH+qs2ztZhTQJUiHUYuMo0ydBldF4e+qtjC2TYnkBuWpFZBhj6Wswr84?= =?us-ascii?Q?6xP7WD5hAq9SUoCxMdUh6id1arIzDUfgmJb8tc3TQck1Vh8TtTSLlD6Z2Gds?= =?us-ascii?Q?4kemcpB5r8QWlmFD7EH120HfhOu6MPX/XUGjOrwoUqpB9HqYwpdpTU4y5f8J?= =?us-ascii?Q?CnoP7XsxzwWCfTuDKNLf6KBBF8kBxpZoq7iMdz8SstGByGXHSNQFxPLrHh72?= =?us-ascii?Q?SmVaDhowYaft7O8/aQFQd2C1vgW+m6+mK16fkkp96R53lTiaxT9B6DlBp6e0?= =?us-ascii?Q?z50rhEa+WAmNQExz4I2erj+Ls3hFJzCCTNBgE4kcVK1Mx4IgV6W8fZI50ufB?= =?us-ascii?Q?j7ahJLhGN3Bb4dpIk4AYHBqw3JKcAUdghRRFB1l92P3ZpQtvHkzmwvC8xUBU?= =?us-ascii?Q?q/kDujqeZJR2InsCqDULCNoPm50z9Q2+dRVMWKgyTKXFGJnI/qdH8v64gikk?= =?us-ascii?Q?fMChKvZRzIUMsJ2FNYBWuQEjsdxdQxGWSm1rxbFYRUGur+eeEsPC7FytPqoe?= =?us-ascii?Q?IVT61pvYlDm9UODAR4AysLPKU5yS4YcFILeSkn49q3Oytdy7I8siQJ/sWUgc?= =?us-ascii?Q?kjn5uAOGPk1wo6alSJHPf171AzCbrMiQAtpWKxf4yT65f1ss/Kn5nuB7aisc?= =?us-ascii?Q?rUGy2EaSTrtSuSDnQ4sPY3x65f2aje5GdB01849EiP/+vWY0Ys03peZ7IgcN?= =?us-ascii?Q?nsH9lDAmBeR6GdhsF/jiKAdY7fzloTs5PfVwNi/+mV07iTU/PG/6FEguuTy2?= =?us-ascii?Q?2Zy7evT5bd1U2Gg/75VeaihXwYlQJfKYomV/8YnCXiKwEkZUQz0X4H7JLTBN?= =?us-ascii?Q?7fWfOTnAU+ptBlucTE4h5YPk0ttC4U5VNVmPVRMvRwWBiu/hxVNRTU7CJc0L?= =?us-ascii?Q?DVGLv/OsKIJXMpHjsaNcqUt2mb3gRoSkz5O+GjWg7lSSlrxKEJvaEb+QmF8u?= =?us-ascii?Q?lKZhYrQLbhRlPuwk8k0t+HaU+qTuFXpq8v6Yk1w?= X-Microsoft-Antispam-Message-Info: BAeUnFQDDpFuhum3UASlMfMrdIdEh1F56r4EyaXZ2PmQLt+mLBxMp2+gthHLc70X70Mnm0LCyItwOJTmXdqjpAwIMr+MQaiMaXFleltNwrFvX6ZOqCFxFwBqMXvUX+0Zxl9cObU9eg7HGWvK+Oka1ywkxtdqp1kxRG2Ri67AupVpVftDTVu5SzCjXI6uM3cREPkw5oUAr4+kxalGK75ZIfAC0r+6A21jTDhYRaSTL3i0tHPU0/0fxik347vc0O/zrwFXInbzusUZjW2mYv/+sMh0sIi+QUbBC+YUsUqe8g8r7aK9IYMDpEWu3KjqBK8dO0K1ycQ1VCJHD+sks26odOg8+PN9mGPc/MomGkzi8YY= X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB2623; 6:21d5qF2ecPGc/nhTFkXOJaye3e1jmeF1hpelbyOexs2k05SkHL6t201RFqzPjTSzx/0I6VruMRzifYhDcviSUqKY1H/72D/+AQLxRtU97LsnjSGOxyBO/vD7q+nUaZWoe66Bn+hclnMBeCP2sKYxqa9Fuzt5rh477363ELYKBW55JALjTcKxie23Cs8yuV20NlBrq6fiieQvgND+uLSfZG0I+ssyNORYfUg4dhw33I3h7eVihGgImS4cplZcUClje3cG5r7jc6zYCdXEv8ESRLo3jhwQyg+0x6k9G1KbuKto6GKXHkG8L73ZBBe+6NVJVOojCfmDbKtUD9FaKRktR2Ju6LUODk840trAb0UyzgHxlwSFkf8tG8SGt6ghjUSuDU87XkBYvNsr/KObsG+ImK1crevIkl2rTgNO+DGjAXWwX3uVuLPp+t47aqiQtuUnHolNf1LaJE38fvGb7td8IA==; 5:8eyrgflwhPdtnEgALN7vptZH7F3j5ZPUVrxjWMmsbc3jReiyUyURCkYpinJU8XlFCIr4Wa4EEAQ0JvRUI6eM/ufzyeWb/veqkBR1I/4kHhxC+umpkCcBKzAE790L9QBLEuAKlyn0qA5Nrfz8R8uh+GvemDsr2i6FOn19GvDtQuA=; 7:6K/rVccmWLVm84/O6o4UIHj9rfRiKXcIOfCSArffDatyeOORd9uifIkWEGFEqxoXkyKw5eCpInW4WtVi0cvPMc40/hmOEdGzQm9uLU56EAN2Q78nft34I6AUEwEWtZ5ufmuLIWd8NHibT+/c+qUNYVPHoy5SGoxKipyD82aCxHuU8LdX7JCgzMSCOuWrtH+I4nr2tMZFshYg8pFrq4hgOMunuJA30RCObhLwzFYUGskhNcs2Xr6SMpSiDIhQb8FC SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: janustech.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2018 06:27:21.3435 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 70b11761-64ef-40ca-524d-08d5fe8a5583 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 34eb020e-3cf3-43a1-afeb-f5cf1310628e X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN2PR07MB2623 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.34.127 Subject: [Qemu-devel] [PATCH v7 3/9] qcow2: Make sizes more humanly readable 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: Kevin Wolf , Alberto Garcia , qemu-block@nongnu.org, Max Reitz , Leonid Bloch Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Signed-off-by: Leonid Bloch Reviewed-by: Alberto Garcia --- block/qcow2.c | 2 +- block/qcow2.h | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 3f4abc394e..7a2d7a1d48 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -831,7 +831,7 @@ static void read_cache_sizes(BlockDriverState *bs, Qemu= Opts *opts, } } else { if (!l2_cache_size_set) { - *l2_cache_size =3D MAX(DEFAULT_L2_CACHE_BYTE_SIZE, + *l2_cache_size =3D MAX(DEFAULT_L2_CACHE_SIZE, (uint64_t)DEFAULT_L2_CACHE_CLUSTERS * s->cluster_size); } diff --git a/block/qcow2.h b/block/qcow2.h index 81b844e936..39e1b279f8 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -27,6 +27,7 @@ =20 #include "crypto/block.h" #include "qemu/coroutine.h" +#include "qemu/units.h" =20 //#define DEBUG_ALLOC //#define DEBUG_ALLOC2 @@ -43,11 +44,11 @@ =20 /* 8 MB refcount table is enough for 2 PB images at 64k cluster size * (128 GB for 512 byte clusters, 2 EB for 2 MB clusters) */ -#define QCOW_MAX_REFTABLE_SIZE 0x800000 +#define QCOW_MAX_REFTABLE_SIZE (8 * MiB) =20 /* 32 MB L1 table is enough for 2 PB images at 64k cluster size * (128 GB for 512 byte clusters, 2 EB for 2 MB clusters) */ -#define QCOW_MAX_L1_SIZE 0x2000000 +#define QCOW_MAX_L1_SIZE (32 * MiB) =20 /* Allow for an average of 1k per snapshot table entry, should be plenty of * space for snapshot names and IDs */ @@ -75,9 +76,9 @@ =20 /* Whichever is more */ #define DEFAULT_L2_CACHE_CLUSTERS 8 /* clusters */ -#define DEFAULT_L2_CACHE_BYTE_SIZE 1048576 /* bytes */ +#define DEFAULT_L2_CACHE_SIZE (1 * MiB) =20 -#define DEFAULT_CLUSTER_SIZE 65536 +#define DEFAULT_CLUSTER_SIZE (64 * KiB) =20 =20 #define QCOW2_OPT_LAZY_REFCOUNTS "lazy-refcounts" --=20 2.17.1