From patchwork Wed Jul 25 14:27:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leonid Bloch X-Patchwork-Id: 10544103 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9157017FD for ; Wed, 25 Jul 2018 14:31:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 81D3D2A1F5 for ; Wed, 25 Jul 2018 14:31:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7E8FA2A26E; Wed, 25 Jul 2018 14:31:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DE36E2A1F5 for ; Wed, 25 Jul 2018 14:31:56 +0000 (UTC) Received: from localhost ([::1]:51555 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fiKpY-0008E2-0B for patchwork-qemu-devel@patchwork.kernel.org; Wed, 25 Jul 2018 10:31:56 -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 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; 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 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: 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?= U6r7OmFRAbQh93sMTI/oYhZucmgsOfF4qVHe2TfSB3omeu9S/C4jKOxZKmanD35bxlKfwJlkhNfIsFZKSD1iqcju+0uaVniDnsBJx/BDf0/ZP4EdGLHf47Raf+b4Jdgczz+oylmYYQByX9keOPio7V9998Nt6ZMmxj4re2jgOTlR0HNBqltqf6aLF7e0yT9pnI4X3Mswsg/nMrKaanGfN47OKe4iIobb5NpUw2DM4aGE/QmdRdXxSR0xukiX9bUMgQLcggQ+dBX7YE69tPduzNWqO6YmBvEKVTLhkHHKzMd85de5D18eTE/Tg1FUZs900fJz/fLzekWgjTNcvGl2EJjcupEGU6QFMIhxjGwxaZUvyxDDjJxB9b4md9RotjIKP0wK6Bkk+yIz/YHLDAE625ffzeCopsiwV/IpyNdPuUtAl/tI0X4JRYsak01Pa2NWbLPBL3EbAWmLF5XPIlySYdL5ulnzR6y8Uxo2vXPMTkFDOdI3MwS5L5KisUUGlEFopIpUqPyaCzHlb4BngHhPcMi17ZWDygisoHyNNLB0ay/z/0RDra7cXvRTDfee05uynZib5ppH/dbJqFGJDax4FJXjMfvQt7xj/1rojO09odtyLj5RW56r7BSrWr4KxppiwAwdnngm66Wb7D9qi9F1C52qPz6bs0SOb0oE6KN7RzSrHmYPywKyUA29e8DfpwIMJ4hSzgFWDTkKkmpp3HQFMWbrBpdDM9i0k7S5uxwuNbFXtxyhSHereRRue0Y0snb1zzuOQnbLvmBQUffgDJhNv6k8elZbkNYWl00DNk308Ews6bK4xs5wx25KqjhLUC+nElmiZFZgJoL0f4+QLASq/U/g38zVo6EeW00pVE/pBWfxahYpoondWG8qezGxHLdbqgaW0kDkI9D1oPrqwAIZMplBj/ysMxLXN1ew+gSh6iuFy1HF1qLtRk/EQYjQGZ976ydGsj2BE+PoYp1QUYy26CB+FQO5kKqorH2nuM+iOtBGsrKBwOYjZr5EOXNVv2z8gU9J5ImXQGL5InopoXUeEG7X2+uXMD1HsE1Jke9rQGOvR7sTM3K9Q6G5gh8qQbZLdV14X7A/7skt2aRdJJKJFiSByMUgFJ3m7r8EVjaeLLfGfT7evwnQyVDQdTLf/NuCP1eBt0tdVj8zjOCMbpLhNd2JaKhhCqK3tdAU+jM3Jte+tGg6Hcgv1m2t1IdSOCb5WmAwV/5eB13KP6lU7Qdvt9vDCK4L3Dz66Pnjsrtty420g== 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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, QemuOpts *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 === Testing invalid option combinations === -can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-cache-size may not be set the same time +can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-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-size can't open device TEST_DIR/t.IMGFMT: refcount-cache-size may not exceed cache-size -can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-cache-size may not be set the same time +can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-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 of two between 512 and the cluster size (65536) can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536) can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of 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 === Try setting some invalid values === 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 same time l2-cache-size may not exceed cache-size refcount-cache-size may not exceed cache-size L2 cache size too big