From nobody Wed Nov 5 02:32:58 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1532470842051867.5663225928238; Tue, 24 Jul 2018 15:20:42 -0700 (PDT) Received: from localhost ([::1]:42801 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fi5fX-00083L-7c for importer@patchew.org; Tue, 24 Jul 2018 18:20:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45109) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fi5dg-0006hc-K2 for qemu-devel@nongnu.org; Tue, 24 Jul 2018 18:18:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fi5dd-00078f-Fe for qemu-devel@nongnu.org; Tue, 24 Jul 2018 18:18:40 -0400 Received: from mail-bn3nam01on0122.outbound.protection.outlook.com ([104.47.33.122]:3709 helo=NAM01-BN3-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 1fi5dd-00077d-Aj; Tue, 24 Jul 2018 18:18:37 -0400 Received: from Jupiter.local (141.226.29.227) by BN3PR07MB2612.namprd07.prod.outlook.com (2a01:111:e400:c5f0::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.973.20; Tue, 24 Jul 2018 22:18:33 +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=fDbANzQNRT48QJOXrc6SiJTrWmBamxj5GpKbHgOllAk=; b=VL7QxYcxxoSL3XBqKCpnvp9yuxKimEBjnyeixaJbDTcamgP4APS/SRbERJE1nMYjkohkawDuUESF2dqbuTdiSV1CLDooSZ34WK7gkVpJ72m2RdlF8tKcqGasetsn8l5MpdV0zrv5Bkhg6AUr+sRHnzWwTEiNDCxjB+dGdINnysA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=lbloch@janustech.com; From: Leonid Bloch To: qemu-devel@nongnu.org Date: Wed, 25 Jul 2018 01:17:47 +0300 Message-Id: <20180724221750.16282-2-lbloch@janustech.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180724221750.16282-1-lbloch@janustech.com> References: <20180724221750.16282-1-lbloch@janustech.com> MIME-Version: 1.0 X-Originating-IP: [141.226.29.227] X-ClientProxiedBy: HE1PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:7:28::15) To BN3PR07MB2612.namprd07.prod.outlook.com (2a01:111:e400:c5f0::16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 792a178b-6821-4f9a-5258-08d5f1b3661a X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(7021125)(8989117)(5600073)(711020)(4534165)(7022125)(4603075)(4627221)(201702281549075)(8990107)(7048125)(7024125)(7027125)(7028125)(7023125)(2017052603328)(7153060)(7193020); SRVR:BN3PR07MB2612; X-Microsoft-Exchange-Diagnostics: 1; BN3PR07MB2612; 3:pDiAg42fcfEFjlLuC2z5+9Kfu5rwjJ1tlj9YanI0WJNv5NWmru1rSXVR7GmaBVxlTBqOlUV+T6TK/xJp7HtcIWwSq11uRqN+1Qn17VtLDvm3xP4FggzopNq1XV9xVc/jypAMkMzfE0lyiPVnfo4iJj3Fs4QSrr867ugRhPG3SpMN0U1qDVqeaxDwIx4KNGykN1Ng/n5vGhcDu/wlTxF50CPOdIStSEpU7eoooY5eHMrhImYbTEH7cDCPnk0xqdpr; 25:vgMJut3rHqIl1gGPaO9xitBs0IufnZX9VYXV9PYJdWcJo5zzqNDz43p2EjZWN5LfhtIJAjPWO0uRleLH+TZqJxvh5cppOhfAy7WpbJEFM3Fd065SA4VK2B8KrRsoArxnL+xRFm6Y3XUnK2daRPO4rsacNwVNaHBo7v7dql6Tv9A14XvWmDCFKpYFxvquSSXDJG6cF7HKaxEWfc4q3LLgi37U8g7TZFIEP2EvlXW2U23K9VF4UU5utClhqOTZW3lP6gaPhnZEYoaAukFMh1Y1xHEM8H+iSKLAw3c8UDDA+IicZXNd9RLwJI8AvpI7spl0H6m/KFUj0ww3PbmLooZRaA==; 31:YG3AXROq1q5xqD7ObRYRe5KlnTLaqS9OFKz3y7+EOVIXYiGthi8Wx+oBH5W+xK355ioO0n/Ir5YjddpX7+VGmwfxiQT6EWCzqTuJino82831s5aAGK2xTh8mKL/Aeva00C2Xq8a123xsDQ6eD0i0nmLzFEp6keK60dtzceYbg5C65hbOwc/SaVP4xYE03QjUlyzorsuDo022+YTr7emrYK9fuyLNRk1dznHyxtg0WdI= X-MS-TrafficTypeDiagnostic: BN3PR07MB2612: 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)(8121501046)(5005006)(3231311)(944501410)(52105095)(93006095)(93001095)(10201501046)(3002001)(149027)(150027)(6041310)(2016111802025)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(6072148)(6043046)(201708071742011)(7699016); SRVR:BN3PR07MB2612; BCL:0; PCL:0; RULEID:; SRVR:BN3PR07MB2612; X-Microsoft-Exchange-Diagnostics: 1; BN3PR07MB2612; 4:8gnIe1RYiy+gJK08BIwbm6Xy15SsQ3jVdv37yVB8/MiPe8ppSaFJ1ms9mUjR/FzEoNeKS96LhymKgC9dZnQp9OSgr9CKfpPJpeYzyraWmGv7o2xswSKRttY150P/1s0E5A3jJSSt1dC2xxN41dE3/4BwwVDZFJIvg+ZxCdOmj04TFCnm/kpLt4MnTyL8AUeP2FWpZILqwL47D155uAaTKXz98z5I5OFjds4RgeVx1enjqCE8XGMF30xHIkYrcdjeiEBM/fMaPnh5TIcPknToLw== X-Forefront-PRVS: 0743E8D0A6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39830400003)(396003)(346002)(366004)(136003)(376002)(199004)(189003)(68736007)(14444005)(3846002)(52116002)(4326008)(51416003)(1076002)(76176011)(2361001)(53936002)(54906003)(5660300001)(25786009)(8676002)(107886003)(2906002)(6486002)(6666003)(6116002)(86362001)(50466002)(48376002)(6916009)(486006)(6512007)(36756003)(2351001)(478600001)(97736004)(66066001)(305945005)(7736002)(2616005)(8936002)(956004)(11346002)(476003)(47776003)(446003)(186003)(16586007)(16526019)(81156014)(26005)(316002)(6506007)(50226002)(106356001)(105586002)(81166006)(386003); DIR:OUT; SFP:1102; SCL:1; SRVR:BN3PR07MB2612; 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; BN3PR07MB2612; 23:85HCVvmMpRuUG4q3xuD3nBtEBbH7VhcQt/4B6qDQ7?= =?us-ascii?Q?j5f8vqYsKoexr77F/y/OrB5ogpw7/n88dN+Uhult0cfOJzxwN2D2a8kkjjLq?= =?us-ascii?Q?Bt0F2BqV1X4XWfv5mMGtsxh7pDRuKsNFYwFTk86245hhZ8QmvIY4Av3LGP2Q?= =?us-ascii?Q?gXjLXCe0QvQAviZW7jk/skFK78LoW0gH8XSWlrZSFbSGrO7kfpkLYVsxqT+6?= =?us-ascii?Q?S0I5whwL3ZcUSVXXncwcsB1V38AcnsDUZFshMat6SLUqusZ3Q8HmNFtbnn6v?= =?us-ascii?Q?EPtf3DKd/bNtSEY8m5I2DPqhlHdPn5MUI5Pnd2o81NEjI0gmlw1hFymQqxBr?= =?us-ascii?Q?jK5n+IArj4WM8uzKPQEnXXrm7lvJPFAjbLoCpPGfT0J9MOmN7AWHNf/T9v/y?= =?us-ascii?Q?KW2ahpATXeUvJZeSBjm5pr/O09BCaxK9CT2ZIi+R1p7mtdaxHo8HzSTuNtTB?= =?us-ascii?Q?U7gm/cN2aCMtSaf4FF9GO0vO/9Ey/Y+5ycK/pJAwndHw5Jm+V/8nSf7yF5bz?= =?us-ascii?Q?xRMNUaGL8vFizXAz/WxGLSGcYlUEj1z6fNNGLj2wwkMfzAK6qNJxI6THkxdD?= =?us-ascii?Q?KTkLJsquon6bnKp3qHeJUxz/Z6WzeeuLkH2y6EzLTPeTOsDEN62c66mHsIJZ?= =?us-ascii?Q?2N6JSRn30FmuRNFC8/QIXgPV7Pdh7FB38sE4VtzGtQG8JW4JwRraltWVOMb/?= =?us-ascii?Q?9Jxo9xSra5yft8ev4h7NMcdj/87BvWTXIGmJVbbujwx8u83bDAeOypqpgLhy?= =?us-ascii?Q?SrOLOD07x9seGS+2fYMLewfoUXW40YZGwPe5sUE3m0oMpoaVnMuHafLghlB4?= =?us-ascii?Q?tQbiR93WybnUH/OdBwJFPmH8w8aHa9DwFliFKN9PlXihM3w8VnEDH9xZG+bL?= =?us-ascii?Q?P6C9JckIE+bLUZgL/DhzWqmZ5lc6NTvj1ZvRWLX4gJfIBj9pwDoRuA0NgGeP?= =?us-ascii?Q?t+ggB4unzVz8M9NHiV9kjxZHSbzPNeiLHdasI5s1iba4xfSm8hw3iu01J0rc?= =?us-ascii?Q?KnUparepdsAM+45YcabTzwzB/pYyFpbaUYbG/DMaRMhZqrq5E9PsWEFI3ob8?= =?us-ascii?Q?QsCNXpay3BfPSp1sw6+shb8jie+31oCRI92wXJU3GP9TiY4JQS30mYz/OjC2?= =?us-ascii?Q?D5n3wGf3MPkniZiRuQLuCsUJ9LEMYaMqQ88XaK0zm/DnkAr+rkSKhdAM1MJy?= =?us-ascii?Q?Y0WU0rXrJAntPVgxnVTemMLZLiCuF/+Fce1A2mFo36wkmhUAo0m53S+TOxPg?= =?us-ascii?Q?he0Y8KH+NMkGNR/OnWuT5JEs6v3X6qyG1nRddmam62F0JO9ACXDn1UqN3TZG?= =?us-ascii?B?dz09?= X-Microsoft-Antispam-Message-Info: uZHjvvoCz2vQx8ODC9FT1XayRc4ni/Dtxok8mD9mi1CwDJWtBPAa552Gyjrp4AzvVB0x81hGBCRjkHpJDSjv3jGtSS45uAGHq9ZpjT2r21ZIfflCP0YDWbm4sObOgLFFfC7RcsA73DrKgMP+1vIoc6ZDsqJY5IGBs5/J3AOsfqvge3nC2rkLj5cVrJlFV+K3sD3OCr3p72m130vguqeIYMfXh2GIiKfaPlXN5Kfr3yGBPzoFPvWEh6LU5DqnKvAYs3V8vHOAzPd3mbSJdJoIUZTn+AaSicy16OFBKwu34Vx0nX4LHv8kVuocs/Vel5djgOn1X2w42CLo7taxq+USF1mb9oxobH1fPiTmyIEsKAY= X-Microsoft-Exchange-Diagnostics: 1; BN3PR07MB2612; 6:9RxiMeNWYfohn+QigRorXKYgS8yZxxMqFG2uGb363UOlMnLGmK4ImRSe1va0/u95t8BVUZ3kIAjuBZWOtmxc5BZVchH7EcKDc2WYzg1Kgm7X30plyThqGzDGgZ6fUtyHvmuNW73NspuZV/NDOiejKL7sn82AR/BGHaG1qtJ/pKKc+AKyofTU65Nouy1U/6DKX5SNUs2bbD/fo2c6R1hTJF++VQikHOHSm5LrxNbCI1j0b7gWy5Wjwi8KeQlq0EQSIuVT2UY081EBzr8/O9vKEC24k/IbEHMjQuz7YBNkpPym1trM0yaMH1gbgHUtqRQ8Gl/SMc4sIiPZ8sqKfwIQ+1W2tL3nfsE51+v13Rtzjz0upo9tpxIkS6fhyNI/99tOcm+FlVmeM9KaWZ06A4vFPxi5QAIukIi3ByGY30SaK86tT7H1XJfjiJXQUi4sEIf1/MXRvnjJ2L2re43AjPUraA==; 5:7ciyStmCofX4nkYHBkwpQCSbhEMgGyG1Jy/yGnqUxjPQNrb8wZ0NTmh+a9hkADwxfjWmdcaPzT2DKfDL/di8qbosmQPhJrvEhT+QoFEZaXcQcMKoBlcp/1nT7xYLIMp7zMf+ZNDMh07exRJ6hNqLMQMMiWA60TIB/I0ZX5qpYGg=; 7:YtbwyidGr/R4GGK5C8G7a49TS88NuZtYDgWHwcjluhiU4ImgXUR0fhB35XGXEhzLjAtcTvZXr3UIrn3eee+emRMsGLCx1ORpQoQbErB1KR8zQ9+oWjLxkXPxosIKHSRM0Z6+cId6seOielQBECiw7OqKFb/VZOZvETGsai7LP9frNPbrnz0sK0eyLtJZsVB27jpo8941F/Z+wwxReSm1Nui8OMpplrXFXZAZghKT24yJlywmQWnlaQi8O3MO9nKo SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: janustech.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jul 2018 22:18:33.6537 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 792a178b-6821-4f9a-5258-08d5f1b3661a X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 34eb020e-3cf3-43a1-afeb-f5cf1310628e X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR07MB2612 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.33.122 Subject: [Qemu-devel] [PATCH v4 1/4 for-3.0] qcow2: A grammar fix in conflicting cache sizing error message 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 , Leonid Bloch , qemu-block@nongnu.org, Max Reitz 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 --- block/qcow2.c | 2 +- tests/qemu-iotests/103.out | 2 +- tests/qemu-iotests/137.out | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 6162ed8be2..ec9e6238a0 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -797,7 +797,7 @@ static void read_cache_sizes(BlockDriverState *bs, Qemu= Opts *opts, if (l2_cache_size_set && refcount_cache_size_set) { error_setg(errp, QCOW2_OPT_CACHE_SIZE ", " QCOW2_OPT_L2_CACHE_= SIZE " and " QCOW2_OPT_REFCOUNT_CACHE_SIZE " may not be = set " - "the same time"); + "at the same time"); return; } else if (*l2_cache_size > combined_cache_size) { error_setg(errp, QCOW2_OPT_L2_CACHE_SIZE " may not exceed " diff --git a/tests/qemu-iotests/103.out b/tests/qemu-iotests/103.out index bd45d3875a..ab56f03a00 100644 --- a/tests/qemu-iotests/103.out +++ b/tests/qemu-iotests/103.out @@ -5,7 +5,7 @@ wrote 65536/65536 bytes at offset 0 =20 =3D=3D=3D Testing invalid option combinations =3D=3D=3D =20 -can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcoun= t-cache-size may not be set the same time +can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcoun= t-cache-size may not be set at the same time can't open device TEST_DIR/t.IMGFMT: l2-cache-size may not exceed cache-si= ze can't open device TEST_DIR/t.IMGFMT: refcount-cache-size may not exceed ca= che-size can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcoun= t-cache-size may not be set the same time diff --git a/tests/qemu-iotests/137.out b/tests/qemu-iotests/137.out index 96724a6c33..6a2ffc71fd 100644 --- a/tests/qemu-iotests/137.out +++ b/tests/qemu-iotests/137.out @@ -16,7 +16,7 @@ read 33554432/33554432 bytes at offset 0 =3D=3D=3D Try setting some invalid values =3D=3D=3D =20 Parameter 'lazy-refcounts' expects 'on' or 'off' -cache-size, l2-cache-size and refcount-cache-size may not be set the same = time +cache-size, l2-cache-size and refcount-cache-size may not be set at the sa= me time l2-cache-size may not exceed cache-size refcount-cache-size may not exceed cache-size L2 cache size too big --=20 2.14.1 From nobody Wed Nov 5 02:32:58 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 1532470971077606.1610372122955; Tue, 24 Jul 2018 15:22:51 -0700 (PDT) Received: from localhost ([::1]:42817 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fi5hi-0001bn-0e for importer@patchew.org; Tue, 24 Jul 2018 18:22:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45173) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fi5dj-0006j3-Qo for qemu-devel@nongnu.org; Tue, 24 Jul 2018 18:18:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fi5dg-0007CS-Am for qemu-devel@nongnu.org; Tue, 24 Jul 2018 18:18:43 -0400 Received: from mail-bn3nam01on0132.outbound.protection.outlook.com ([104.47.33.132]:57302 helo=NAM01-BN3-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 1fi5dg-0007Bm-5W; Tue, 24 Jul 2018 18:18:40 -0400 Received: from Jupiter.local (141.226.29.227) by BN3PR07MB2612.namprd07.prod.outlook.com (2a01:111:e400:c5f0::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.973.20; Tue, 24 Jul 2018 22:18:36 +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=aqMmRNU/7KRZTAja561wiGva9NoVtDNSGoa3NKB24bs=; b=MQh8BfsJSG1w2Tcaek1gVqOG6FCSybtlZOjSBnZ/y44o6A0B9bUT8sPPMjIB1vATpDcpebJmKdsfaAlfnkzMkH0tD76LiAsrDlNVvmlnVvqqEJ6wFc+ypnnFVmM7BuAlzvJx1dcGP3FApvecqSq/sJAvaAlOKbq3CK9R/Ze9RmU= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=lbloch@janustech.com; From: Leonid Bloch To: qemu-devel@nongnu.org Date: Wed, 25 Jul 2018 01:17:48 +0300 Message-Id: <20180724221750.16282-3-lbloch@janustech.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180724221750.16282-1-lbloch@janustech.com> References: <20180724221750.16282-1-lbloch@janustech.com> MIME-Version: 1.0 X-Originating-IP: [141.226.29.227] X-ClientProxiedBy: HE1PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:7:28::15) To BN3PR07MB2612.namprd07.prod.outlook.com (2a01:111:e400:c5f0::16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a00ad46a-6b7b-4561-7249-08d5f1b367b1 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(7021125)(8989117)(5600073)(711020)(4534165)(7022125)(4603075)(4627221)(201702281549075)(8990107)(7048125)(7024125)(7027125)(7028125)(7023125)(2017052603328)(7153060)(7193020); SRVR:BN3PR07MB2612; X-Microsoft-Exchange-Diagnostics: 1; BN3PR07MB2612; 3:vuS3CA6eMiJPhE+jZolC7pYc254ir8UCOJsDAEcMpnIzkiG7hCCJk5nxkuBvLIhv0O9z2caJEDhpNRvWxqOjgw/jMILf6VuRkctcH6zxl2gnBwHAAOXKEyc5fbCUVnTn+/fOG4h9d5lCAMte2EnY+U4XwWZT/RmH8T797SOpg6xpRfw41/AUYNguPkV0jgcspI0stk1ZXrsCm1n1ZCgpip9/S0oYs4OVXaUhNpuprBG2U0DpXr6cp1YbcgPyErX1; 25:ZYztk0DqD0MvPHzNCszl6xPdFuXNcL7pC7a4/K53zYcfUklv9eLisWRp8Lun760E4+7n01/MyfkpToteV/EirdrHkAKPKzOj7B3XYtRkEUlvgLNAAZBd1zd3wdvzp1mM431OofxIrbkT8wYLxOs1WmnwJTqiQrVTzSdZw3cCRf1l2lEKGT81nEPPQQf4z6QeEojO+p86jDLgkbFIim9NwOSYNwAIm60F9HYS93byVA1XQHWqSRcgGoQa6JY5uYj5w3oxPsBIcrje51nE1u84itEdHQDhXUB3MyFJrLJa1EL6m2kgIJ5SIujCaxYzwmID1mo4doBjXQTD9NDclftsaw==; 31:rIcbfBkJHhfrmsyBIVMxJhNJ3DD/M3jsnPDOIj6Kkwjb6mLFL167oXDweii+0X0CrlTVY2xWywLcOoZke6yUf/mE4n9OgIsoBi9e9zrftu6WrTSzG/kxH0tNhqCLJJ01jLL6H14USXC0uR7ohZFQF/bKWzDD9PJheSC3NpDl5ArV4AdAbOxXuzqO+ZmKjS4tcOAnBrHHpcRzATjTihI4bYR8EEWWHQTJiNq+YJeNSzI= X-MS-TrafficTypeDiagnostic: BN3PR07MB2612: 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)(8121501046)(5005006)(3231311)(944501410)(52105095)(93006095)(93001095)(10201501046)(3002001)(149027)(150027)(6041310)(2016111802025)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(6072148)(6043046)(201708071742011)(7699016); SRVR:BN3PR07MB2612; BCL:0; PCL:0; RULEID:; SRVR:BN3PR07MB2612; X-Microsoft-Exchange-Diagnostics: 1; BN3PR07MB2612; 4:lJUzf5DWmqD+X7+TrK4HD0Wrbatxa07UrvbS3Z3sqHGotzYNQH7Amf3rDAKNFg9E1BNliB8Gv7mWeiRv8ygFyxr8Ma9rKAxvDlb9BeJ04IIPB7VLIKM1gAvdDQy77uT36/5U7Rg1kLPY0nRlKPvgJrm03nX1zESN9HtT5QLWMVNwlc1Ueu5BX/W1ttSVfN62W28MsiBs3MaM9lvcRtpLqa09JYNWPwzbQyFNMqjSkQiBFlX9X0PZ/lneu1Iv+uw8ySwRSiIUXQmyuq5/Urqy2Q== X-Forefront-PRVS: 0743E8D0A6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39830400003)(396003)(346002)(366004)(136003)(376002)(199004)(189003)(68736007)(14444005)(3846002)(52116002)(4326008)(51416003)(1076002)(76176011)(2361001)(53936002)(54906003)(5660300001)(25786009)(8676002)(107886003)(2906002)(6486002)(6666003)(6116002)(86362001)(50466002)(48376002)(6916009)(575784001)(486006)(6512007)(36756003)(2351001)(478600001)(97736004)(66066001)(305945005)(7736002)(2616005)(8936002)(956004)(11346002)(476003)(47776003)(446003)(186003)(16586007)(16526019)(81156014)(26005)(316002)(6506007)(50226002)(106356001)(105586002)(81166006)(386003); DIR:OUT; SFP:1102; SCL:1; SRVR:BN3PR07MB2612; 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; BN3PR07MB2612; 23:1ENaYApwAeN+QD1FwoPmB0NwqU+ZRB2ji1AAt41hr?= =?us-ascii?Q?MDn6S8+f4JMOUt8uAwE691FdSrEnsJDYo9Nv0orx59D7aC/J0S1BRgoNHe6m?= =?us-ascii?Q?GBO/59LhQiWOpiSdIPSEv23hJuafF1IUZknp9SxRMpSGxxgYWJdGcgMnB/dj?= =?us-ascii?Q?6FdCbqshsK707E5mHqFBbRPaFPWHE8h/Ka92uKupgsKKi411UCrY8gqWQBEE?= =?us-ascii?Q?7kdTDDeL3GNBeFIvUn3zn6A/KehSvQqqM2++fEiSxyTzJYL+YEqqEmRI4ZYv?= =?us-ascii?Q?9d3bEuCVtjfSEfjq0lpQ299KeKaL6uwwgn3qwlzV1sPHd8QJlSfdm+UCH/10?= =?us-ascii?Q?KlMc6B1E2wE6VUQ840RUSyZ3sp6U1DLszLg1jtEy/VkFPIYQ8welyjNHAyKL?= =?us-ascii?Q?nwstb8FjppkDbNk1sUomnTIm1KoflzEr72HjT0je1UMnrd8O1+PL8jOC8gjZ?= =?us-ascii?Q?X1/MB+qedlChJnFBZrk/9fA7xX+Lig8tlZU1H2mkPieJouhEtqr41/EWAqCu?= =?us-ascii?Q?HEHWW3ULfaBybT5YWhXR85fjzGH303TRIw3e+2/tefRSBuehQ1tzAAnRg/tu?= =?us-ascii?Q?SPm9jusghmhED5aFlbUiOEWol0CRUY+mENFqdGeuoD7PIom0wQEsjCx6S/0e?= =?us-ascii?Q?cTi/OBBowFXgfA+wr/dT4v3JuxXXZF1qt+1bu+vEmcIJqYXB0EbWmFas6br3?= =?us-ascii?Q?utN99WsgZjICGdVx8If9plKA4m3d9FRUtElKCcx9gnNfuUbjjHTbU/Zix9gL?= =?us-ascii?Q?2rV6BEJqVDIN6GBpzIgXenhlXTjZCkZhgw88AKZtVxMX3Pw4HWINSGfBrnZZ?= =?us-ascii?Q?3bMF/OzmDVBGB+Gg3f90EUQvPOOcT7XKRj9cjjSIfx0Zi9a5tiwbbwkk05f5?= =?us-ascii?Q?tj5cXtjtn8qiJE0cYpQZhMG4gKo3Q+nzAUcZLlBLrC3zUiiOfr06MMR3MJQa?= =?us-ascii?Q?Wh2qzlXvclLDqwYqf+7rVoDVl5ImUT4h3B/xbL1kBAELTbCJ7Pv4csTkue3g?= =?us-ascii?Q?K7+1f83cLAdVQFJ/M6IdWPRuYnsVnBRXvB47X+RDVSlrAorWnY6g9ctUe59F?= =?us-ascii?Q?U3r6qgoUoguAx3tMLgENEX+0Qbesw1ULgmAfeTRe5KLScpAlUf/5Bn7ySKjb?= =?us-ascii?Q?eoAsx7+lgi+nmJdxUj5HBWM+EfvmtDd/b8wVXsQrYl45Chw9NchkNcTfki+4?= =?us-ascii?Q?7QmRiBzKouVhZsqO7fuP9C3qVhWZOUT4jEjHmV0XolsXaKt0nCwyrZlJoNmo?= =?us-ascii?Q?a93k4wnIi1HlCytrtETHsV0SxGSiKtwj9+HSP/mALQsSyHzlRCb5UmrnK+jT?= =?us-ascii?Q?X/m8Wl6y6dcGxa0+RZSunY=3D?= X-Microsoft-Antispam-Message-Info: iLNwI8eytd79Dtg/0wiDy/79QjeFE/cqY95PHsJBzhFjQkqHqRwK880X/3/u2skenktGswS0XZ335r6f5DKgs6P9fKsQUdWMqCGPX2mtlBmh9cOzkGayqNh6unnATsIMSz4yVL6YC9TK+/vIW/H6zZVNE+sAIG1yDfqhePUUbo4jzbwE3ZssgU43SmIiqpakPtAb4ghKDYQ+PB7AHdp6E6TsNwShmReDOZw0ORbeJD+mxxa9wmGFL9Bf9YESgzq2OmghPwWBd2DaqcpTq1wJTdl17U4vtUp7zvZ28p0kRu7w8R2V/S29MH/jpLyI7Us3X/7BIkZLvH0ZihNkmvk5HFkvUPZXV2ntUPjEXTSfk5Q= X-Microsoft-Exchange-Diagnostics: 1; BN3PR07MB2612; 6:1HX6tW4RQIay1jpS4fNs6wfkNxaTUlJIoP9KIt4CeovWxIzyXHezUo1BLyE7TTlcNpdspi3rC3slxOJrflY88BwGmyLPaBeOeQWG7rt2+jxGMukUeIB/nyu5t3M5qvAbUsjcVi37NZAP4EJVK4Z6E6DWi+PdGuiuyQpdCj1lldUGtgjzNWb42H7vHuMX6Bzvihga5KtTe2Y3BZuizER2aGwAYptUcQol6K2U6WaPM1Pc5kERXDS5k/f9NgPeGWOmVbdrj4u5QrZ2u2XVK6blBh2ezwsA/4eC0DtsG4RWNnPOKBeQO0+Q3aRgXPBKEc4vF3SIkXuV62wKRxIBJWUDqhiMi9od+rXabuTIv6XETvXw/p9c14hZLJ1yjmSKaPFZttmfLUsEO+/IN5M5mx0x6I0m41feA4k735YEfmtt+oDAYs5v7d6HjOeV0+2qu2/eYm6DFLul86NR+wpzsxtfKQ==; 5:FV/RpIFQ6taAp+KimdcGw7esp/WBE3YkPYkyTP9CI0y7V2e01I1iTI49C9i+47rUmy1ZwXzqT9K9mqXN5OjNmaynV67Auf9IuitEEMFbg57/IlnxLfMR8QDvcH5AolWfFBkfAWAbi1MHPrvE24Wxs9pMEhSxqQij4q7VIj6ofBs=; 7:evNvseRiJx8jfm5Zc4LjJI+sOeGN7lAlv3ohq/0FoHO6bzrZ65AXKs8ig5Lh2dexrMapuvBex+XQlhHDIZGPlh227duj5aklA70siG2DhXcRAjWOTDNcjYf/BpSpmbpu0dMO84c6QRf/HjfyAn08W9D9hMz+FZ9jAiWCWQN7dkO9eyXMRrlElzro+aY+rbtglNC7Dew52JohwdqREmiBZgnFQdtW04e+yAzd6sV3IekFns448YrM4F8SQJ5mPkIt SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: janustech.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jul 2018 22:18:36.3199 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a00ad46a-6b7b-4561-7249-08d5f1b367b1 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 34eb020e-3cf3-43a1-afeb-f5cf1310628e X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR07MB2612 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.33.132 Subject: [Qemu-devel] [PATCH v4 2/4 for-3.0] qcow2: Options' documentation fixes 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 , Leonid Bloch , qemu-block@nongnu.org, Max Reitz 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 --- docs/qcow2-cache.txt | 3 +++ qemu-options.hx | 10 ++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/docs/qcow2-cache.txt b/docs/qcow2-cache.txt index 8a09a5cc5f..3673f2be0e 100644 --- a/docs/qcow2-cache.txt +++ b/docs/qcow2-cache.txt @@ -130,6 +130,9 @@ There are a few things that need to be taken into accou= nt: memory as possible to the L2 cache before increasing the refcount cache size. =20 +- At most two of "l2-cache-size", "refcount-cache-size", and "cache-size" + can be set simultaneously. + Unlike L2 tables, refcount blocks are not used during normal I/O but only during allocations and internal snapshots. In most cases they are accessed sequentially (even during random guest I/O) so increasing the diff --git a/qemu-options.hx b/qemu-options.hx index b1bf0f485f..13ece21cb6 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -752,15 +752,17 @@ image file) =20 @item cache-size The maximum total size of the L2 table and refcount block caches in bytes -(default: 1048576 bytes or 8 clusters, whichever is larger) =20 @item l2-cache-size -The maximum size of the L2 table cache in bytes -(default: 4/5 of the total cache size) +The maximum size of the L2 table cache. +(default: if cache-size is not defined - 1048576 bytes or 8 clusters, whic= hever +is larger; otherwise, as large as possible or needed within the cache-size, +while permitting the requested or the minimal refcount cache size) =20 @item refcount-cache-size The maximum size of the refcount block cache in bytes -(default: 1/5 of the total cache size) +(default: 4 times the cluster size, or any portion of the cache-size, if i= t is +specified and large enough, left over after allocating the full L2 cache) =20 @item cache-clean-interval Clean unused entries in the L2 and refcount caches. The interval is in sec= onds. --=20 2.14.1 From nobody Wed Nov 5 02:32:58 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 1532470967798382.33547844204884; Tue, 24 Jul 2018 15:22:47 -0700 (PDT) Received: from localhost ([::1]:42816 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fi5hb-0001YG-Ic for importer@patchew.org; Tue, 24 Jul 2018 18:22:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45215) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fi5dm-0006lI-6U for qemu-devel@nongnu.org; Tue, 24 Jul 2018 18:18:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fi5di-0007Fv-Uj for qemu-devel@nongnu.org; Tue, 24 Jul 2018 18:18:46 -0400 Received: from mail-bn3nam01on0111.outbound.protection.outlook.com ([104.47.33.111]:24883 helo=NAM01-BN3-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 1fi5di-0007FF-Nh; Tue, 24 Jul 2018 18:18:42 -0400 Received: from Jupiter.local (141.226.29.227) by BN3PR07MB2612.namprd07.prod.outlook.com (2a01:111:e400:c5f0::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.973.20; Tue, 24 Jul 2018 22:18:39 +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=GqtooTSZhsn6J5sBF6A5kS1svBWQKB+F9ZVvFBwQOT0=; b=XmEO8W3XSKs+ZtzuxIabW3MoSOfyUyGAOzvnYCTGX9s8WpR+djR1ssjN+hcV5pxkjDZuRKBsfQLX/N8emMI9CsNyfa423TzKU0fC6jz3c/ynbGpWbQWc+PKmxvf6/nPIDwLvA2r0fU3Zanyi/BX4QMgiWHQ3PEoMpwLLQVee0jY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=lbloch@janustech.com; From: Leonid Bloch To: qemu-devel@nongnu.org Date: Wed, 25 Jul 2018 01:17:49 +0300 Message-Id: <20180724221750.16282-4-lbloch@janustech.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180724221750.16282-1-lbloch@janustech.com> References: <20180724221750.16282-1-lbloch@janustech.com> MIME-Version: 1.0 X-Originating-IP: [141.226.29.227] X-ClientProxiedBy: HE1PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:7:28::15) To BN3PR07MB2612.namprd07.prod.outlook.com (2a01:111:e400:c5f0::16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f24a1245-3c24-4d28-51eb-08d5f1b3694b X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(7021125)(8989117)(5600073)(711020)(4534165)(7022125)(4603075)(4627221)(201702281549075)(8990107)(7048125)(7024125)(7027125)(7028125)(7023125)(2017052603328)(7153060)(7193020); SRVR:BN3PR07MB2612; X-Microsoft-Exchange-Diagnostics: 1; BN3PR07MB2612; 3:P4k9z6PpRf6PsIdvEyYLTZEWBzHCke++UU2waTykh9SbaQeAsDM9Hi/cEQlnMuF4Nit3h9xea4rhpkmwZ/wrCvroyduPNTWLkCzTdbM3nGEgX1WL50YssKNML+UtIl9OkPT3suorc469+s4BOQVmVoDKZy3NeuO3LB2jnQJkxNPGctrx2Vjn8o7vupbI3nx89RamIhpQFI8kwEXjaDL4d7ZHPumhOK1jufV28W7j9bKtS7hEmRxAiM0xTBi2i6wI; 25:7W+Y/IPqhFxmx378/g41jH10twZWK3CvEGvUI9TK86IgVcXdRpKbMBQtIUQjpiV3YL/7kB+se9KQeYbyh97vkvvuDRk+JXOYKIS7yWZT7symh+UKXbh/NGJcE6eOz3atRo54VJNbWj7a1TBdFteXHpLeO17/cByT+ZxXh+WabZvDneojLWFJjGwxrRNBtk2heGpBqlOkRZZtfCA/Q88WSKTz+0YdU2e9bs8c3vLC/ICWfzLRFr6KebRkQVfHbbeir8hgWAs9H5QrWtdOshQA7EU1wJBczoE8r7hL270QLgEYGgqyl6frxUE9qMjn6Nb3RVkvuJOEcBICRJzYsMIhcQ==; 31:cniWeiR2XY0bAAOuykMth1LlHvteFngq38TrrQPKONLBGO64y0+Nd/jgynHLkreowZ8nLvAwUS745fZaZis2ZSqX6F9PycsEAyuXCCp/MPfa5oLDE0MVTJVS9vRD4AsAaNC2vBc7jbcaQfa/Jsgj6PwUb9QO7Gml42c0O2ukjffk1iFkwOA0NgJ9jHb9VQNW2xryjBa3owXr68Idse9AwEeyTyJEerbHp5mLnHX9a7U= X-MS-TrafficTypeDiagnostic: BN3PR07MB2612: 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)(8121501046)(5005006)(3231311)(944501410)(52105095)(93006095)(93001095)(10201501046)(3002001)(149027)(150027)(6041310)(2016111802025)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(6072148)(6043046)(201708071742011)(7699016); SRVR:BN3PR07MB2612; BCL:0; PCL:0; RULEID:; SRVR:BN3PR07MB2612; X-Microsoft-Exchange-Diagnostics: 1; BN3PR07MB2612; 4:29diaRe1u1DZq9tLD51KoUpY+uG3BPegjfLTbZbuux331NIVPBPMmmyQp7aEVu7ILMoN5ViGq43x1yYM3BSPS6qD4wKEAtseFMXrKTZWhmPwGFEdBZxt2q7c2FEF5gPMmC/PC5FgPpmNXV+d1yTBN/iPANL+o2NHp7OOLJH1oa4oddLxMB18bZPkBe7HnvnZ70JUIFCjsoxkdM/SsGRRr+sXcvRy/iQAT+cRSSfQMklxvasPAHFUhul9RODvNI+30Zzs81uUWFBaH/Vol2qLEg== X-Forefront-PRVS: 0743E8D0A6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39830400003)(396003)(346002)(366004)(136003)(376002)(199004)(189003)(68736007)(14444005)(3846002)(52116002)(4326008)(51416003)(1076002)(76176011)(2361001)(53936002)(54906003)(5660300001)(25786009)(8676002)(107886003)(2906002)(6486002)(6666003)(6116002)(86362001)(50466002)(48376002)(6916009)(575784001)(486006)(6512007)(36756003)(2351001)(478600001)(97736004)(66066001)(305945005)(7736002)(2616005)(8936002)(956004)(11346002)(476003)(47776003)(446003)(186003)(16586007)(16526019)(81156014)(26005)(316002)(6506007)(50226002)(106356001)(105586002)(81166006)(386003); DIR:OUT; SFP:1102; SCL:1; SRVR:BN3PR07MB2612; 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; BN3PR07MB2612; 23:bBOv/jBnOte5MXKYO7SZKCsA0gPa0acFDmwxht+d1?= =?us-ascii?Q?TA7ozFJb1jWLsbyjw0Pw/JPvrYRVYa+kGmE1IoBKTuhTScMbKRPtFFWV/om8?= =?us-ascii?Q?lzXVIqzaO/TDm8p4XagR0mNVk5t2+/MJqJ8s5UBtShWQT0Ei9jXL/z+ORO8w?= =?us-ascii?Q?zuG8VQferrR6wYm5Pta+eyCQljZ1DA6zhHDTn65H2Ct5DVZXinJKzA84Akc/?= =?us-ascii?Q?TdXLGVwNRagajRVhK0Aims63Y41S8ncWLXwCwvx09s7cJIZ4TYTZaYqhPp5Y?= =?us-ascii?Q?LIzyxT+g5rXSNWbJwNIQe3L3Uxp1cYzAxHIvFQUbClEOGDld4HelhDfY4H2M?= =?us-ascii?Q?hTR4kI7cZ/iTuTL3djBWbtFVyerSZ+D5hwIkr+tmyRhT5MAsLqqSXnH4DjBO?= =?us-ascii?Q?9wkSHjW3dU7ixq/PyVSwbDkrN2Gy4RWUzfk7YU/AHjVv8ttksqRdnswtF5Qu?= =?us-ascii?Q?Wfp4SDMYh7Zf7KvIrsgAkAZ8mpl0iEarXC6H0ozq/vwi7afEQVb7nRMwcO+q?= =?us-ascii?Q?I3bcA2A6tQrjayOYZ6LUPc9NU2cQsSPeXZZ/K/MkCcEqnjbTTsXq0ZJfpJIc?= =?us-ascii?Q?97xJBA5L/WygvLHHB4pPPqH6kiqvN0YfzQ+vvX/KCRKbUvaCP/UPKsD0+hQd?= =?us-ascii?Q?LKiYuAtmHEUbRFSDlQ895ywcNL1DAkbQ3r52rX4GflVieAgvs136O97T7Nih?= =?us-ascii?Q?4UmPTKfMNIbaWlzkglWnP7wbjQN5wXtKGBOW4uL7Kd/EcJ2rpxlD5fqgzrGs?= =?us-ascii?Q?yooSjLI1jTFEWJVD9XCi8WO95OfBDyeX+tTIj7GlDT2zQM2mX+K58bX4zqjt?= =?us-ascii?Q?v36TLulqr7eOstXIzUXxZ3Uh1OQdYpA26zYXK5RVZsycjWRzoiJwVfV/jdDa?= =?us-ascii?Q?LGhTmy4sOuPzJ1FZtadOmu/CTJsgXzfcGM2RJsjw9TdR0670KtpPsPSTy3gU?= =?us-ascii?Q?Q3W/2J8zpE6yQ12FMQDhGWFxVIXR2/a6o5Nbeqw6w5nJWY3+tIquMpvk5VK/?= =?us-ascii?Q?73vwqaFUsyyn0BUuvROxoNXOUv4T0SgpZyVYEslPw9hhonRhRNFfqXoYtnwm?= =?us-ascii?Q?DIUczoioZPqidDjFnGxTGKCequDcon4zreYuRtr02dY7bfnJ1oRRkHjvyMrl?= =?us-ascii?Q?0dKDDUSYcJMrZLOQsYgq8MMbRIXB2I10AYlbwRMEOP/oLcrZ5LsLgEehP+Nw?= =?us-ascii?Q?3otQ56W9NUWnM9mLIVPEYWhsAOfSEzQlnZsFliRfFqr/5wKEdQcaeOHZ8nF6?= =?us-ascii?Q?Uij6vARhtIpVCJWM3/5uZEF4xidkJ0W4egtzSJko9svK60VyB94ZomWjGY4D?= =?us-ascii?Q?WEv1y0OfhE1mdqrJLb5H5U=3D?= X-Microsoft-Antispam-Message-Info: RkA6UihXIJ3WTB/naGTWu//LLp9YSndkv/FmEOo/EAAYKr+Dbotf02Az3t97LDq/asnq7VwsT8AcGWWc0sBb4nvvdy8DulTvGag2r7C5rcwp6Of4zrP70npGVj6MJJflIx7xS1JjElVznnSyrVs0SAqiqnhe8EBNy8qWryaxSosVXmL96wGhJ7I1vefieZtNm7tXevq/7gjHDcK2uK30g6BX2CbgKyN+4EJl5bztpMxayDqxtJiWPCYpTXZpxta4N1cvLCX9fhJdnYkDh7lpCuetvG+sEvzM5b6D1u8pCybJVVHD+4npJsdXnomMCI15AgO0QTtCGYRk1wtCIUClXkKVjKB20wY+WkGlYeBLYnM= X-Microsoft-Exchange-Diagnostics: 1; BN3PR07MB2612; 6:whY6PVHqpY2GlS5Lq10ZFdJSQO95PcCdo5IMVVLnJsnzLgBlnSI71TZVP5cBhGEkAWY0H7HSu3JqlhOmKz4I6Zf+j/hF2vNyBRF2PWWKlpgWd4lNy1O07rOC0Kne+Ii0iYhXz7/jtTzMe5cmePda0DrTdMUvZL5KDkCWXxQw2Cc/we/NJJxrpBGm/xl374E4n9eWGFczCru9Z2llfhOSZTCowCooQJ7/dBghvzbe3tPLYUvODOWu3HacVd3vpCjWBt4rBw8DooSnOrHqul2ITi15GQrEBQ1t5Y8+xzFJiA7cdlWnbRep2d3RNyc7hxtMF7PTphRqC5hEGR6+PLofbGvdybjERkZZa3qXo4XDdNUo2O04KU6GesHJMbN3PL7pGz3p4vekpkGYKzFDVRjAOQ1rQ364q7tK3AgCzLtt1KkBRAL3yGN/9dRBxzOV8U/P2/EF2U0NlaVK+rnEt9etfA==; 5:gDmSrPesv/EB+NOYw0BkuFl2CtSjP4eQI7cZuYCPOrrOvQmHS5KH00BMkh2Uz9nH+6o+BzNlBBMwYG8arHrsTYI9DI8OduD/l7ZTknzGT9ZFe7EMxu2l7C5ahuYEcP/1Qj5d1UavZ99EZy8kcx+tY0Qf1qON3q9JO9ijR7wYVz4=; 7:sh5NET1EIN+x7u741dqrVjwmiAOHhsEQv2uHuCaKeDxZxuaMu089hzpnXo1vAfCQ1qo92fnK1amu97DETaKqH3prieYl0H3tAnb4DR/yfmCG9WWkkqGXk4IrQEpsYXSrn4QuK/xoJlzebFLdgCL0VyJ8NNK1UlY8PzpNla7hJi8zvl5zBFzn8g5eHA6riYLgTbsZshP5kQIos8b4ykw86CicstGWCVJBTR5iwu0hS2xKiNp0dH5bWs4dQYOWNfsh SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: janustech.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jul 2018 22:18:39.0050 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f24a1245-3c24-4d28-51eb-08d5f1b3694b X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 34eb020e-3cf3-43a1-afeb-f5cf1310628e X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR07MB2612 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.33.111 Subject: [Qemu-devel] [PATCH v4 3/4] qcow2: Introduce an option for sufficient L2 cache for the entire image 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 , Leonid Bloch , qemu-block@nongnu.org, Max Reitz 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" An option "l2-cache-full" is introduced to automatically set the qcow2 L2 cache to a sufficient value for covering the entire image. The memory overhead when using this option is not big (1 MB for each 8 GB of virtual image size with the default cluster size) and it can noticeably improve performance when using large images with frequent I/O. Previously, for this functionality the correct L2 cache size needed to be calculated manually or with a script, and then this size needed to be passed to the "l2-cache-size" option. Now it is sufficient to just pass the boolean "l2-cache-full" option. Signed-off-by: Leonid Bloch --- block/qcow2.c | 35 ++++++++++++++++++++++++++++------- block/qcow2.h | 1 + docs/qcow2-cache.txt | 15 +++++++++++---- qapi/block-core.json | 8 +++++++- qemu-options.hx | 6 +++++- 5 files changed, 52 insertions(+), 13 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index ec9e6238a0..101b8b474b 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -695,6 +695,11 @@ static QemuOptsList qcow2_runtime_opts =3D { .type =3D QEMU_OPT_SIZE, .help =3D "Maximum L2 table cache size", }, + { + .name =3D QCOW2_OPT_L2_CACHE_FULL, + .type =3D QEMU_OPT_BOOL, + .help =3D "Create full coverage of the image with the L2 cache= ", + }, { .name =3D QCOW2_OPT_L2_CACHE_ENTRY_SIZE, .type =3D QEMU_OPT_SIZE, @@ -779,10 +784,12 @@ static void read_cache_sizes(BlockDriverState *bs, Qe= muOpts *opts, BDRVQcow2State *s =3D bs->opaque; uint64_t combined_cache_size; bool l2_cache_size_set, refcount_cache_size_set, combined_cache_size_s= et; + bool l2_cache_full_set; int min_refcount_cache =3D MIN_REFCOUNT_CACHE_SIZE * s->cluster_size; =20 combined_cache_size_set =3D qemu_opt_get(opts, QCOW2_OPT_CACHE_SIZE); l2_cache_size_set =3D qemu_opt_get(opts, QCOW2_OPT_L2_CACHE_SIZE); + l2_cache_full_set =3D qemu_opt_get(opts, QCOW2_OPT_L2_CACHE_FULL); refcount_cache_size_set =3D qemu_opt_get(opts, QCOW2_OPT_REFCOUNT_CACH= E_SIZE); =20 combined_cache_size =3D qemu_opt_get_size(opts, QCOW2_OPT_CACHE_SIZE, = 0); @@ -793,6 +800,17 @@ static void read_cache_sizes(BlockDriverState *bs, Qem= uOpts *opts, *l2_cache_entry_size =3D qemu_opt_get_size( opts, QCOW2_OPT_L2_CACHE_ENTRY_SIZE, s->cluster_size); =20 + uint64_t virtual_disk_size =3D bs->total_sectors * BDRV_SECTOR_SIZE; + uint64_t max_l2_cache =3D virtual_disk_size / (s->cluster_size / 8); + + if (l2_cache_size_set && l2_cache_full_set) { + error_setg(errp, QCOW2_OPT_L2_CACHE_SIZE " and " + QCOW2_OPT_L2_CACHE_FULL " may not be set at the same ti= me"); + return; + } else if (l2_cache_full_set) { + *l2_cache_size =3D max_l2_cache; + } + if (combined_cache_size_set) { if (l2_cache_size_set && refcount_cache_size_set) { error_setg(errp, QCOW2_OPT_CACHE_SIZE ", " QCOW2_OPT_L2_CACHE_= SIZE @@ -800,8 +818,14 @@ static void read_cache_sizes(BlockDriverState *bs, Qem= uOpts *opts, "at the same time"); return; } else if (*l2_cache_size > combined_cache_size) { - error_setg(errp, QCOW2_OPT_L2_CACHE_SIZE " may not exceed " - QCOW2_OPT_CACHE_SIZE); + if (l2_cache_full_set) { + error_setg(errp, QCOW2_OPT_CACHE_SIZE " must be greater th= an " + "the full L2 cache if " QCOW2_OPT_L2_CACHE_FULL + " is used"); + } else { + error_setg(errp, QCOW2_OPT_L2_CACHE_SIZE " may not exceed " + QCOW2_OPT_CACHE_SIZE); + } return; } else if (*refcount_cache_size > combined_cache_size) { error_setg(errp, QCOW2_OPT_REFCOUNT_CACHE_SIZE " may not excee= d " @@ -809,14 +833,11 @@ static void read_cache_sizes(BlockDriverState *bs, Qe= muOpts *opts, return; } =20 - if (l2_cache_size_set) { + if (l2_cache_size_set || l2_cache_full_set) { *refcount_cache_size =3D combined_cache_size - *l2_cache_size; } else if (refcount_cache_size_set) { *l2_cache_size =3D combined_cache_size - *refcount_cache_size; } else { - uint64_t virtual_disk_size =3D bs->total_sectors * BDRV_SECTOR= _SIZE; - uint64_t max_l2_cache =3D virtual_disk_size / (s->cluster_size= / 8); - /* Assign as much memory as possible to the L2 cache, and * use the remainder for the refcount cache */ if (combined_cache_size >=3D max_l2_cache + min_refcount_cache= ) { @@ -829,7 +850,7 @@ static void read_cache_sizes(BlockDriverState *bs, Qemu= Opts *opts, } } } else { - if (!l2_cache_size_set) { + if (!l2_cache_size_set && !l2_cache_full_set) { *l2_cache_size =3D MAX(DEFAULT_L2_CACHE_BYTE_SIZE, (uint64_t)DEFAULT_L2_CACHE_CLUSTERS * s->cluster_size); diff --git a/block/qcow2.h b/block/qcow2.h index 81b844e936..151e014bd8 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -97,6 +97,7 @@ #define QCOW2_OPT_OVERLAP_BITMAP_DIRECTORY "overlap-check.bitmap-directory" #define QCOW2_OPT_CACHE_SIZE "cache-size" #define QCOW2_OPT_L2_CACHE_SIZE "l2-cache-size" +#define QCOW2_OPT_L2_CACHE_FULL "l2-cache-full" #define QCOW2_OPT_L2_CACHE_ENTRY_SIZE "l2-cache-entry-size" #define QCOW2_OPT_REFCOUNT_CACHE_SIZE "refcount-cache-size" #define QCOW2_OPT_CACHE_CLEAN_INTERVAL "cache-clean-interval" diff --git a/docs/qcow2-cache.txt b/docs/qcow2-cache.txt index 3673f2be0e..bae21061f3 100644 --- a/docs/qcow2-cache.txt +++ b/docs/qcow2-cache.txt @@ -110,11 +110,12 @@ How to configure the cache sizes Cache sizes can be configured using the -drive option in the command-line, or the 'blockdev-add' QMP command. =20 -There are three options available, and all of them take bytes: +There are four options available: =20 -"l2-cache-size": maximum size of the L2 table cache -"refcount-cache-size": maximum size of the refcount block cache -"cache-size": maximum size of both caches combined +"l2-cache-size": maximum size of the L2 table cache (bytes, K, M) +"refcount-cache-size": maximum size of the refcount block cache (bytes, = K, M) +"cache-size": maximum size of both caches combined (bytes, K, M) +"l2-cache-full": make the L2 cache cover the full image (boolean) =20 There are a few things that need to be taken into account: =20 @@ -130,6 +131,12 @@ There are a few things that need to be taken into acco= unt: memory as possible to the L2 cache before increasing the refcount cache size. =20 +- If "l2-cache-full" is specified, QEMU will assign enough memory + to the L2 cache to cover the entire size of the image. + +- "l2-cache-size" and "l2-cache-full" can not be set simultaneously, as + setting "l2-cache-full" already implies a specific size for the L2 cache. + - At most two of "l2-cache-size", "refcount-cache-size", and "cache-size" can be set simultaneously. =20 diff --git a/qapi/block-core.json b/qapi/block-core.json index d40d5ecc3b..c584059e23 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -2812,7 +2812,12 @@ # refcount block caches in bytes (since 2.2) # # @l2-cache-size: the maximum size of the L2 table cache in -# bytes (since 2.2) +# bytes (mutually exclusive with l2-cache-full) +# (since 2.2) +# +# @l2-cache-full: make the L2 table cache large enough to cover the +# entire image (mutually exclusive with l2-cache-s= ize) +# (since 3.1) # # @l2-cache-entry-size: the size of each entry in the L2 cache in # bytes. It must be a power of two between 512 @@ -2840,6 +2845,7 @@ '*overlap-check': 'Qcow2OverlapChecks', '*cache-size': 'int', '*l2-cache-size': 'int', + '*l2-cache-full': 'bool', '*l2-cache-entry-size': 'int', '*refcount-cache-size': 'int', '*cache-clean-interval': 'int', diff --git a/qemu-options.hx b/qemu-options.hx index 13ece21cb6..b493371704 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -754,11 +754,15 @@ image file) The maximum total size of the L2 table and refcount block caches in bytes =20 @item l2-cache-size -The maximum size of the L2 table cache. +The maximum size of the L2 table cache. (Mutually exclusive with l2-cache-= full) (default: if cache-size is not defined - 1048576 bytes or 8 clusters, whic= hever is larger; otherwise, as large as possible or needed within the cache-size, while permitting the requested or the minimal refcount cache size) =20 +@item l2-cache-full +Make the L2 table cache large enough to cover the entire image (mutually +exclusive with l2-cache-size) (on/off; default: off) + @item refcount-cache-size The maximum size of the refcount block cache in bytes (default: 4 times the cluster size, or any portion of the cache-size, if i= t is --=20 2.14.1 From nobody Wed Nov 5 02:32:58 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 153247084936984.3214872074999; Tue, 24 Jul 2018 15:20:49 -0700 (PDT) Received: from localhost ([::1]:42804 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fi5fk-0008Di-9U for importer@patchew.org; Tue, 24 Jul 2018 18:20:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45252) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fi5do-0006nS-HS for qemu-devel@nongnu.org; Tue, 24 Jul 2018 18:18:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fi5dl-0007Ih-C3 for qemu-devel@nongnu.org; Tue, 24 Jul 2018 18:18:48 -0400 Received: from mail-bn3nam01on0120.outbound.protection.outlook.com ([104.47.33.120]:32563 helo=NAM01-BN3-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 1fi5dl-0007ID-6q; Tue, 24 Jul 2018 18:18:45 -0400 Received: from Jupiter.local (141.226.29.227) by BN3PR07MB2612.namprd07.prod.outlook.com (2a01:111:e400:c5f0::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.973.20; Tue, 24 Jul 2018 22:18:41 +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=a6cuogcFbGuQlyUYFmAgWKFEEuSrvETD+eg9WmE4fYQ=; b=VzbsZCy/k8HTdsyQQlBzzdXuM3BgMTq3iRjc6QysGHjna6dgqRjqtfVqe6VcPG2plR0Tw8Y4SMRwLGVoH+BZbxXJslso/Xxj5BOZapblpFWktXRjmUeTiYsCCr9aJP5PIDOjl7HGW6d3CyL90ldJC95ijeanOgwdqKLF9rC7OiU= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=lbloch@janustech.com; From: Leonid Bloch To: qemu-devel@nongnu.org Date: Wed, 25 Jul 2018 01:17:50 +0300 Message-Id: <20180724221750.16282-5-lbloch@janustech.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180724221750.16282-1-lbloch@janustech.com> References: <20180724221750.16282-1-lbloch@janustech.com> MIME-Version: 1.0 X-Originating-IP: [141.226.29.227] X-ClientProxiedBy: HE1PR05CA0128.eurprd05.prod.outlook.com (2603:10a6:7:28::15) To BN3PR07MB2612.namprd07.prod.outlook.com (2a01:111:e400:c5f0::16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f0393750-ddd0-453f-df8f-08d5f1b36ae6 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(7021125)(8989117)(5600073)(711020)(4534165)(7022125)(4603075)(4627221)(201702281549075)(8990107)(7048125)(7024125)(7027125)(7028125)(7023125)(2017052603328)(7153060)(7193020); SRVR:BN3PR07MB2612; X-Microsoft-Exchange-Diagnostics: 1; BN3PR07MB2612; 3:Z5QqtcHJHnFyEByZJm176f8u5PxX9jiPdItGOXj0+OfWijPqDQj2LrijAVKkb4ctCXQcEoBGPIcRM8Q/tciUeZAvxSawz/MfStW9HUGyAP2FxhX/VRt0eR70dqhNnogJ3+TuqsFC23AlxdNVyTYslGJeLtoCJ+gAwyr/kg2YrOBNjfGXwzk213zAgXvIIbPBhjc4O4otHHM27U84hWfs0lAJHx47BPiLoKRuaAZG/PVyJ39OqJxShJd+tt4TEnxC; 25:IJGJcQE/MC71m2K/w/Urfe2HCevN/Pb1yJrnT0/zfW6p7kHE9j4Ue+A2CXFpqkX2sgvcIstOaXO/D2Pn9O0nCImfg8GgeeQGuy31w0xogNCA4kcnWjZTdmRB3TDNV1gLX3xOFUcQOrtWQhwZDu87HCE3exhTYUsC1a8jKfLgkcIsGhrpMTFtymOt+3zwTEtsUCcf5QzlInioKSJWsR1YbrlMO36V4jS3WjhNbc+NESzHWN1d4ek6+S4zg/uxVh1cgcylQOOUfgM9HqW2BVokH63nbP3FwZYCHtn9ysbU2EEYU1Z2Z5Gb7bE215nBBf7Bu1oZYICBD/JbnkrbEiwysA==; 31:lQOqIUmJXT/YX50wzG3glluaO9FixiP+/TBD+5fAHCFQgOBOvwaujMqlyAKHlJ3mY8OVh+5ydblEkoCMZ2s6RbWWCvp4NBwzl5Je7omhOO2DMCCFH0pjp0qsym6ZUQwzhQKGyZG1FeQEd0oQOie6LU1nSrjHxRBe0pn9pvSkc1WNBHCjd/3j1puWU3vu9ZriVCXdrqJ1jifNsNGxM+fUJxDa9YIaZNAYDwF573HLVt8= X-MS-TrafficTypeDiagnostic: BN3PR07MB2612: 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)(8121501046)(5005006)(3231311)(944501410)(52105095)(93006095)(93001095)(10201501046)(3002001)(149027)(150027)(6041310)(2016111802025)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(6072148)(6043046)(201708071742011)(7699016); SRVR:BN3PR07MB2612; BCL:0; PCL:0; RULEID:; SRVR:BN3PR07MB2612; X-Microsoft-Exchange-Diagnostics: 1; BN3PR07MB2612; 4:6kZ+Jgw7ynwBI31c2gIwQDk7WQM6Aj8KDp0JEWHOf3BZi4YmpXbpPs2IOq++UNbgAYOJPwvwrqS2DBaEuLnjnjm8732ljksEgXdIn7lyVGX5LLSxiRx/i/yjbDaIruDQ+YLzpQB6W6EKky/9Y3Lcw9bGywSoFl3I5b5EIeSXkVV3f4H/YgqwB9x8CUAtoFP0hLUZTQaHCQ33319IxvGoAiV2+GcWyfmOEU0MHIZZSHGUcNASQWKaj9swYKYm0JHNXieBcDPzlu4oA555sM6BYA== X-Forefront-PRVS: 0743E8D0A6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(396003)(346002)(39840400004)(366004)(136003)(376002)(199004)(189003)(68736007)(14444005)(3846002)(52116002)(4326008)(51416003)(1076002)(76176011)(2361001)(53936002)(54906003)(5660300001)(25786009)(8676002)(107886003)(2906002)(6486002)(6666003)(6116002)(86362001)(50466002)(48376002)(6916009)(486006)(6512007)(36756003)(2351001)(478600001)(97736004)(66066001)(305945005)(7736002)(2616005)(8936002)(956004)(11346002)(476003)(47776003)(446003)(186003)(16586007)(16526019)(81156014)(26005)(316002)(6506007)(50226002)(106356001)(105586002)(81166006)(386003); DIR:OUT; SFP:1102; SCL:1; SRVR:BN3PR07MB2612; 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; BN3PR07MB2612; 23:rdGZ+dNSnK+qJjWWhoD/QpfvWzDG3Zci8XmJfhY0S?= =?us-ascii?Q?ufwKrD6lZSyqrfdAawm5qCATklFNoDWlsnMlPPb26NGbEwqVa+6G1U2fR9zm?= =?us-ascii?Q?5aK3eNJJa63G8M0Sg8Jj7AGQSjLa/WQE1iulUSVMxix5HUmGcCMno/OCCOwI?= =?us-ascii?Q?f5JArDKRkNV6snzSTNQePriiyvh4KsI9VV6P2A/zPBFVO1rIUBwffCal5y17?= =?us-ascii?Q?ajx34UNAiBAaq+hPv0gFGPBrHKt4fEkImtKP0QYoAkirJml4J7geeXbbsPZU?= =?us-ascii?Q?ki2hODtlWdle8ywe7GUsEXybjBCnoNCoUgEG6JiGDGX3fu3GSGuK9UDQXzRz?= =?us-ascii?Q?HkvC/6rx1lpDo367odxtAbLf6XbjiGOAyEeBbnNI2UU64w5915rqGBJDxBeA?= =?us-ascii?Q?3V7YL9xjnukE//5DPwbcWs+mfU0r3M1rZzZNhALgvfCMQkHDH24CsutSYK1L?= =?us-ascii?Q?huldX4cDMdyYTK8n05NvqvyE5bBti1S5oqGi/Fr6g1k3m2O6aJ71Y/mGvL78?= =?us-ascii?Q?UjJwp6V8+K3zL6wip5Ozzbw1dG0jbEpN1j7CiWZGk1HAbOuEbF9G2eAcA7E2?= =?us-ascii?Q?/HBGSK9GcSVoJWvlLsKSypke+KAP8qBQP6YjANuUBtFUNKjwIA2UtUoAaVdX?= =?us-ascii?Q?NHbB8tcCsc3x2pVVHS35Ea40AsEX3HTT3xR9LixFYlcl1dg+760X2Y/QGI/k?= =?us-ascii?Q?n3nUdjPpEzRDN9q20e3n5rVEmT97m0CSj4uqoU4xy5wZ9BJN07pgXenvFYZk?= =?us-ascii?Q?4JV5SYc6npeAego/NKSrwlGaJh7sLlgLMeRHfK5xIFfW7IyOXG0u7Vvvah5K?= =?us-ascii?Q?SXbV+j24IusQ0SZ0Kc1rzrACSnElXuOxLgtKm9gns09g0jZktOjPpjrHwaRE?= =?us-ascii?Q?aJH8yUa3EZRPZ1g+QZgW2zRAJDuWD4oGjebRhCHT8pK2kBh7xXfPUyWYvVfc?= =?us-ascii?Q?yZiSoduThCzlQZIKt0MVjFLtOA+OEZmzcRINNz9jZJsNaxm9hNDdR6cFTeED?= =?us-ascii?Q?V2AbVtMgaRgtqE8ln6bNRe4lzFtImuiYtHrIuOLJiawnN4bi1R67Z1cWGhd3?= =?us-ascii?Q?jKgCbM72yVK+r5QNbIaXICLtgZEBFjg/OqiipwTqXyvXBs8Axt5NEimlBUda?= =?us-ascii?Q?y+V6jcDsYOKlYs4KrU4FNiwhRyeOYXpIk4e6JXg/qDpxrkj5J5NrjPnjPQkF?= =?us-ascii?Q?kNtpSa+Gu2NskjwrUgEE/lL4PYousgdXwum2lX4BgowCyKux4ucQBSM0Hgh2?= =?us-ascii?Q?sryzkHyTSwqM4vyD3nfzFljxJt9nz+SD3yQgcZBlQnXp2KUmccZF0sC/mUHD?= =?us-ascii?B?UT09?= X-Microsoft-Antispam-Message-Info: EJkAPtEWhGqz+NtL5G0eHK/chsIMNFIJ7ZXcazvP6x8e/MtztRybaVELNvW0CQfE1oeksKj3SHsu6baGGPlmY0UWfT1+yIYTE07nWfDEZUOYZDDZ2fEXgjjfzA+nxJq+r/1Uo6RUVpwM6Z+yZMzkLfyngfO2JyUwJ0OfZoKNkchs6azGtRxA+4RNa5kmCfw1jOGzFyODX8ZyfuFTdds2mB7rs5NNt3M5G3D6HBqzWWQM2Z+oaEcjQyh6adM9Q7fpCQSH++8r6I4qLSbq60a1yPWRpPpdhiH/uXaDxys+ZeaUl7StXM8wcDlD92ftw9IdDm87uGZuDweNcgsyrQlgOBVQ180XgNlY2U1kKkpzDIw= X-Microsoft-Exchange-Diagnostics: 1; BN3PR07MB2612; 6:gFYskJg5m9sLIEAS6gVp1JYtTP+ysqTVuQLeyQKuOg3Rs26sd5qn9lrwWmvdeJkAQGvkb5j73l2JEhoRv1H2dPOzNPwYTcPrFnXzELHvQ6rxgE55oSgly5/yqXvX6+PCI29+/o7dSoX08m1iopp0FAGsHCzNx978U0+gjBmRRGSUcZ2O7+ApCRs95wVBFCgjXqdfdDkZw7jFgNJH2qzNwnYJjq59kfKV/sblzcEmCxUnI7tgUqd6wac3K2HIv3t5rDs3BUeuv/+3lhJgJKq0EPEVrLNIRViW801eBofgaaTU3hVkJCS3ZfF5IQffHfNB6CKbrIaXmmcHYEZZUb7wfQVYr3x68/qMDCBBOfzhBL7KK3wFZz72BBKyXxSvdBbYIeSTT5oGv15ju+h0N6iHCqkuL/ylONBGmJMVCvTuGiAX+7FTJXixjrb+OM9WiQEEQ4H1v7IiM6RmRNqTnM38kQ==; 5:gzFNHONo16aAC9MQyqW0JaNzsR+MFYlR9bvoRrULsJJKLSt5TB6NtbADwLg1mnBAcrvdHt/XKUgYlOBB0GzmTlB6WH6gqCCgJhOt8sW7LYKUEca4Wab5U3+ZmNXHYnSyAV/O8V30h2LZOoIwNWfFsEedfqPrOCFDmLlsXuLNj9w=; 7:hs2kTJWThCSaCn9GNRUfTgml6sbP/ujR2w3asDvN5HIItrg2Sq4k7y7VPh/wg9O+Ip/7TnI1ePr4nEH4NpEynYch26IhJ4a+RYwyMKhPS+h+fMpMwXCMRa2Ra9/wyBpIyxcox/bErWsfun2cRZk8qFNH4TwVnI2rMwdHkx/f1nJjJqGQJ3ztn9rD56MW77HVVL8CyOMQ+DYlO7JjM9CvKrUP0D39ffhathGo03ZfqQbsGcxBlrHsK/7+5kCpL052 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: janustech.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jul 2018 22:18:41.7012 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f0393750-ddd0-453f-df8f-08d5f1b36ae6 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 34eb020e-3cf3-43a1-afeb-f5cf1310628e X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR07MB2612 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.33.120 Subject: [Qemu-devel] [PATCH v4 4/4] iotests: Add tests for the new l2-cache-full option 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 , Leonid Bloch , qemu-block@nongnu.org, Max Reitz 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 --- tests/qemu-iotests/103 | 6 ++++++ tests/qemu-iotests/103.out | 2 ++ tests/qemu-iotests/137 | 2 ++ tests/qemu-iotests/137.out | 2 ++ 4 files changed, 12 insertions(+) diff --git a/tests/qemu-iotests/103 b/tests/qemu-iotests/103 index 2841318492..a2886e8569 100755 --- a/tests/qemu-iotests/103 +++ b/tests/qemu-iotests/103 @@ -52,9 +52,15 @@ echo echo '=3D=3D=3D Testing invalid option combinations =3D=3D=3D' echo =20 +# l2-cache-size and l2-cache-full at the same time +$QEMU_IO -c "open -o l2-cache-full,l2-cache-size=3D1M $TEST_IMG" 2>&1 | + _filter_testdir | _filter_imgfmt # all sizes set at the same time $QEMU_IO -c "open -o cache-size=3D1.25M,l2-cache-size=3D1M,refcount-cache-= size=3D0.25M $TEST_IMG" \ 2>&1 | _filter_testdir | _filter_imgfmt +# cache-size may not be smaller than the full L2 size if l2-cache-full is = used +$QEMU_IO -c "open -o l2-cache-full,cache-size=3D6K $TEST_IMG" 2>&1 | + _filter_testdir | _filter_imgfmt # l2-cache-size may not exceed cache-size $QEMU_IO -c "open -o cache-size=3D1M,l2-cache-size=3D2M $TEST_IMG" 2>&1 \ | _filter_testdir | _filter_imgfmt diff --git a/tests/qemu-iotests/103.out b/tests/qemu-iotests/103.out index ab56f03a00..92afbff024 100644 --- a/tests/qemu-iotests/103.out +++ b/tests/qemu-iotests/103.out @@ -5,7 +5,9 @@ wrote 65536/65536 bytes at offset 0 =20 =3D=3D=3D Testing invalid option combinations =3D=3D=3D =20 +can't open device TEST_DIR/t.IMGFMT: l2-cache-full and l2-cache-size may n= ot be set at the same time can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcoun= t-cache-size may not be set at the same time +can't open device TEST_DIR/t.IMGFMT: cache-size must be greater than the f= ull L2 cache if l2-cache-full is used can't open device TEST_DIR/t.IMGFMT: l2-cache-size may not exceed cache-si= ze can't open device TEST_DIR/t.IMGFMT: refcount-cache-size may not exceed ca= che-size can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcoun= t-cache-size may not be set the same time diff --git a/tests/qemu-iotests/137 b/tests/qemu-iotests/137 index 87965625d8..f460b5bfe1 100755 --- a/tests/qemu-iotests/137 +++ b/tests/qemu-iotests/137 @@ -106,7 +106,9 @@ echo =20 $QEMU_IO \ -c "reopen -o lazy-refcounts=3D42" \ + -c "reopen -o l2-cache-full,l2-cache-size=3D64k" \ -c "reopen -o cache-size=3D1M,l2-cache-size=3D64k,refcount-cache-size= =3D64k" \ + -c "reopen -o l2-cache-full,cache-size=3D6K" \ -c "reopen -o cache-size=3D1M,l2-cache-size=3D2M" \ -c "reopen -o cache-size=3D1M,refcount-cache-size=3D2M" \ -c "reopen -o l2-cache-size=3D256T" \ diff --git a/tests/qemu-iotests/137.out b/tests/qemu-iotests/137.out index 6a2ffc71fd..b15dfc391a 100644 --- a/tests/qemu-iotests/137.out +++ b/tests/qemu-iotests/137.out @@ -16,7 +16,9 @@ read 33554432/33554432 bytes at offset 0 =3D=3D=3D Try setting some invalid values =3D=3D=3D =20 Parameter 'lazy-refcounts' expects 'on' or 'off' +l2-cache-full and l2-cache-size may not be set at the same time cache-size, l2-cache-size and refcount-cache-size may not be set at the sa= me time +cache-size must be greater than the full L2 cache if l2-cache-full is used l2-cache-size may not exceed cache-size refcount-cache-size may not exceed cache-size L2 cache size too big --=20 2.14.1