From nobody Wed Nov 5 02:34:13 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 1532529143707602.87409582837; Wed, 25 Jul 2018 07:32:23 -0700 (PDT) Received: from localhost ([::1]:51555 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fiKpy-0008E2-FJ for importer@patchew.org; Wed, 25 Jul 2018 10:32:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47499) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fiKmI-00050F-E2 for qemu-devel@nongnu.org; Wed, 25 Jul 2018 10:28:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fiKmF-00007h-EH for qemu-devel@nongnu.org; Wed, 25 Jul 2018 10:28:34 -0400 Received: from mail-eopbgr700096.outbound.protection.outlook.com ([40.107.70.96]:12164 helo=NAM04-SN1-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 1fiKmF-00006y-6A; Wed, 25 Jul 2018 10:28:31 -0400 Received: from Jupiter.local (141.226.29.227) by SN2PR07MB2622.namprd07.prod.outlook.com (2603:10b6:804:8::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.995.16; Wed, 25 Jul 2018 14:28:27 +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=B8Qq3a1u4f+ghpq1uzFqjSlQru/Im87AImxnbsRF/VQ=; b=FaNOlY3/jRoa6qQS1rFGvRWt12SxyHeYdV6bCp3RX2tSbEwH4aFKDnTXb122DspPO4gBDEyYsTJUM+Q8crl6w7J1BdQdgoFMk98xXcEnrlX+FXc0/hoaTNQ/ZRk99rn9Ul27dXWmsaosw3TBTQmaIdzQoHY0NZFoB9oiZqWAUGg= 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 17:27:55 +0300 Message-Id: <20180725142758.9980-2-lbloch@janustech.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180725142758.9980-1-lbloch@janustech.com> References: <20180725142758.9980-1-lbloch@janustech.com> MIME-Version: 1.0 X-Originating-IP: [141.226.29.227] X-ClientProxiedBy: HE1PR05CA0386.eurprd05.prod.outlook.com (2603:10a6:7:94::45) To SN2PR07MB2622.namprd07.prod.outlook.com (2603:10b6:804:8::6) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b5b1a2ae-b0b7-4965-201a-08d5f23ae477 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:SN2PR07MB2622; X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB2622; 3:mdhgtPpaNY5hgqgtDDXp30ZSTnBRi9z+1TZhtBr3kv6ZngFMNifO72UOaE+CI95By8vA+YZnLnPSBqD2z/elLJv8W91GteZNQrO9oBYYmoDzMW+oTIGyHW6EmMiO8ZKSYGJmbr5+7CD2kNkzfZEwZpMiTyGT/IjAVDVNxt7tG3owZ06TKSl5OAm2+Xbe5wRsZxZF6OwPFSw4STk3gGGk9/8+6Gk0essfeCbsfCEr0FylMNybxSkQQCf0MaUFyTRi; 25:XbMlQNjiRzusFqnDjJ1+R6hFSBohMVsPUbvxubaGLRYPidWCQ/4KWanJ0SStRvtSeMWY+2ix6yaApbqnNrd+4xcSjdUbDZpppp70piI7Ic0dm/hAt4meQoV0/C/7ttxoTETuiKz74fH3uRnWc+WR+Eh2eQyDI6vFdiCslxq9WHUNFMp42cVakz2mAbWplXcXI4nN1mzqEDYVAfpv3Z8A2qucgSSqkZd/0D6oNhC5vc6uUMAlOMz9mKfElt6MmTzvt+P4I+U3W++HZOYMSD0qJsfNyX+ZqGM0ltGtA8Vo/aq2mRtzkSG/fS1RaX1mEhlA0ErXVYlPqTp+r4JDl0XUTQ==; 31:I7paEJNFi75nJmHvvdntwYaEvMt5OfxcLz3CBbwdqa2badT2Wv0+aTQYh6lZL8i8WYWX0YBQJH2CBvvInqfT/fDZNQCdyk1lXLtIEsSvVoBjl+mHIorPBsRFoWA2k2og1NvjweuOqViYj0NoI5DAbaN5SXkbWnr9H4yXTNJI0Kz+d0xStgrUcAUJ7KYp+Z+U1P8uQx97ShycwROKDc4cU3KLvuXyB7aMlshJRz90WFY= X-MS-TrafficTypeDiagnostic: SN2PR07MB2622: 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)(93006095)(93001095)(3231311)(944501410)(52105095)(10201501046)(3002001)(149027)(150027)(6041310)(20161123560045)(2016111802025)(20161123558120)(20161123562045)(20161123564045)(6072148)(6043046)(201708071742011)(7699016); SRVR:SN2PR07MB2622; BCL:0; PCL:0; RULEID:; SRVR:SN2PR07MB2622; X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB2622; 4:iN6VjxzdeAIgMZ07Nb+WNWQOCE2eSODW0UDXjaO/LjM3aKdeewGtwn34LbZYPSfsq9In6mqx4JMIKNXWZYCh3lLYpDInR6X8HTfv4itDG2O/lp3o0voHJRkBPePODgajGhWuoGlrXCQ/YW3Qm/gGxHFPO5ZF1hIxOwzyil2HFsyAI5TWlYg2G0UjyrONIe8flF291ViDibodK300jjcCEdGdXZrOBvYz7U0+L+Qas7AQ8IiiY1N1ufm/6q3tnVDqASJ+oRnO2L2a0ViOmOnFvQ== X-Forefront-PRVS: 0744CFB5E8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(376002)(366004)(346002)(39830400003)(396003)(136003)(189003)(199004)(446003)(11346002)(2616005)(476003)(486006)(54906003)(956004)(316002)(52116002)(51416003)(76176011)(16586007)(1076002)(3846002)(6116002)(2351001)(186003)(16526019)(36756003)(26005)(97736004)(48376002)(106356001)(105586002)(86362001)(8936002)(68736007)(50226002)(53936002)(6512007)(7736002)(6916009)(6666003)(478600001)(6486002)(2361001)(305945005)(25786009)(14444005)(2906002)(386003)(50466002)(6506007)(47776003)(4326008)(8676002)(107886003)(66066001)(5660300001)(81166006)(81156014); DIR:OUT; SFP:1102; SCL:1; SRVR:SN2PR07MB2622; H:Jupiter.local; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A: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; SN2PR07MB2622; 23:q44eV+so7H9nmwxZ+pK2qqqEncUdtMdPLzC/7fjAr?= =?us-ascii?Q?U6r7OmFRAbQh93sMTI/oYhZucmgsOfF4qVHe2TfSB3omeu9S/C4jKOxZKman?= =?us-ascii?Q?D35bxlKfwJlkhNfIsFZKSD1iqcju+0uaVniDnsBJx/BDf0/ZP4EdGLHf47Ra?= =?us-ascii?Q?f+b4Jdgczz+oylmYYQByX9keOPio7V9998Nt6ZMmxj4re2jgOTlR0HNBqltq?= =?us-ascii?Q?f6aLF7e0yT9pnI4X3Mswsg/nMrKaanGfN47OKe4iIobb5NpUw2DM4aGE/Qmd?= =?us-ascii?Q?RdXxSR0xukiX9bUMgQLcggQ+dBX7YE69tPduzNWqO6YmBvEKVTLhkHHKzMd8?= =?us-ascii?Q?5de5D18eTE/Tg1FUZs900fJz/fLzekWgjTNcvGl2EJjcupEGU6QFMIhxjGwx?= =?us-ascii?Q?aZUvyxDDjJxB9b4md9RotjIKP0wK6Bkk+yIz/YHLDAE625ffzeCopsiwV/Ip?= =?us-ascii?Q?yNdPuUtAl/tI0X4JRYsak01Pa2NWbLPBL3EbAWmLF5XPIlySYdL5ulnzR6y8?= =?us-ascii?Q?Uxo2vXPMTkFDOdI3MwS5L5KisUUGlEFopIpUqPyaCzHlb4BngHhPcMi17ZWD?= =?us-ascii?Q?ygisoHyNNLB0ay/z/0RDra7cXvRTDfee05uynZib5ppH/dbJqFGJDax4FJXj?= =?us-ascii?Q?MfvQt7xj/1rojO09odtyLj5RW56r7BSrWr4KxppiwAwdnngm66Wb7D9qi9F1?= =?us-ascii?Q?C52qPz6bs0SOb0oE6KN7RzSrHmYPywKyUA29e8DfpwIMJ4hSzgFWDTkKkmpp?= =?us-ascii?Q?3HQFMWbrBpdDM9i0k7S5uxwuNbFXtxyhSHereRRue0Y0snb1zzuOQnbLvmBQ?= =?us-ascii?Q?UffgDJhNv6k8elZbkNYWl00DNk308Ews6bK4xs5wx25KqjhLUC+nElmiZFZg?= =?us-ascii?Q?JoL0f4+QLASq/U/g38zVo6EeW00pVE/pBWfxahYpoondWG8qezGxHLdbqgaW?= =?us-ascii?Q?0kDkI9D1oPrqwAIZMplBj/ysMxLXN1ew+gSh6iuFy1HF1qLtRk/EQYjQGZ97?= =?us-ascii?Q?6ydGsj2BE+PoYp1QUYy26CB+FQO5kKqorH2nuM+iOtBGsrKBwOYjZr5EOXNV?= =?us-ascii?Q?v2z8gU9J5ImXQGL5InopoXUeEG7X2+uXMD1HsE1Jke9rQGOvR7sTM3K9Q6G5?= =?us-ascii?Q?gh8qQbZLdV14X7A/7skt2aRdJJKJFiSByMUgFJ3m7r8EVjaeLLfGfT7evwnQ?= =?us-ascii?Q?yVDQdTLf/NuCP1eBt0tdVj8zjOCMbpLhNd2JaKhhCqK3tdAU+jM3Jte+tGg6?= =?us-ascii?Q?Hcgv1m2t1IdSOCb5WmAwV/5eB13KP6lU7Qdvt9vDCK4L3Dz66Pnjsrtty420?= =?us-ascii?B?Zz09?= X-Microsoft-Antispam-Message-Info: Q3gN7aA2WneW07qbF1UmXKKk0/iqgSrjITLo2Ny76wweQCqwjZRqlVuCdClHysYmXHFo1rPLwQhI+JHwr9/ujjLsqzxQ3OOYsOVBe8DufgdyFPScuodv9DVDybx598+NhDVv9JIIlShVQphWmJZaMD9s/4f4WGPqc33q4e2El1ho311gPnGzBDZWYMtVP0W+K7VX3nuwJHKcewpIGHmiY+HpqocuYjxKSNDYvqylR5AavY0mIb9CRBwBS3Ojscv8KJtth53vAVOeLpg5mkCQyODi7q39Ody/lM6XUwx1uEcwiRlCtxakg4DdC7EfyryECYLPSfXpSufKjNcTehKCONPIX+lZrScJKGNf7yucai0= X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB2622; 6:p6iNcdbdiE2UcGsfLFxpONNYOLdq5WvL+h4pFRJyK+vpVmskWSX6uPilbPuT/wPcg4ANkpQDLVr6mNxBpORcWwrtO2d5iQ+KFd5+ajvERIJwfp5WdwpxuRTaxJfaW/LRWkZfDjLPjWoYl6JClJo+rozcD9XOTWWgMTtLcE3avbiYjgTz3t8MOf95U6fVrI/Xxf2JqotR6gvPGLS49Q4lFKmgXtBUU++ZlI/HUkjn3QUPagIzcYXRCa3gXn+ZxGe4VSNOqsNiSyTLsfsMTQPaTWNZ5R8yXaVuar1MLMDbC7LjrqLIsYzAA7DfTISLMo3DTKWwEUM3sD+Tx4Ao3pz4kY0LVvGJl8iGuF5UtY2+5N5CbAcc3SagnazhalGEr4XZU5ggrUNYzUJUurQ0wYo6vd4R44X+gwzjGhHYVewIUzK5ObaLvsNo/YCdnmyxUj5FBQm/6RQSeIyzy62+WizkTA==; 5:Kw09Yh0B+VRNc6/GB0N714iHB5azxNIxpExIrEq57pRTBvOfsF7LuMO5koxJHTuuWGraOx9U2bAFBFrBuJp0HhGM15qfFMHK0VmNi/OsNyJi1k9P7MP2MVOOssSU21qrWXZ7JTGBOzjzAmpdaNdFhmHohHZbO1SNHAGfmBGdMBY=; 7:P0suYmeZtiHMgH1HImjD5JzhJRiSE2rE931m3EycKRuIOhzdUZPbrnxnP+LcUzIbjcP+R3yqQAF81+mpREoNhJfFQeBJfSne0U+xcTaEpAIn3tYM8T7+J5auUfH/dwJMr2W23Wv8gN23d2ka3cfYSAlGGZICSOI1kH+7Tzz8M7kHmAHkHmg+k7sJFKRMX5hBxTWZr+xXGcgsmrqdddHOJ7TLvz2BdzNubcxnE4CWBGiP898orxs3bvvzmJWiH1Eh SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: janustech.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jul 2018 14:28:27.7986 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b5b1a2ae-b0b7-4965-201a-08d5f23ae477 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 34eb020e-3cf3-43a1-afeb-f5cf1310628e X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN2PR07MB2622 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.70.96 Subject: [Qemu-devel] [PATCH v5 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 Reviewed-by: John Snow --- block/qcow2.c | 2 +- tests/qemu-iotests/103.out | 4 ++-- tests/qemu-iotests/137.out | 2 +- 3 files changed, 4 insertions(+), 4 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..bd9eec3250 100644 --- a/tests/qemu-iotests/103.out +++ b/tests/qemu-iotests/103.out @@ -5,10 +5,10 @@ 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 +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 entry size must be a power o= f two between 512 and the cluster size (65536) can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power o= f two between 512 and the cluster size (65536) can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power o= f two between 512 and the cluster size (65536) 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:34:13 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 1532529016683947.7814206233661; Wed, 25 Jul 2018 07:30:16 -0700 (PDT) Received: from localhost ([::1]:51531 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fiKnv-00068Y-Iz for importer@patchew.org; Wed, 25 Jul 2018 10:30:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47511) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fiKmL-00055E-5s for qemu-devel@nongnu.org; Wed, 25 Jul 2018 10:28:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fiKmI-0000AZ-5L for qemu-devel@nongnu.org; Wed, 25 Jul 2018 10:28:37 -0400 Received: from mail-eopbgr700133.outbound.protection.outlook.com ([40.107.70.133]:39036 helo=NAM04-SN1-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 1fiKmH-00009d-UN; Wed, 25 Jul 2018 10:28:34 -0400 Received: from Jupiter.local (141.226.29.227) by SN2PR07MB2622.namprd07.prod.outlook.com (2603:10b6:804:8::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.995.16; Wed, 25 Jul 2018 14:28:30 +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=lMHwdVxM37GgLAL4bTv9Cnrz6LL8+D4sEtr2yr0pgJX9NDxhw6GtKRhxNKUhRl0STb+fiJ/QeaAGJCCnm0wjYzGcU3ccCfO75EobXgtrfCSStX7wafv3uUANMKKzzgc92+SGCTk6UTPRTuWSilmU6YydpD72JSQEt0lZmdJBJV4= 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 17:27:56 +0300 Message-Id: <20180725142758.9980-3-lbloch@janustech.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180725142758.9980-1-lbloch@janustech.com> References: <20180725142758.9980-1-lbloch@janustech.com> MIME-Version: 1.0 X-Originating-IP: [141.226.29.227] X-ClientProxiedBy: HE1PR05CA0386.eurprd05.prod.outlook.com (2603:10a6:7:94::45) To SN2PR07MB2622.namprd07.prod.outlook.com (2603:10b6:804:8::6) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 51f43407-c89f-425d-99b0-08d5f23ae5f4 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:SN2PR07MB2622; X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB2622; 3:NOgfap1O1FmEPmS/9r+ni2tfPCVwFRp+YRyo0bK5XCQHaP1MrNS9gtyNo+EUvnK0UoPZJ7Io+CGIb8wl5F4eKkNrs5qVtdxggU5S7BSeEyu3DTSTZYbpu1gD2pwXdq3pgM8CVASVbQeTY/Nkm6eQSDmFmvDv2A6ltAq8VSoomIuHOS6NUa3AZLXe2FnP+yoPqwTBGlGoDimAX2Id7c+ObeHJzmUWKNcd9o2Kr3QQ7Rnjhvkp3LamvhnHlSNtCBlK; 25:w+LP7NsjpBsVKj9Z5jNxALFMwa8n0/G+eiwFFwXM140DMCZmU2EfMirznLZJT2Wx/ubpfHlyAUApvkGNcR5O+kfdbNZf9veLE9QWdEljO4Ad4KrfcwGSAG5P4ZZJSTWCzNGFzzeXsa4hXdIl/FDcq4kCrSqeHVViOIDxUDt0td037bI3SpQ9LXJoEIy3+8ordJ7cmFs5+Iw5IYh1DyB6rJMNAlqjMFuNr3n67o39sTorduYR4uoqoYS9sXmN7NKgiunNOg07fQOOGSJ6zf9LvN8fZcTC+XDb3g3sNvxaLT+zMRMEcgygjpSd6dYv3JdMp4VKkbuPxx3yaROJsfrwKw==; 31:2z2376y4NCpkPhslfj7x8NGnYmLZV2lHDRKsVZZDA/yarqVH/YNROsV+ai0TpQNd6SfyayrKPTRPZajeoWhtCL1pQPdOOc4uP+Bw+68RjqTV0dRMf+s5Uyk0E2ptUWrMK6YZ8kjfcuMaQC8p+QDq7i+DkIFhT4OGyqgIfnO71dHcAj+Hl3VCFyKM1n3Bw8Slz++DwGykXjtVr1GNvsG8yfuDff6g4wF9nlXav/Omljs= X-MS-TrafficTypeDiagnostic: SN2PR07MB2622: 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)(93006095)(93001095)(3231311)(944501410)(52105095)(10201501046)(3002001)(149027)(150027)(6041310)(20161123560045)(2016111802025)(20161123558120)(20161123562045)(20161123564045)(6072148)(6043046)(201708071742011)(7699016); SRVR:SN2PR07MB2622; BCL:0; PCL:0; RULEID:; SRVR:SN2PR07MB2622; X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB2622; 4:RD6VsU9kHAq45nIHb141CNAE+jOoLOUg94sLO34Y+BpXpi9O35PlOhM6oTRehNqzDXPywKumLkbFZquzhzveVyQFsx5HkAJkZV1IVgcrKHNLz6ltEjMmc+RWuERrKVN12/Ayh/FPKocp4fmN/83vj8PB9RK2dUS/boXRcOaglrw7Ot2FMo2xpY798u8mBA5CtNUfN2uYVTPPXGlAy44rmPI/nbhEhnzwNcrw+zm4lxG6VvfRvGpvMSDCABssXwJydwGyAW7wJUFkQ8ZDFCW2vw== X-Forefront-PRVS: 0744CFB5E8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(376002)(366004)(346002)(39830400003)(396003)(136003)(189003)(199004)(446003)(11346002)(2616005)(476003)(486006)(54906003)(956004)(316002)(52116002)(51416003)(76176011)(16586007)(1076002)(3846002)(6116002)(2351001)(186003)(16526019)(36756003)(26005)(97736004)(48376002)(106356001)(105586002)(86362001)(575784001)(8936002)(68736007)(50226002)(53936002)(6512007)(7736002)(6916009)(6666003)(478600001)(6486002)(2361001)(305945005)(25786009)(14444005)(2906002)(386003)(50466002)(6506007)(47776003)(4326008)(8676002)(107886003)(66066001)(5660300001)(81166006)(81156014); DIR:OUT; SFP:1102; SCL:1; SRVR:SN2PR07MB2622; H:Jupiter.local; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A: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; SN2PR07MB2622; 23:wxixuHABzD+HKEdRZc5pddMWEy0aFrMVX17jEPdRb?= =?us-ascii?Q?xdilhYyyzUU9tMrQJsrjr1BnCsjig5WiCx96g13f0cmnYNdoberhuydYAIkk?= =?us-ascii?Q?wERQjgl4gnOU5S0ZrV7v17BhdSEk3E+Lq6K5tbC9AymErY8BU4nXJz+ZlqU5?= =?us-ascii?Q?TISNKasn3eQlaVqHOnHjBXr1CaATFMyl1BbhyGAb02GaVWB+LwZnhn0jmMYj?= =?us-ascii?Q?QhIa9BdG4xc99USfV0xlOzV7wNFXkxadxNiMYCW2wTi7DjzOBOHicWj2iP9n?= =?us-ascii?Q?MPCDNCWL5Ve/GQuWTqs/NoBEIKQA4FbJbSBt6YoLhweKT1nizTAWRvmkFu2K?= =?us-ascii?Q?ti2EV2z79Y72xxRfqMkyFVwwNAD1K13euIqHDE6DNimdNo5+mevq/w2bre6p?= =?us-ascii?Q?PpD9R8rnYPb4aYjnSgAxPsXrSgQBuw71UN4TC3xN4wxLQPOnN52SB0SNEWNw?= =?us-ascii?Q?4N2soV11daKwQrKOOXfPFSkHLytATTj4E1YEq1SYjkJL8QhLZfMAVwURW14A?= =?us-ascii?Q?3HCALNaMuk/raWRBIhIlQU4IOBjq6o515QQrQRoL8A+qbJuKk3yHthsfVO9j?= =?us-ascii?Q?WxfDu9mNn25Dg2dgB7MC3FYhqLxZsn+cuIlq9C8hMwfdbD9wgXYjx9B7IhM4?= =?us-ascii?Q?BzZ+T0StzPB7gGDFi2v/+M2j/YuT9uq2iUxwytGcwiqlu8Nc4ZuQtQ9EqXGY?= =?us-ascii?Q?FsLHGjqvsiLDmNXiVlIx9e/z784Ai1S652PlpTotr7Q/935xrrvIDKazW0QT?= =?us-ascii?Q?IrGbtAmghKosWzB1zDWXrfdW6SNiQqtUWNgrCd4gEj+Ov7nbC6dKoYt0d+tc?= =?us-ascii?Q?XQXHDkVf6/bCVykJxr05D85ShOJ/+Q8HRIBVPmYVYWPgK5DPyvVqwiGxEKKW?= =?us-ascii?Q?+HXLLqHUO6jI+scuXIwRvCTl+SEIHmiU6/qXFELJIQp2T0ke3eXCICMvFrlK?= =?us-ascii?Q?jfD5sZvVP5cE5UADHb5N0j+/4kq366jFZjdJuaCEBmwI7o2mIevBDsyVaryR?= =?us-ascii?Q?XIMpCpQbW88izYxXDS4SW3UCxy4zaXiw6BgEyJV8sZ1yU99AR1ujdbZ7c72h?= =?us-ascii?Q?iXf7yEmx7mmlPXBKfroDJiRJKReZEiauvofhchAcvp6tTLPA27udiaNS5ywn?= =?us-ascii?Q?QxkddzMo/oOi26pNn+rSi1i2VUQE2R9dioFUmUXnxRqI45IDEn34eeSptSJ1?= =?us-ascii?Q?ruS2tMx/ONq0JW0QnNIdVFk/5/5Lg1wDyLiGLjbnvLbrTJpNnhs+i2SzCaIh?= =?us-ascii?Q?6p3dRL/tpiNFekiUvd6RRY6XMi2m+PXSG3+w09F68S/iKap7iVM65kTOMuAM?= =?us-ascii?Q?iNRtH9/Crl+cg0Z9gbAVfA=3D?= X-Microsoft-Antispam-Message-Info: Uo7OPylBBxg3QFSvTw7U055TVm71ti9Ql7GOpV1TGIm/q6Ncmd4U7NgW7qvVzqrAwFTJHt/Qq/3XVK7qhIIYxENmc4FVLfrjm/IKTiAzd9ZfakpZQGk/H6byjj0ZBv3mwJghZqseGuBlPh5AId3/tbEEKmAXY65PW8KX+58vN47qu+26Q0KfV4Ix4Rhulr8imV1lA25mjnP3CZVEHja5329tLBbHnV1GJUpEkWM/xJK5d2HC86bFmH5VLwQnpv8U3knAyM7UhylSG/IbYzh968U1DOfP21hMJ21QIu4EjLlhCs8997vafdWxoJGQeyULsG02zQjXXZOiULgzlFV9gN4RlOb/EOoSDx96P/EAwNs= X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB2622; 6:I4yWRA6HQjYDoeMj1HHPnvePDEAEpV5rPMxLKMSOKmtlXDPH2tDAa6+o/dLEka60AIcTCpyMji71DbbhvcdWII3YfER2pyhVnqHPrYInSc1xC+L02aiWoevugXqGgqQZu+ZGFULzxavJx7lRnxKxahpR0tbEoXKZeWHWr/0clUNs/ydBWc7/At8YBXmZP205Tg9g3Ms9CdbeDsyHcLrd00X5Tbb2/rOfyD1UWeI/iKG87sGHNbJB27s6zbrDTiUMJ2bkS/AkcAuNxPzPEhz9reMm+ObtmpSs+0bKiptUdFjiz9TJUK9x5Ym5z52SLWsq9iSwZkXlxAbaJWcrrphmbK+QPGCwXxbYRDWhcD9EiVLEImRZc7InFuNLyROvohUy6sOwPrlftFJqR+zWDvpd+IHcRpV2Usa6Vz4ZkCFh5or2Eu7ykbRABwinJfg/gYdN0n5/EApGXh9KMWZqaEoVLg==; 5:OVxOY6CAQ43qTsLayy7w0UlLh68Q4sOaahmb9xjWa8HlUb7WQJXJigfsFxWF6ibAaBd/CefDPTw6PoOMyBi+d3ED0u5V/wcrnbfVeDlGcWyC5YtDZiuiMGnZol0hOgTevof2OBZUwRMoegsKDRyVHa1j4reudRk8AoBIJT8IBZA=; 7:X3Scoaa168iGkHGJltkcp7hvOukM+vXJUtfQBIWD9Q0GVuNgK1pdDoLrPTMl8Uf3+lMPhjyBKsA/Q3Xq0qPk/AQ3C4g9RAbRhT0fhWRrmyFxRa+flAg15Axv0EJPOj3MPFkYWLjBTioqIPLnl48eIN2JDbW7JX1+RKCw1aob//QHCFpDSAtIeMze9aRbD4+CeBZnX2gTLlVF7gvKU7nQukwMUPeSTL59jcUP/PTxZV8vANqxbk7PMJ3wXdWnSuAo SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: janustech.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jul 2018 14:28:30.3611 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 51f43407-c89f-425d-99b0-08d5f23ae5f4 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 34eb020e-3cf3-43a1-afeb-f5cf1310628e X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN2PR07MB2622 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.70.133 Subject: [Qemu-devel] [PATCH v5 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:34:13 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 1532529309752531.2713101964131; Wed, 25 Jul 2018 07:35:09 -0700 (PDT) Received: from localhost ([::1]:51567 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fiKsZ-00019g-5H for importer@patchew.org; Wed, 25 Jul 2018 10:35:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47534) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fiKmP-00058u-1B for qemu-devel@nongnu.org; Wed, 25 Jul 2018 10:28:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fiKmM-0000Go-0V for qemu-devel@nongnu.org; Wed, 25 Jul 2018 10:28:41 -0400 Received: from mail-by2nam01on0099.outbound.protection.outlook.com ([104.47.34.99]:45281 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 1fiKmL-0000EQ-JK; Wed, 25 Jul 2018 10:28:37 -0400 Received: from Jupiter.local (141.226.29.227) by SN2PR07MB2622.namprd07.prod.outlook.com (2603:10b6:804:8::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.995.16; Wed, 25 Jul 2018 14:28:32 +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=oHhwlf2eFrXs5XRabfOFZiDazu7VPVvaYvjG2kVRxQw=; b=MZa1QHL8dCH/bQMTcE7/F6gvIRnzD1+GuSmfACTxT28RQgeyw0usOlZ03uHViWvM7KqHTgTc9tgobGPROuPFRn25AA5oXa6A2WiD6VxrVZrQDLPSxYCDExhhfFRv/YDouR4iK5dwuTB/XOkEXhna2eWtrSqhvAOlf+NheCf0XEA= 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 17:27:57 +0300 Message-Id: <20180725142758.9980-4-lbloch@janustech.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180725142758.9980-1-lbloch@janustech.com> References: <20180725142758.9980-1-lbloch@janustech.com> MIME-Version: 1.0 X-Originating-IP: [141.226.29.227] X-ClientProxiedBy: HE1PR05CA0386.eurprd05.prod.outlook.com (2603:10a6:7:94::45) To SN2PR07MB2622.namprd07.prod.outlook.com (2603:10b6:804:8::6) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fae0b1cd-0822-4125-b0e9-08d5f23ae76f 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:SN2PR07MB2622; X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB2622; 3:tD/9pREH8zewxSkWYLsfmm5bJwnd/x48gHYvHyHXGja98a7+pHZ7yLnEKh7h1EpclUVdnRfS9tJPBRSffUpeN0CdNloiWFUfym1LPNOKaCyN+DvPfESJI5dXMnbzuoUm+gwo+KJb5ROJOKwre1lBuF4+86rTgH3c5ftldYm0DTyXYhucjVRLEN8/6dyJx1UApoh0O9KEaRaITShdVZbrZ+JRUVYtM1JKzvUkRVgIYBf0fqrktA3+OmdM6J8ZLkiX; 25:Iuo0rjWGzRZFnV6A3TLfCslkv7LI53r1ri5uLnVGAZGfmi5Qw0WfFaU26xdGkflT0QOTbT1NVUekeVlwY2PnppcOaqOEOik7TZWLsKXCXj3eeI1WfM/+o9qX/d1KAw6EmFeX1AVLsXn9jH6shXVHU2+WcjtPsNOQ6KP/jLIyVuEhe8t0dOGpSJhYKvw3fecb50KBPbjbyu8PAVTz6S+CxsTlL+OuFhm4yH6Hty37ncpxmqfVzQ7SEaYgeK9twCu3x+syQ9f4vpvG7z8C6tbTXP2q+3aQBbkbQiJSqkvgo4cWV6B1aK78VXeBttNdbQgs9zAugvs1mRhBkbpHSg18Bw==; 31:kvEcTSFipWBGYGZQodYJyYgO6Ocrn6yfeR19FxNX1TKUQFkXpKsaVNcidJ8bEleOWxJXTvuSqT0tAoreipnhjyrwfJY1MwIVhBjVqgFruPJ+kKltGGg+AhfgM4RuKOLka70vjEdb3wrMn2llVD5UQ1fBTTjn/HCRpLYDVko3VM2o+PVmuWecq+JrXpUbWwaSaGgL5KNbrseZ4DDo2U2wDggN0RXvIl0cpkhn/0D49JY= X-MS-TrafficTypeDiagnostic: SN2PR07MB2622: 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)(93006095)(93001095)(3231311)(944501410)(52105095)(10201501046)(3002001)(149027)(150027)(6041310)(20161123560045)(2016111802025)(20161123558120)(20161123562045)(20161123564045)(6072148)(6043046)(201708071742011)(7699016); SRVR:SN2PR07MB2622; BCL:0; PCL:0; RULEID:; SRVR:SN2PR07MB2622; X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB2622; 4:Ok2CEIeRomJYhGGivsl+hvXRFI7XJ1GuWITmPJfpic1Cy9S6AJPVSc2Vr4afmkY1w3+lxBjk+S4FbcxxhpL2u8W++18d7t6dP6f73p3qwW1xh2Yug/HWzSu/9xUNQwJwkx1x4QfvHrvMas37uk/KAwpNZT4Ww6nuKgWuW/Yd+DXJPoRT24QlnjCfACkucXSSCQOIafX9o1jUY4EgERlQwop3EsHtnBCbmrX2EU2L3uhsimbo9CzUF8uWg9VUbgqW1Q1xv4TEHWhptUmgQ94ZGQ== X-Forefront-PRVS: 0744CFB5E8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(376002)(366004)(346002)(39830400003)(396003)(136003)(189003)(199004)(446003)(11346002)(2616005)(476003)(486006)(54906003)(956004)(316002)(52116002)(51416003)(76176011)(16586007)(1076002)(3846002)(6116002)(2351001)(186003)(16526019)(36756003)(26005)(97736004)(48376002)(106356001)(105586002)(86362001)(575784001)(8936002)(68736007)(50226002)(53936002)(6512007)(7736002)(6916009)(6666003)(478600001)(6486002)(2361001)(305945005)(25786009)(14444005)(2906002)(386003)(50466002)(6506007)(47776003)(4326008)(8676002)(107886003)(66066001)(5660300001)(81166006)(81156014); DIR:OUT; SFP:1102; SCL:1; SRVR:SN2PR07MB2622; H:Jupiter.local; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A: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; SN2PR07MB2622; 23:0ap3ErjMHZ5iDLFAJBXY4fgU1VqhXZPOH62w3aaUk?= =?us-ascii?Q?3Sj/1a5qnX3Bq5O6kPwiVaXaI5m1YEWez1sThO9oQU2XV5Au7Kf8Cr//mV0l?= =?us-ascii?Q?Z5SPs8h1BFgVDEPg3919p2qD5E1MRdFJaD8u/41A578wdwyt5Rzs3eO29bBP?= =?us-ascii?Q?SwpFpBWrIu/gEbFLnxcWCEBStzdtgs4UNUTzVPn1fsWSub9QRrBgHa/rFm24?= =?us-ascii?Q?QGxF2BwMN+Tj2655HXPQWQtxzR7tY/Tot+KERk/gPBK6PgklZt8gV7TaKG3I?= =?us-ascii?Q?I1bImAExBOi7IbKRySSn4kfiNBrClG2r9K3n94rJ0NpX+UAU12UhSwlrQdzv?= =?us-ascii?Q?7TgQF0SmFpBRUtS6KcFe03EknNTqTBne4EXB0ZyUM+/Dr97CjJ9SJkH8vTYC?= =?us-ascii?Q?nymwBLSedncjpzlBSlX+OPCSuyKGoD5FF179wmE/UzyxswFEoRiDA1a9KsrT?= =?us-ascii?Q?5H9gUoJ5opx129uY0HWj3TPDE60JqlJBgaWloRxsgpcwCzoJ0/C7ygOBpZ1R?= =?us-ascii?Q?9xnKwhRCjFwbOeViqp4tq2COA0UtnhHtwkv3HQUAI24Xxzs/BWXNXNnb1tSZ?= =?us-ascii?Q?sKREZAxckTorOngBNtJ57lt9JXeja76EVnqal9MEX9vQ5u4tH28DAyPiweID?= =?us-ascii?Q?giwigDFSE9rncQMPWKKL16j2iRXDzCcYO3PHeh2+0trm4eQAuyvair7nchLX?= =?us-ascii?Q?ifyw/hHwi9bqoKMDfTCiFpMvfFlAHAQs5rPzeSXcLYiFwbgs148om1bEMTfZ?= =?us-ascii?Q?YOZ3XBxuzpSm7fRJht3mlhFOTULIKH8kCcOWhJfD+sWLKMTTfstU9B8yak1T?= =?us-ascii?Q?n0DwcD9Iy8mZ/9NKOqTRuY60+04N7XBdL/sPorkdIXfFMDI0bcLL26BF7+1k?= =?us-ascii?Q?5DwNICHNnGWBnHi+OuXbEXdJFXYNkVy1Lyc91cIEFnOOFS2bvDJmT+fIG7yL?= =?us-ascii?Q?f1/nNWZr3bfVwdRlXXZlD92ViwqZbVHJOOwZxcsHgi2LyUwO7vm4YqSTx9QW?= =?us-ascii?Q?u02w6AF1jgoqGK1jSxSYaVDMxOmUTroEI5D8TqWilUeC6GRf7yy0y30CRPfq?= =?us-ascii?Q?fV4fuzhC6oKPUzqqCp1pEl6LS0c4ql92oxK8/n+PcOIwe7kllDHyn1FnXq7Y?= =?us-ascii?Q?ezJtksYxPyi9/UP6sUYr6SSFqlXjJLjfQpNmMILJj2XYgEk7eJlx+Fu6sgs5?= =?us-ascii?Q?dTHqF7dDwPsirCdl9J5lGie1rNwFabc2Q/MX33ON84CDqFIkBsLD7yqEs27A?= =?us-ascii?Q?Ancx5+B4CfnZiQEchNMB+7Niurbl4enp3raMAaaoSFhM1zupfHfAAVXVFfcb?= =?us-ascii?Q?ZumbqHwPP0LJErUP+obWmk=3D?= X-Microsoft-Antispam-Message-Info: RurM0NZ20lbDbpHxqIvPo+s88gslTiIWarWNYnDOjGvDVlH8sSSfA8atrydpXWYLu86tIxdUORL2klcW2tMwP5V1k4RFn085evrPSpBgRX7Xv3UWLN3RwQ+rtGofj7oyvVwE645v7DeDb23jVrEeIdxcterC2sMIjnXCM+22Pt0RwP0RwMMrJCV3ypLO5YgRlJsRJdLiLSQbN9FvnXF0P2ndBaDMC+KVM90uaB+PRjGA43jlQy//pbkcwUmqa/hZdZxhzEiClFi9feIGl+9tOrffh4dKJ7xKG3Qh6Kj/1gi2fWOKZkGo+hzkmrQ9J4efiKcb20m2dAVrOn7V8moQmBSGhqu0nOsJ2eab7zKDX8E= X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB2622; 6:YQHr4IcHeK5Vx9wan34DKdQhudir571k1phkUyInY4Z3rCQ4Cbmlet7aFVUCNctBw/um95CMzWskj/oQW36b82LCMvEYvBaXg5LBYcFLd+ort5hlsWh9g42gS5hCwQNqIiDe4WTA4/pjIqj3SFvYB1GWYomD49/IJt0oAEJcfe0mM4x3jqpzfQiZbiY3ZDL72/slAeyocbQBcMJ1GGV2YLlQpvBf3V2EnBkkyLXanFB+9ctG3Z8EP64ehDBSy/uNpFF4+yHswLMRwitja1qJAl1jRLxMYwjsBrLFc51VecswKMGxERCd78/YXA14xRTqUZfnauF4yqeenqjqDOvVKDf5sc+jxG1TIlCc4oNVE/Wzdf28yh778BJLAakK/mRvH8kx4lFv35Ry69P5suIjVvvOEhQiW+tRBDRRq62IBZU2odDuGNZTorD5DnYOxpHt5GFQAYBdjoVE5NPsoS+bIw==; 5:p5X7OJtoV6EQlDejsH642YBzglCE/jKVLAiFm65zL/LvCbcLtydjzOGP9rFccOAwx8ehB7obL8bjH/rnWeOqktLefwrVieogA5ir7CU/sZSGmcI0FCd5glta4UKh2FQGgX4qHlXuBVSbo4O0VP5c4BxjpK9SZXn+rrKNVdecxdU=; 7:ETQtr0o5RwoZZLo0MqmD8hcSMueafbHi50mHQ0rSDW/82kr+B2lRLCRa9BBHPhx91LHJ/1eKx6oM27YejooaDrbkFcAM99a14ESi5Rwp+3LWx6ce7oJ2rSKHZ27dD2AhCb4YyT8WM4k05IdXon7ctvvJndR5HsyXdAKdckxLzGNgPWOqUmbhy3b6Tz4xyV5Bx93vLZ0J1v9FVc1foMum0zBpiDfHlE4bqm90h/GuOhJTStKfNv5zH4NQ4XFGvqxT SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: janustech.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jul 2018 14:28:32.8299 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fae0b1cd-0822-4125-b0e9-08d5f23ae76f X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 34eb020e-3cf3-43a1-afeb-f5cf1310628e X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN2PR07MB2622 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.34.99 Subject: [Qemu-devel] [PATCH v5 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..d8de9be3cd 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_bool(opts, QCOW2_OPT_L2_CACHE_FULL,= 0); 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:34:13 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 1532529067833121.24296603686776; Wed, 25 Jul 2018 07:31:07 -0700 (PDT) Received: from localhost ([::1]:51537 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fiKok-00076V-OU for importer@patchew.org; Wed, 25 Jul 2018 10:31:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47547) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fiKmQ-0005Bb-Mb for qemu-devel@nongnu.org; Wed, 25 Jul 2018 10:28:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fiKmN-0000Jj-MZ for qemu-devel@nongnu.org; Wed, 25 Jul 2018 10:28:42 -0400 Received: from mail-eopbgr700117.outbound.protection.outlook.com ([40.107.70.117]:60081 helo=NAM04-SN1-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 1fiKmN-0000IV-El; Wed, 25 Jul 2018 10:28:39 -0400 Received: from Jupiter.local (141.226.29.227) by SN2PR07MB2622.namprd07.prod.outlook.com (2603:10b6:804:8::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.995.16; Wed, 25 Jul 2018 14:28:35 +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=xOmLUXRUR3DiOVAuBBm7cklLyYZb7zlWNnSnTyrPPWQ=; b=P5KbBWT6hR3GLnq6pFnt1NmJP7wVfhQ0cR3iHFx5+GMUCGSa7+VwIaTU8J6Nc8ZSM2NlYiRFqjqmV9FzjW7a77nHIB2/13yJymH+NgsPvwBXwX3wIqh7YUgmIAIJNrTF+bvz3fszLB7AlT5vcPVEMH19s37ixhz8qjhfj0oNOks= 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 17:27:58 +0300 Message-Id: <20180725142758.9980-5-lbloch@janustech.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180725142758.9980-1-lbloch@janustech.com> References: <20180725142758.9980-1-lbloch@janustech.com> MIME-Version: 1.0 X-Originating-IP: [141.226.29.227] X-ClientProxiedBy: HE1PR05CA0386.eurprd05.prod.outlook.com (2603:10a6:7:94::45) To SN2PR07MB2622.namprd07.prod.outlook.com (2603:10b6:804:8::6) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9aefd588-cc95-41f6-292d-08d5f23ae90c 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:SN2PR07MB2622; X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB2622; 3:Ro4Oi+0ftBx3DO3fSv9XK58RBjOcONDNLgWpcSmWasbp/TCeND2ROxy0Wl8jDuNSxsZISQgbH4Q6vUgqE2oKP5VZwaeBWzKNqhqvP9DvV1eJtoXxIftc7+0tCGIQDZ+t3VhzNJXC55hkQnyEZ5byjWDi7RcUCmWQH46Ao25xbQyN5GHeYDMJ4KVetIIaxftdHaWnOkm1S5kOAg9GCWxaaEVPIKcRNC4JXHmvBlaSKnh0wFNjtsIOUXugsfOTILYU; 25:LXBRFG2Wi61z64+NS17q2MFP/RVjiCHqUb7mtZJwCNlisyENzHapfgZiAti4bpVt2alIWXgknCS69p6N/Kpy3Qs5yq+RhXryjKGH2zV/VGk4T2PYPKsxnyPjr8DFZ7jAfg7HKY0ktPfobQ0u0O0rPc5X2GoHAyeQN6gtuzPpVUVNb6INhgJ1dGmQ+NJ0Oy6Fb9Xz6oCeYLi/lxziyVoymCDjZU3nOycBNbgMSWC5MFFAh9Gl9SDrrRM5LVArCFtyNWAhZElJQbp+T3Zzd/dLq325nwrXaVb+qzhz74pAl7Yob0DhhjAnD5DL2fi5z9ut473VvwU6z4Uowf39kQO1xw==; 31:qp1WTjhQJt5cfMfF339Nx8EfLWeIwPLZuDkNnNeEzA1nNc1hO50mCxNwyvXT7OtYADseX9AsWzuPZzj3QcIDE5TV82cFgxDZTldC0NXd7Rem+1MgevwzRVmXUhSd3R7cEUZ4doeYxK4cHUzNQQ78xCTl1z+9uNgVnDVgZONHBD9zXFhcMyjboW4obbqZQMvPzjIPncKy40k9Cp+4AV0+j8PXiqvnby13xkrjAld0NzE= X-MS-TrafficTypeDiagnostic: SN2PR07MB2622: 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)(93006095)(93001095)(3231311)(944501410)(52105095)(10201501046)(3002001)(149027)(150027)(6041310)(20161123560045)(2016111802025)(20161123558120)(20161123562045)(20161123564045)(6072148)(6043046)(201708071742011)(7699016); SRVR:SN2PR07MB2622; BCL:0; PCL:0; RULEID:; SRVR:SN2PR07MB2622; X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB2622; 4:TTuPRe2CMv1sV0JDt8jxLTUdaWPgFkZkbrPmRccwrnGz5fb+tCoXs7/IqZHlAZkPE3JFlWCNlNsY/4BIDrExb2qx+eL+XTq6/f92xzltXrguzFwP+ufQeP7LFL1nX3Yzl59eJgF9kg2NOsiMegB52HwDxzfpr196Rslcp1GvmNSfdns1CX6s8u940OD+Cwi9lkrp/vlZ1dsarhrbCoLNPih1XhtBVOfgS7LjoVFagkPzj4BeXQBiO0wEh8O97SRqboDDeI0NJZjfeXmEc6rljA== X-Forefront-PRVS: 0744CFB5E8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(376002)(366004)(346002)(39830400003)(396003)(136003)(189003)(199004)(446003)(11346002)(2616005)(476003)(486006)(54906003)(956004)(316002)(52116002)(51416003)(76176011)(16586007)(1076002)(3846002)(6116002)(2351001)(186003)(16526019)(36756003)(26005)(97736004)(48376002)(106356001)(105586002)(86362001)(8936002)(68736007)(50226002)(53936002)(6512007)(7736002)(6916009)(6666003)(478600001)(6486002)(2361001)(305945005)(25786009)(14444005)(2906002)(386003)(50466002)(6506007)(47776003)(4326008)(8676002)(107886003)(66066001)(5660300001)(81166006)(81156014); DIR:OUT; SFP:1102; SCL:1; SRVR:SN2PR07MB2622; H:Jupiter.local; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A: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; SN2PR07MB2622; 23:2T6IHSpBNt+coeuU3UMSh2tetZeB4SRnTPeQx5dI0?= =?us-ascii?Q?a+PloBzpXYAApm1FE+Hm3+A8doyfSxldvFUSZlTpT+jZt2ptqsABMI+K8SKB?= =?us-ascii?Q?kKbWrkmFgECDpCtWwnmGM2g5yKnWBmoehgm2ITtWvsJEWwMMamhJMCH1XQIm?= =?us-ascii?Q?LHP7PAR2iRff8sR782dAnBlXT70VYK/vNyuZgjp1MsUJW1cFpbix7qIImxTE?= =?us-ascii?Q?FCdsMg8JxFZ9DuhBsS2CSkkgnMMPgk5I8kPtkPjLm0t9PfwCpwdbRxnvnpKZ?= =?us-ascii?Q?9LFtCCbKLHNWSFlmSnXMKSNZ010vbFXpxmOhMYjpfMg5Tvcg0Nhj+D1/LsDf?= =?us-ascii?Q?+peixDo3q/+pc72pi0sk4U0rYc7hDaun77S+9v8zI6MLtyxDVotqHOp3/EoO?= =?us-ascii?Q?7fS3X6MutzzR2GpWzlpguidBkGxEaO1v57fqtuMTxNGBcyo1gYtbnsbJPlZe?= =?us-ascii?Q?ZfOcmzFaXDQJutpoN2mDBWLEEzv0rPWcUaEVU7rJBRtE3FkB7NRUsJIA/I4Y?= =?us-ascii?Q?PbeQjS+dXXUScSZYnmcu6QQ8Z8vns/X2Nyv8a+1E4XXm0UE/xm0CkhZGc7YH?= =?us-ascii?Q?uxUmGpBFngt0bNNNekx1f07wZoAIPXJDkCVptN0Yjrtbwy5XoeOvXs/hHh/K?= =?us-ascii?Q?1AfKR6vsabyiKStAQfz60TpHZEBfNo5Eu9jNDReQVAJ6iA6vvDBSc/PIGiBf?= =?us-ascii?Q?YiOw1G0vYHYEERxojnbfuBhPeQhBHLG+AEIDc3QP4imsIPnFHc9der+3uz/Y?= =?us-ascii?Q?0F/Rel0f9iRA1jC7ZXAUt3TvSTfTzTSghKA1NguapFQybDbsSbmzZG0uOoYh?= =?us-ascii?Q?Zyj19kWizg5sePq7so5tqbX7kES+fqwk+EZW0hiCx7IvIirnsJGiqCgKGNsU?= =?us-ascii?Q?XLB2yHuMaBtPi7CZbZ9MTFodHN08TRnGq0h/gm98uXyAV48GgnVHFKFn2ztc?= =?us-ascii?Q?0r8TJZnv7fHGbjakyW0NQZOGNBkJNqvfj3R1vecI1IITEnyb9eHZj9UWAXxY?= =?us-ascii?Q?9TF5BnmNINLAmTApSvvVfMjD/5UG9CsS+S2CV86bzv9aA+dnLKEsFzanEQZP?= =?us-ascii?Q?eEuirjGybm66CR5MtOKMrATKxy5aeslixqLLRnePJFSX5ygjrClKHX1BSh52?= =?us-ascii?Q?N/P1KilvsDHkRgqCY44MMvZ+SummmSAhwJUstRQiWz7qNQ2Spjce0MqhoT/l?= =?us-ascii?Q?W3i1ciqT5fmIHKcGSn3FXe7kkKMhJgUa18xirAFgRbXpf8Lxx9VtgSyADsMd?= =?us-ascii?Q?2qWaRwhnsbjnW/5MMroRV0ozyp6Doa7j8IaScUvsTPh49vY/cs2Cx6hJ1M64?= =?us-ascii?B?QT09?= X-Microsoft-Antispam-Message-Info: ckgermU32pp3hMpYnIEtEh18hFnL3TPkIEEWNGFd4V0rVkIVXq15edTyHQimDyBUBkhlsLrJB+aX8wXRzVzESmaOtcHg05vzwQoOm0aObMeLS2zbUs4qTOM0VUdeIYODtYxZgPwodzf8/BY3EFuXVVl5IzM8fM0/7UOdLzqGJ14n4gDih+Jnp5o9xXkyqbiBefnWySxpsrGLkTC03wxNBaCF9oZeIpXbBY8ynGhzjSusZyKcWOty6nhHXeT1cBxjZRxUsQraOzt8TiVkAvyO5sCQAyQ1jUy0x0Y5aeyVeRK2GS/F8TbU+n9Yrh8iiuUdH/HzG57dTLsI5JCVsNy8+JJ4twKoaHV0Tds0XnEn2JA= X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB2622; 6:LJ5EK8PTNrjA7zwEROWFfy50LmIgjQulD5BQFegm7lfBPNrWqhSgH+y/b4eJDJpaHFY7X56ATFSeLC1u9ohYXAT0G86tPeKJv6OFRmOyh7nNfbZfcW/y5dakFACVGVTExKEUhptl7MM2cYZRzSM3R0dBkMOC9ORiZK2LlNlFza4YMRd+PWcHMh0RIBWF+N2V5pdcr46eP7f+RkeWq7IEp6HiTkefjSS/mGU4NRkbDixrHu9fdEi2zf6T3C7mKbhYGaYoHvUitpVcLl507xhll8VWLphYiEzUM1ZDnRD9Z6R8leUZUhbLGv6R9Utoc6yN32KV5xbUTNN4gOJaHjQ4ZLX+govrbECpNTVFkc4VG7XXJu6umdX7zqAOdwUiH7H/bQMe9CTFqkaDlcpgH0qOqcOvrxwkERXww5/kPw0xfCPywxQiSIVf7nUiyLb+wpBHfcYtXBOV+PkGStSllP0gxg==; 5:OqiozGm+NWdddkdR3kTgBkkvS5WvwlBjGo7dNKAKHW2eS4dJD2PeumrW7zqBe2S92CRTKJypbfwVh+YfaLrwZe9lqREZXQ9C24oE01Tqj0rgu/x4EfpebA2OrqGPiGE6RC3G+IVbWb4J+SmPjrH257EQvgeu78ox4zAg8vON9vw=; 7:86iQbCJVrqfjxlLk25X3SrQX9kjwiwpm0E2dUN9sljuwuoZ8c2o0fFkjG/zKuT8MjF86gDvHc4ib+Jz/uwfpAP48teQw8V8/7lDXYZUxxOmFYHH5SxRN2kzMuXBW/lLM0YfK80ZdIKcroN7WiHY49rVZjG8aGGPTvlK3MKbP20tvI1lYdl+AUJHBeiNpb5wTACZFGcDuU2clZCL+3IY0tdyqQdXx8HHItr/kkRIOXLt9p4vK0Ldp9HXBfi20vaf9 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: janustech.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jul 2018 14:28:35.5487 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9aefd588-cc95-41f6-292d-08d5f23ae90c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 34eb020e-3cf3-43a1-afeb-f5cf1310628e X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN2PR07MB2622 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.70.117 Subject: [Qemu-devel] [PATCH v5 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..85010c6a6d 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=3D6 $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 bd9eec3250..f4bac5371b 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-size and l2-cache-full 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 at 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..1ef10ac554 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-size and l2-cache-full 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