From patchwork Sun Jul 29 21:27:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leonid Bloch X-Patchwork-Id: 10548309 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 7B5BB14BC for ; Sun, 29 Jul 2018 21:30:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6D9C029B2B for ; Sun, 29 Jul 2018 21:30:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 616E129B2E; Sun, 29 Jul 2018 21:30:16 +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 DCB2F29B2B for ; Sun, 29 Jul 2018 21:30:15 +0000 (UTC) Received: from localhost ([::1]:49679 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fjtGZ-0003sC-2S for patchwork-qemu-devel@patchwork.kernel.org; Sun, 29 Jul 2018 17:30:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33896) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fjtF2-00020r-9Y for qemu-devel@nongnu.org; Sun, 29 Jul 2018 17:28:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fjtEz-0000Wj-CW for qemu-devel@nongnu.org; Sun, 29 Jul 2018 17:28:40 -0400 Received: from mail-sn1nam02on0111.outbound.protection.outlook.com ([104.47.36.111]:45370 helo=NAM02-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 1fjtEz-0000W0-5l; Sun, 29 Jul 2018 17:28: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=l1XJ8oOcOtd42pXjU588QT5zDI6hHI/yjs/1HTS5vAA=; b=O7ruJEPUAIWZdz/Sq8cnDU3ftKHmQNrkppJR6/84T2ybN4ipUF2v9llYg5gMNs6PZuMuZ6vyGBOzhH9hjrlKkEnmDUDUj2qIyqcFSZ7VEKTJngaGDuAa9nVj1ZLCF++BHnrK6aYMXY2/4REA6ouc+pxyG/Ss0sHWhdozsY5EBBA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=lbloch@janustech.com; Received: from Jupiter.local (141.226.29.227) by CY1PR07MB2617.namprd07.prod.outlook.com (2a01:111:e400:c637::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.995.19; Sun, 29 Jul 2018 21:28:22 +0000 From: Leonid Bloch To: qemu-devel@nongnu.org Date: Mon, 30 Jul 2018 00:27:40 +0300 Message-Id: <20180729212744.23709-3-lbloch@janustech.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180729212744.23709-1-lbloch@janustech.com> References: <20180729212744.23709-1-lbloch@janustech.com> MIME-Version: 1.0 X-Originating-IP: [141.226.29.227] X-ClientProxiedBy: HE1PR06CA0138.eurprd06.prod.outlook.com (2603:10a6:7:16::25) To CY1PR07MB2617.namprd07.prod.outlook.com (2a01:111:e400:c637::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 85754f54-e5a1-4735-8590-08d5f59a373f X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(7021125)(8989117)(5600074)(711020)(4534165)(7022125)(4603075)(4627221)(201702281549075)(8990107)(7048125)(7024125)(7027125)(7028125)(7023125)(2017052603328)(7153060)(7193020); SRVR:CY1PR07MB2617; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2617; 3:psWy+/88Moq2uDdy1b5U+s4LLWiwd9nsbMsm1/rJAIy1cWophFifa2WB6bD79Oq41xqFBkzBQL5pTH4wRFXY6THAYY+hIbxSqYJWiDb/uldapxzrwhxWJwchqYcPIgwhbnJIYkm+1vUqZfoXPDGcB08/QzFL8ZRNuqTBXKGJU+cj4gM1ZKzsXdZdpL50It2nCB7u4BEJysQxi8GBmG5uAMPkK1xOuzUX3QUhcrcDU9wivu5fh3YZlaJMNgPKqoqL; 25:Exk4nRkkaLD8GiZY3+fpK1HOpWSGiY17SnxrYqfMUL89QCZvbqAkmK441RL8vB2xe9a1tTYGBpt7Il7F0pbqZjvRmHQSNASBQd+a0e7sDO2dcPSkvZcJqLL/kGhHCvZWyLzNr86cOxdBvwh5awoN35DyvvDR2TCg7aVyH3cP4FsJRGk168Kgdo3FzMZTSjFY9elj/rtQrV+ElMDp1WbT6YeVReAGFGi9wRf8opOlP6u3M6vxO3uTHL76AH6UcJZTygAk/KMszq2iJOo/VR3qHhMC0GYAGnnuJ2nJMG/j5gXRFLu4PjBzK+SBuSog2KM2biRIKLbeeLhCZ27MCve/nA==; 31:voPDHy5a+PwmLpW2D7kVOahKBCt4OlazYMzrkyCQIxs2WKjlIBzO2/bazVBaV1UEmEGCYDdKYSJ+VsXwwEpQzKLoUJa+j9lgT6E9NSyxDPXWh4uhCn3Og6Cns1KaaI5SeOfd47HmlJx45RG61iS+AOKz2hCW3aa+ZCrp+5/ayr2atFaSXUcKAwszBmuu3IU2ZK2IybubB79TwMw1Nf6qOqNt4p6bxMRIn8iUsoLdzzI= X-MS-TrafficTypeDiagnostic: CY1PR07MB2617: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231311)(944501410)(52105095)(3002001)(10201501046)(149027)(150027)(6041310)(2016111802025)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(6072148)(6043046)(201708071742011)(7699016); SRVR:CY1PR07MB2617; BCL:0; PCL:0; RULEID:; SRVR:CY1PR07MB2617; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2617; 4:T3zp8bR31JYPYFnO5wFT5oStanXB3kIN3iHa/Q+QySCrr9oZq23MiT3bwyw9Sz7J+drFeQ2h2o3n1J9+H5DMFYy6rsTE+jwoAXTXR9z5Yfwd8l+I97O+W3zifb+Fw/E5Ahfv8h5Ly5HOJc6utWjb80cYiens8oco4Xtaxp76cg6jcxhmhiP4t5otA5jEreeO52xO9Yx8EnMV6Cr13RfIx40/QhdT7dv++LMThfTBF95NOV6u1nah22v66bVJmDYXMccXxyuioJepD9/wnd1Q7A== X-Forefront-PRVS: 0748FF9A04 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(136003)(39830400003)(366004)(346002)(376002)(396003)(199004)(189003)(3846002)(6116002)(4326008)(53936002)(51416003)(316002)(107886003)(52116002)(14444005)(26005)(486006)(81156014)(81166006)(8936002)(956004)(8676002)(16526019)(7736002)(186003)(6486002)(105586002)(476003)(305945005)(2616005)(6512007)(25786009)(478600001)(16586007)(66066001)(68736007)(47776003)(11346002)(54906003)(2906002)(2351001)(36756003)(106356001)(1076002)(76176011)(50466002)(5660300001)(6666003)(6506007)(446003)(386003)(2361001)(48376002)(97736004)(50226002)(6916009)(86362001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR07MB2617; 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; CY1PR07MB2617; 23:trZ4fC/RejUWxMimg/uHB6IJPglq4pZLOKaszKL8L?= VlKk6Ph0+lBBzXTF0iKydDhuha/osWQ5pVlJHdF4MDc4ikWzMKwvzLvh6Q6g9//iLAEubSK0y9gXNlhWkMKTFnKc6dD2Zq1TF0lx1XUf7uvKPZy1N9T2ccoLe04yFXZArAAU5yX7wYk0hWqhEJLRc+YJJdEHhheos1eJshXb+Ww1jyudsCU1HBReXvOKM5Y26XsHQUqp8RMB2msK11HehNjSpZtrKdpGBkeezFO7tU2lNZ7D45zvabL7pAqD47Vqb//L958CJfbtUfDGN6EnIqbEuSwi9NW0/liBDJoceR+52s7Cv84X8jATyP0pID5WbdEWIVtYmJaunSu9JjqrmoZa6bBYujZvfgKtTHOtSB3mKjcemXTs+jaCYsVsUZXtU/ImyyVWSkqPPtZ7p9o71T0PR3pTL8skF94lS7GxD1U1N3Dhfgar9FecIHwhl8y7mAlSyzjg5RHwLJvZ/yhAZzfm8xKCIF8jT6ebVHexEYWBIMnxMl4vCaBJ37laV+I9mPcN6Zc9q24eg1CjBzXRiEcH69XjlKFA2C6+fDUFtHAag5UDsFoIIpqdtyqzbkonfPCKRrIQjpoGdZGcYTqa9YbrHR6Bm6hNLBwzM+RKRdyWDVIjSBl0PWiRbb6AYu9feKGY2QDUbJlW4min/+kpDmNaNsjKYIgsSSvbKU9GoA13gymxeNNypFIkp5b0ziJz2Qo2nApJDAtCRlUbnvd5e58PWRISl38EkerEC1lGEjjOHzqQRQDSp3TBouzsXARHcDIoSZnDav1Ja48fuSkcQEwoloQfYrFyADazsl5XxC1W+VYGlsZoqpcoe7T42BgsggvniH6bpvVaCp2hamN3iwM26TN/wasCWhkvFuyh+LTiH9kDxa+9hrgJW1pz4T6ILNporQWChlYt5PNAqW+m+Pef+4lboPVGtcI2Fu9dzMILD/lUxxc9k0oPZvo0vRZyT7BICz6YHwZuMpr80nHHq6tZFHuFwyhYNO7Py9kw5W1vR3qe4E5Q8Q4FRsRycnlpwdNjA9AWYF02kIV4cafsNq/IeKhx31rjmiuEpI+iTAIEdt5LxCXc2Y/TA2VTZ57U/Y7IKkH4QXAMhYlnJBns4Nz7y2EBwRe5wojpc8KFb13Pbg3sFa86LmtI4BvxO4joV1OtQcayoY3qlhpUvRo1e/Gw2jkL/ZglWQjpKUh6CRCu3HcB1WUpuz53IUH/9D/w9DrNzZ7n6ltDDUGT2Vr8Y5Ge/OIZ5g3ZPxR6vfH/9Qz+Q== X-Microsoft-Antispam-Message-Info: HK3G41AEFE7fyr1WT50TkvOIktYvHbMzI2EHmQ6Qehaf1RHBgWj5YAKH6vcF0YAipMuyPpFg+bAyMMjOR6fvrMJF/51gpyf0HGqYVebgomgaoB/DGc11mEudwERBm02ZKWm7TmOgkhlvw/yhCpN7YkNOBo9HpyVgP9s670lXet4allUyQUDiwk0HzIbiVpH+r5DGNsv7j9nf6AhJDFKVx00S8onupgfeO3fEFfvxMF2Mr25OTvdMfTvbxW4HoZ+ey7dpCDBZH7xapKL6SY+OVm8vvOqYpwAjse60jjp4f/XDdNtfIxDEQjYE1MoCi8BLoBu7wFThx1vS9kYNiITTg2LIQ90LpzVZxOTUU4L20pw= X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2617; 6:MmesrTMyJngBfc95Ff3JTW6nKDfu8C1TNUHnSkK3t97XZMXUnWiAkB+MM6mVLAYBSvb9QgP4qPxYVd3Wf45MrSwxNIm3yD5lRusBCmtZgia7SWmGESp5Da+CZ0dahYMLDTNoeJRBhFHr/p/L1vDuPP15v6JiWTJRUh5mHcDGC2zu7VxUEsEfap+y2YSqJAibdbyc4cXLHrCnm5yEf8d/o9X2h5aWoKQ/QJgzVorwJVMaCARQmuSzH3IV9CxCkD+/bZPzvnkE15HP9UFe6ichoicESnki0392q0c0SVQ96nUBH4JAN8VOxtFuhOfd83LyHGMrYLDozwwvxhMlhhEuDtQMysiRaKMHykJ9mMFP8Z1Ks1cXdqTrUdSX7mpq31hMfme4XFr7/rv2XuDzmMwQETBuf04g5E6xAD0cVH0SVaay25fKsKYkMdvYjj3+kjMsZu3d713FTDtSIGw13PXqaA==; 5:EcR8AYZohPcLnBMkbdvOF5onvmq/h8NpBMDzYZ4PdjPmA684ao1Z1dzpZgTqMLMkV+w/j5lyE4riycr3wLAr6T2kPU9y7/IYDBMFjaS47m8Q30fdrMqLOeEFXG8mYK1JeiC20Pn1QQzh1R7W0NORLNnmyDu0tvH1kvyofyFShF4=; 7:F4pbjNrSlg+lndDm3rUm72GzyfUcXNTiKDkwu4JcStPh2BSnOJk1KomikAri9dwjexacB6ld4RqA6WVSco2pMVZTag4sZGU39OkCYJeA5hqdBZxUPbe8b8CvPaqUDCPoD8t8oovUZJyJsx6NiJ0mbQ3jI8gw+L2oYzkj/67NcwXjObNE83DFgOzBFGgSION1lS9WVDQrXCiqfog/BcgPW1iQTyTODSuoK6BcQUYJFPLgRvZj0nLtqG2ZN7LKVlFO SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: janustech.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jul 2018 21:28:22.3456 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 85754f54-e5a1-4735-8590-08d5f59a373f X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 34eb020e-3cf3-43a1-afeb-f5cf1310628e X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR07MB2617 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.36.111 Subject: [Qemu-devel] [PATCH 2/6 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 | 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