From nobody Wed Nov 5 05:08:44 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 1532462784926297.25922478934183; Tue, 24 Jul 2018 13:06:24 -0700 (PDT) Received: from localhost ([::1]:42421 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fi3ZW-0000KZ-JX for importer@patchew.org; Tue, 24 Jul 2018 16:06:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45936) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fi3Xa-0006vP-Sz for qemu-devel@nongnu.org; Tue, 24 Jul 2018 16:04:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fi3XY-0007eH-4j for qemu-devel@nongnu.org; Tue, 24 Jul 2018 16:04:14 -0400 Received: from mail-eopbgr730108.outbound.protection.outlook.com ([40.107.73.108]:30688 helo=NAM05-DM3-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 1fi3XX-0007bt-Te; Tue, 24 Jul 2018 16:04:12 -0400 Received: from Jupiter.local (141.226.29.227) by BN3PR07MB2611.namprd07.prod.outlook.com (2a01:111:e400:c5f0::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.973.21; Tue, 24 Jul 2018 20:04:09 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=janustech.onmicrosoft.com; s=selector1-janustech-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fDbANzQNRT48QJOXrc6SiJTrWmBamxj5GpKbHgOllAk=; b=HrQHNhmR4rI5rwpI9DZ7/PetKBGHwBfJhW0elFzT10uj3FSuby4NKjBMyvOD+sVqutfYJlUe/2TNh38w9g5YG3MqyVpEoby4Zp2Lnna149TpZFwUDTfsV7Vrc5ScINSyJLTdN7xoHdRVnGeJYW4egKkkaK7uBQHbrhyaf/UII+M= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=lbloch@janustech.com; From: Leonid Bloch To: qemu-devel@nongnu.org Date: Tue, 24 Jul 2018 23:03:39 +0300 Message-Id: <20180724200343.13733-2-lbloch@janustech.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180724200343.13733-1-lbloch@janustech.com> References: <20180724200343.13733-1-lbloch@janustech.com> MIME-Version: 1.0 X-Originating-IP: [141.226.29.227] X-ClientProxiedBy: AM4PR0101CA0066.eurprd01.prod.exchangelabs.com (2603:10a6:200:41::34) To BN3PR07MB2611.namprd07.prod.outlook.com (2a01:111:e400:c5f0::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e3f13b65-8d92-4f9e-9e20-08d5f1a09efe 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:BN3PR07MB2611; X-Microsoft-Exchange-Diagnostics: 1; BN3PR07MB2611; 3:r4C6rvMMjQi8f8L7F0pKVWE079YXygiWX94W1UDlYAY9ZPDxRUSbnFhQtC6fwYjsUnudEx6f0D0ACQgT47eh5ZF6eFQsZihrsuPjgPd4iHz9YJfNkMkvvXOq8D8K45iD/sVogDyHm80Kb5oWI8LWe4J/5DwG42mig1thn8upCIcj0m63aQS20lyrdqHxwUL+TvS+PRqmvf6UX5tMM2g2+d2/tjZIGZEJCX2l4SfZ46iIAO7by5A4MPGeZjhkYxTQ; 25:wafn5tGyN3EA5H6TF4hqyyx3+/CWWiM27goNW+LfIb6MralB+C6x1jhEIbBwZ3h2dUL5pYnuAa/0vYTeeVvmH+myWK89LsSArcdMkF6I4d+S/tVAHXOpgtg/LSjNT0B+9rKg5mGxGzNnnaCvkm4aW4b5eY6RHOJe8tWxc8/Hj1bcOZVev2Y3SYWxKIxzffFS5YAK4ibfZQEfZaZY15MM/9DXnFzaxl7UMIm764On+5npSBw5CGeFBizUrmcKS9f0gieTe30GVdAIu9OvUyHYyAFs8+o74+9nKutQSj3UyVFp1EpEgZ+ED37lfUYjmdfqVqxJpQMPGbDWUbftv6REmQ==; 31:vrZqDMGRQNOEGclu02u1e6GLD+0IigCjZxW8db0X19R94ka2CWRDCB6M94vVhh/jevmAqgTwb0KE3yw6QfZg0fksvtZ+0DLKsVDgQ9jn2H/gT0+NM3xEQBBBNu0aEKIuuY47W5oJ/StHr2KZPDRiTSeHuyeprNE6xAEUdeVMQQUennXTtqCE8ysrfMDLNBrCLRPz7Q2Miopc5euYDBhugab3xz8S0i4K6VBx75AYguU= X-MS-TrafficTypeDiagnostic: BN3PR07MB2611: 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)(10201501046)(93006095)(93001095)(3231311)(944501410)(52105095)(3002001)(149027)(150027)(6041310)(20161123562045)(20161123558120)(20161123564045)(20161123560045)(2016111802025)(6072148)(6043046)(201708071742011)(7699016); SRVR:BN3PR07MB2611; BCL:0; PCL:0; RULEID:; SRVR:BN3PR07MB2611; X-Microsoft-Exchange-Diagnostics: 1; BN3PR07MB2611; 4:MVQ5E6scMufzDkPAKvly/H9DB/yZa56ftDuPVsDxfkcwV10oH9lPSRg032lW/kWF24CIa0MFIr28bAEc+n3lBq0URIqO7brbxXXRnasvOadekcmCz+qDBAGmXtLWuMTdy1tWSlkrZihQmRotjnj8kbJPL1HS5683Faw/O8rQ648R2OUZD9m8H5B4ew9y6XJQ7pEqJyhsCvOUZuEN54VUo9WkTBMZQO5WZBTAaLLt59JuJJch57oNhCKpiVDRXB2T0qjN50upYjfgnssxlQzivg== X-Forefront-PRVS: 0743E8D0A6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(346002)(366004)(376002)(39830400003)(136003)(396003)(189003)(199004)(486006)(2351001)(50466002)(48376002)(6486002)(107886003)(6512007)(4326008)(53936002)(25786009)(476003)(956004)(11346002)(2616005)(68736007)(6666003)(5660300001)(16526019)(105586002)(446003)(106356001)(97736004)(2906002)(305945005)(386003)(6506007)(76176011)(36756003)(8676002)(81166006)(81156014)(26005)(316002)(478600001)(52116002)(51416003)(1076002)(54906003)(50226002)(8936002)(47776003)(6916009)(3846002)(2361001)(6116002)(186003)(7736002)(86362001)(16586007)(14444005)(66066001); DIR:OUT; SFP:1102; SCL:1; SRVR:BN3PR07MB2611; 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; BN3PR07MB2611; 23:A77hh0T9+2g/S4E/50h4jxD/e1hPuzg9Qcx6aEK3a?= =?us-ascii?Q?23os0kba8P0VBCymXk6oxhLWyGnweKHb0gwVzqpXR48EtR05lN0pSWnnE5nI?= =?us-ascii?Q?RO19sunFvwNOrkN8Ca/HyEValpe8OYlwL6qhuXLSE0qjGSe7LgxtxEUlNCSw?= =?us-ascii?Q?lckocjRDeg91uv/3QF+rpznk+xaGQ/ADf0m2Xi5D/AM3hsBlzoctpaoxNEsT?= =?us-ascii?Q?fjkLannAzgr/Czuyju6yA5Se6MS8aA5pzwjQPY/DIuPqpzC2uC+gDlwoZOUu?= =?us-ascii?Q?RM18dahhsEGV5ZFT8ijLiRF+PBu7GUu0dZ+zTQ4RtUcffTi9BVDL4XC1DIux?= =?us-ascii?Q?lUsnV9VD/qxAlQvNb3pgDyNwvWhFcCxqAaIAx+Onk8XF/7CUDxw5Bx8fDhFb?= =?us-ascii?Q?3EHgoFHsgGU63NMbObvHiA7CV8muTWxmCEARebf2US0c1B8jrpd2UtwVSTAc?= =?us-ascii?Q?LNd03+MLtwNu2cKopiRfxJ3wxYPd/07H36USS6smeIKjeAKlE5ap0a7nad25?= =?us-ascii?Q?sOKfXCSbMX+iesDIhSehwj0+BsTQmp1svp/gmGtu2GgqZmjebw5MBCQ9ziUq?= =?us-ascii?Q?hhvmHc0Iq/Z5vHNLoQzIOkxY0Yzaa2wNWB6olvRe/HP2mhCeEcFKFPC0oVeK?= =?us-ascii?Q?hMCf4EiZEwKCwd6rP2zfEgR0vrgjZ30g27WIJbzL5+B4wiN/lZV+THd7ufec?= =?us-ascii?Q?XzzFeCGwfJF+sw+YjkuoJirXl/cGinaDSdA2Z+BPTeIr8bOXLyjyjaLREZe3?= =?us-ascii?Q?kXE2yLZ6Wtg9J3ZMrf55v3ghEqkq/vU+erESnPN1ZpbNfvw7gCRQHkamOz/O?= =?us-ascii?Q?7YrqWPi1imMkz3e3pjtGXqq68p75sm4sFIofEnVGvcynhQjjnsbPLyx18fZN?= =?us-ascii?Q?DpNxVhGBlD3n/qx9+tAtUDGt0aquQcg9n0jvLAl8fqdnlXVHgjUJukytQsbD?= =?us-ascii?Q?zSKSXeTmpVFRGaJ2EXsWAXCB8vO23RXRHUY6A1lj/wxJJCvwQdshiIA/XGOK?= =?us-ascii?Q?R89qTViBdR77Izl/P+prTo5hBdM3VfYsyQKsWV7t9YzBPqVRS0sg2sXJxqc9?= =?us-ascii?Q?76t7iFqjMO4ovo6wxFGn/SI//bYPPbja8i6SXW5jaJ7+PZpAh4yH0lZTuf8d?= =?us-ascii?Q?dUWX4hGehyT/pO9THku1GfTJQuy0wLxNX+v/1x82ywYZ7g2hwcUOLVOQ3REV?= =?us-ascii?Q?b5aV2B0wrtVgZpdvH+I2g6amU+0hdJq9XMSez50WUUmsOiZWu37ARc04VaJ1?= =?us-ascii?Q?vuO/YO8m0NVY55ZJmQ7W7S7Q7i7QXxfQDflUY2xzqctwq534arfPiWexrmKE?= =?us-ascii?B?Zz09?= X-Microsoft-Antispam-Message-Info: uO1XVi+V5dI7em84QN2J0XZEd0bcXqFV0I3wbc7qC0WnNCeFNuK4ffdl0yb/dLdDWwpt77hZ79NrI6rO6aBudXkbx/g9Uj20WKVKQE/EGZeIovq9YSjsnTv0Ub2gsUXwUutJ/JN+HT6qbJgx42KFO1si3xxqhe1E8+Ar5gzo4SyYx2sl4KHFwllaQ32dK4SRc6vraFK3hi3CQSAUY+rKDzSJuUYlKSjkzqumpxil6aIDc1OVXo0czejdWI5Wp+xb/9EhASvutpYwCF1hKVkbzL+Wn1fC5HZoG5Qojs6Y4fCRQMZe/phE/6KoVfBbf70Xu2fHAYd1LVMDWtn74rO+W5/9lA8W29kRAoOeoCJjIic= X-Microsoft-Exchange-Diagnostics: 1; BN3PR07MB2611; 6:HxTImny5HigIrAR/ApDC7DkOIqJl6oCLr8v6N1GfJr0BPyVu4u+FWp7aheR4/UsGpXk63ekdQK4m3t7A/47/YFT161oK6iP3O9Gz/eLVTC75RNfojq8hLgJVa5WcHeMIeSrTIGmagdPlNRgn6RJ7HKbScDpRwsULGvIKDMl/hW3Tb6HnBpyxbQ6mt3ABCVluDM+3l5qyf+RoXEwOIRd6lqSyYlkX7cc2UWibfwDy21y9KLhS+3Ugcc3MKGqEcigHa1F+leAxjXz5e6Wbv5kXj7P0yQACPoXGXkexDNBp1J6W8wX5owVZnz7ARdws64p5xmOZb3a09sC7FUGLyXbB9NnMVKLgTq98sEx6Y4pxUVHyMRUQIYpezH4CKlwSxUtLJF+Pb1qO8R2p1xXO233+W0vxJkvlkVWfu89AHm5lHuO9yGEJOXcFShsPNTYO4X8FYYf2n9JLok3lPhVl1Yo/dw==; 5:Aa+/1TiMDwUZ1Z+wBukAMsVoYjzAmmjbN326i0IzvtsVRIwIONnJ5bOKQNy4jxjBmy6QFK/itk7R5KoHth1PuLqAACSi9E7U3OluNBb7dRCHXYpGt4U5VCs8Gmug40pO9NFJs+tUA3KfFxhyiCYl3l1Qt0Gl+HikJuhWRrwfL7E=; 7:YIVP0uaXnuPkna//c1Z08/OwgauESR/4XsTjlWDemeQW0pmOiokb/+TgakPlAy1gLYPOgMPXDa/3K+GPnkxpsPrggJUexQfHNPPRctQk3Sd4wBAUhKOIP0wc9cVgn5MD1K1SrWOiFd+9A3UXbfCqH8yrXmaIFAJJ1IXfp5vlnfsesUzsZp9cL0t3q5XOG8RpiBoQWcGTJ6I8On0uh7C/oXX4nXwcostF7V79Si3R1vqyn8HxVrjSQ4wwT8CINh+z SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: janustech.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jul 2018 20:04:09.1277 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e3f13b65-8d92-4f9e-9e20-08d5f1a09efe X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 34eb020e-3cf3-43a1-afeb-f5cf1310628e X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR07MB2611 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.73.108 Subject: [Qemu-devel] [PATCH v3 1/5 for-3.0] A grammar fix 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: Eric Blake --- block/qcow2.c | 2 +- tests/qemu-iotests/103.out | 2 +- tests/qemu-iotests/137.out | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 6162ed8be2..ec9e6238a0 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -797,7 +797,7 @@ static void read_cache_sizes(BlockDriverState *bs, Qemu= Opts *opts, if (l2_cache_size_set && refcount_cache_size_set) { error_setg(errp, QCOW2_OPT_CACHE_SIZE ", " QCOW2_OPT_L2_CACHE_= SIZE " and " QCOW2_OPT_REFCOUNT_CACHE_SIZE " may not be = set " - "the same time"); + "at the same time"); return; } else if (*l2_cache_size > combined_cache_size) { error_setg(errp, QCOW2_OPT_L2_CACHE_SIZE " may not exceed " diff --git a/tests/qemu-iotests/103.out b/tests/qemu-iotests/103.out index bd45d3875a..ab56f03a00 100644 --- a/tests/qemu-iotests/103.out +++ b/tests/qemu-iotests/103.out @@ -5,7 +5,7 @@ wrote 65536/65536 bytes at offset 0 =20 =3D=3D=3D Testing invalid option combinations =3D=3D=3D =20 -can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcoun= t-cache-size may not be set the same time +can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcoun= t-cache-size may not be set at the same time can't open device TEST_DIR/t.IMGFMT: l2-cache-size may not exceed cache-si= ze can't open device TEST_DIR/t.IMGFMT: refcount-cache-size may not exceed ca= che-size can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcoun= t-cache-size may not be set the same time diff --git a/tests/qemu-iotests/137.out b/tests/qemu-iotests/137.out index 96724a6c33..6a2ffc71fd 100644 --- a/tests/qemu-iotests/137.out +++ b/tests/qemu-iotests/137.out @@ -16,7 +16,7 @@ read 33554432/33554432 bytes at offset 0 =3D=3D=3D Try setting some invalid values =3D=3D=3D =20 Parameter 'lazy-refcounts' expects 'on' or 'off' -cache-size, l2-cache-size and refcount-cache-size may not be set the same = time +cache-size, l2-cache-size and refcount-cache-size may not be set at the sa= me time l2-cache-size may not exceed cache-size refcount-cache-size may not exceed cache-size L2 cache size too big --=20 2.14.1