From patchwork Tue Jul 24 22:17:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leonid Bloch X-Patchwork-Id: 10543253 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 4B12A14BC for ; Tue, 24 Jul 2018 22:20:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3D15A2959E for ; Tue, 24 Jul 2018 22:20:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 30FD0295CB; Tue, 24 Jul 2018 22:20:35 +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=-2.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,MAILING_LIST_MULTI,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 D81A22959E for ; Tue, 24 Jul 2018 22:20:14 +0000 (UTC) Received: from localhost ([::1]:42801 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fi5f2-00083L-0v for patchwork-qemu-devel@patchwork.kernel.org; Tue, 24 Jul 2018 18:20:04 -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 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; 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 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: None (protection.outlook.com: janustech.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR07MB2612; 23:85HCVvmMpRuUG4q3xuD3nBtEBbH7VhcQt/4B6qDQ7?= j5f8vqYsKoexr77F/y/OrB5ogpw7/n88dN+Uhult0cfOJzxwN2D2a8kkjjLqBt0F2BqV1X4XWfv5mMGtsxh7pDRuKsNFYwFTk86245hhZ8QmvIY4Av3LGP2QgXjLXCe0QvQAviZW7jk/skFK78LoW0gH8XSWlrZSFbSGrO7kfpkLYVsxqT+6S0I5whwL3ZcUSVXXncwcsB1V38AcnsDUZFshMat6SLUqusZ3Q8HmNFtbnn6vEPtf3DKd/bNtSEY8m5I2DPqhlHdPn5MUI5Pnd2o81NEjI0gmlw1hFymQqxBrjK5n+IArj4WM8uzKPQEnXXrm7lvJPFAjbLoCpPGfT0J9MOmN7AWHNf/T9v/yKW2ahpATXeUvJZeSBjm5pr/O09BCaxK9CT2ZIi+R1p7mtdaxHo8HzSTuNtTBU7gm/cN2aCMtSaf4FF9GO0vO/9Ey/Y+5ycK/pJAwndHw5Jm+V/8nSf7yF5bzxRMNUaGL8vFizXAz/WxGLSGcYlUEj1z6fNNGLj2wwkMfzAK6qNJxI6THkxdDKTkLJsquon6bnKp3qHeJUxz/Z6WzeeuLkH2y6EzLTPeTOsDEN62c66mHsIJZ2N6JSRn30FmuRNFC8/QIXgPV7Pdh7FB38sE4VtzGtQG8JW4JwRraltWVOMb/9Jxo9xSra5yft8ev4h7NMcdj/87BvWTXIGmJVbbujwx8u83bDAeOypqpgLhySrOLOD07x9seGS+2fYMLewfoUXW40YZGwPe5sUE3m0oMpoaVnMuHafLghlB4tQbiR93WybnUH/OdBwJFPmH8w8aHa9DwFliFKN9PlXihM3w8VnEDH9xZG+bLP6C9JckIE+bLUZgL/DhzWqmZ5lc6NTvj1ZvRWLX4gJfIBj9pwDoRuA0NgGePt+ggB4unzVz8M9NHiV9kjxZHSbzPNeiLHdasI5s1iba4xfSm8hw3iu01J0rcKnUparepdsAM+45YcabTzwzB/pYyFpbaUYbG/DMaRMhZqrq5E9PsWEFI3ob8QsCNXpay3BfPSp1sw6+shb8jie+31oCRI92wXJU3GP9TiY4JQS30mYz/OjC2D5n3wGf3MPkniZiRuQLuCsUJ9LEMYaMqQ88XaK0zm/DnkAr+rkSKhdAM1MJyY0WU0rXrJAntPVgxnVTemMLZLiCuF/+Fce1A2mFo36wkmhUAo0m53S+TOxPghe0Y8KH+NMkGNR/OnWuT5JEs6v3X6qyG1nRddmam62F0JO9ACXDn1UqN3TZGw== 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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, 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..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 === 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 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