From patchwork Fri Aug 10 06:26:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leonid Bloch X-Patchwork-Id: 955981 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=janustech.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=janustech.onmicrosoft.com header.i=@janustech.onmicrosoft.com header.b="NbrYvzwt"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41mwKk6Vbdz9s7Q for ; Fri, 10 Aug 2018 16:32:58 +1000 (AEST) Received: from localhost ([::1]:54567 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fo0ym-0002PP-Ft for incoming@patchwork.ozlabs.org; Fri, 10 Aug 2018 02:32:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49419) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fo0tX-0006qM-Cv for qemu-devel@nongnu.org; Fri, 10 Aug 2018 02:27:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fo0tU-0001f7-NV for qemu-devel@nongnu.org; Fri, 10 Aug 2018 02:27:31 -0400 Received: from mail-by2nam01on0132.outbound.protection.outlook.com ([104.47.34.132]:8112 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 1fo0tU-0001eI-D4; Fri, 10 Aug 2018 02:27:28 -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=jJq5fujT0HImhcnteGakFqD+Ca6zFnpOqW8H7nFA5y8=; b=NbrYvzwt6T6+rdB7G6CUT4zWK7rAu+0KxR8FbBBuw1vR7w6eiwPQmQiB/DztG/3oFW7eLS4axLL7rjbv12i4vqOHJkEpHN9DIbABPmk/h6VRfkM/ajClIHjrZMaNgdeCKORQEQBGMWAVn2grJy2OQ67erNtzH9yM4+0Ykk70vkM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=lbloch@janustech.com; Received: from Jupiter.local (141.226.29.227) by SN2PR07MB2623.namprd07.prod.outlook.com (2603:10b6:804:8::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1038.21; Fri, 10 Aug 2018 06:27:24 +0000 From: Leonid Bloch To: qemu-devel@nongnu.org Date: Fri, 10 Aug 2018 09:26:42 +0300 Message-Id: <20180810062647.23211-5-lbloch@janustech.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180810062647.23211-1-lbloch@janustech.com> References: <20180810062647.23211-1-lbloch@janustech.com> MIME-Version: 1.0 X-Originating-IP: [141.226.29.227] X-ClientProxiedBy: HE1PR05CA0232.eurprd05.prod.outlook.com (2603:10a6:3:fa::32) To SN2PR07MB2623.namprd07.prod.outlook.com (2603:10b6:804:8::7) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 26b4184e-95bd-4d08-031b-08d5fe8a573a X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(7021125)(8989117)(4534165)(7022125)(4603075)(4627221)(201702281549075)(8990107)(7048125)(7024125)(7027125)(7028125)(7023125)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:SN2PR07MB2623; X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB2623; 3:xS0X5yNdvoLVkv9YmKFcJgA6wsNsiOH2cNvr8Hh9QZAFTtHA/bcgp2zVbnMwlyqglfbZBpOj0/BPooC2UofLk5kvQ7cdoIfVcanzMJqS9zEbqmfhMMT6guChXp0ZeLZaQOcu/mYY0LXFsmO5GjyQm9PpzlFFfDjyemjmhRxFUjIa0Z+O/ot3lpg10mEAjkgcONk5PuiPlvDH7VvDn5wtJpEl5pFdU58bHywDOSGvy+GebFCmX6qne1PMk1QprM0D; 25:U3iMq79jpxmDUX1LaBww1TM1lv44/4Vi7VHM781g9K4M0eCAaOJH34ex29qFGYFwch+Aq1HHKgaNKr3aVfPD1EzlYfkGHlfqdcPbeXDTlANiJ+cSHVLzaKF2zFz0cs06p0mYua3B94mxlOdQw+TLbicGzt78FRHJYpOWynwUvvk3/+BsbwDqfrBYIKp6nJdYPf6BkpAvQIvxZFfy/aly3yX5746x5t8qS6PLsA1BgjUc2XJmB4OYqoNyAGXcuxViP8CMUhm+34Jfvb0ApeUdJtxdrBX1Mt1OWZ5SdaaWZ4Zn4SoCBVbs1hfc3PuhlSpfw+VXlHMm4w4+wcuIlIJ8Bg==; 31:fLdnpms6RebmomndogyMWT04j3jA8NpgaDmxoARjEGwH96V81QfjTJz10knxN/su4YNa0uDhRoqnurb34kyrvv7fg8hmkba5ou3JMXcNjWnCHv2i7nBcyEf5L281F6R0RgTIGrpfcEP9INqR+NgPb8/88mr/FEGOJ4EQvi7cguFMCVSBrLj+MLxOyRza9z1Bz/V5qMzSqnTJLllh7MQZF8cxpI2fdkcIb3843GFft74= X-MS-TrafficTypeDiagnostic: SN2PR07MB2623: 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)(3002001)(10201501046)(3231311)(944501410)(52105095)(93006095)(93001095)(149027)(150027)(6041310)(2016111802025)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(6043046)(6072148)(201708071742011)(7699016); SRVR:SN2PR07MB2623; BCL:0; PCL:0; RULEID:; SRVR:SN2PR07MB2623; X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB2623; 4:CUBa6EDGnmu+XAC2ze+yxPcSbzjI36aUwEfKCelVMmd2uM8R0TGOpFgpyl6nNRoGWqxx/dD8+aF4Oq/KdZyBDvdfEj121A9LLJcdg0azE9x4xPhrrQqm2V4I14BfLsS/6FHMFdubFnDhZGzX2XPxcJo9eXJJNsBPPD/2Fb0q90/xfLNcAgllrPps6b5hF9O6O78i7i6XeczLBoBM2KCZMG5GMAlNf3BsjoPx8QRYsKFjE7M3PnNgUbhqzpX8kS5vpZUyeJPTg7tLwAgWnv0Now== X-Forefront-PRVS: 07607ED19A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39840400004)(366004)(396003)(346002)(136003)(376002)(199004)(189003)(36756003)(2361001)(68736007)(47776003)(107886003)(105586002)(4326008)(5660300001)(186003)(106356001)(16586007)(2351001)(6506007)(316002)(26005)(76176011)(16526019)(86362001)(6916009)(54906003)(6666003)(386003)(25786009)(478600001)(11346002)(6116002)(8676002)(3846002)(81166006)(50466002)(2906002)(81156014)(2616005)(53936002)(51416003)(446003)(48376002)(6486002)(66066001)(486006)(7736002)(476003)(305945005)(52116002)(50226002)(97736004)(14444005)(1076002)(956004)(8936002)(6512007); DIR:OUT; SFP:1102; SCL:1; SRVR:SN2PR07MB2623; 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; SN2PR07MB2623; 23:IWGIFNh1jIky1oPxI3YifFalGC9GOCRcJTv9/9anQ?= MiQeEGcMlzuwzNtPGXiydHLfcF8dQonPEKTooq8bubI7QtFaTEcsKCmPUL9kL/nvI8wX54QRNKbBE25kAUcEZnUdPc6gGW6HJ4KpXN90H4dXvc4SbekdTS85tHxkWsBakk4WQVu9cki7jkGPn/IZZqWQ0w6xHY6LVAFV7nCnLko3D4waF8YQySpM4AM7dUqLGl4YcMcckfWXLo/kRIQYoUBNp7++WCckAybnr0BjRq0l3oq4NSuelo3syESSJHwLWI0SLhkjUcolKMwlX8qoiqn1iLeedPlI6rmtwsmmIgz/ikl9HfY1KeIDcG4+SmoP9JM3GrIc9EHEVvqKKjdNf50m+d61P2k1wGEX8wxyRhqYhRV53btdxFy/vrPrrvcbgJWCrIyULzc8EKONuL4fHj6ravg4LlCC4M+Z8/3I+/wD/14eJhFBVkCNFoL579CyAXGos+5Uz3EoQaR8qdP/fmX13H2BBSotby63kxbZIgfl5bsIp8pyPyFaqj/VnCCmRvW+P3+Uh2VzuS9mMkcDTBdnC/WKiEp/nfv/czHXdFvQq82HGjJY9gvXZaD+uyobiv+iWHGS1fBdusknE/k8ZDOZ5D1QvnPPjWHAgfEeZbVd0MUtld2s+WcbuROO58LDHQAbpmFpIU9hlYqqaHEk5qFOpFw+zhyNyaEEtJZGZ4ZJ7Mb0qLABrT93xHw9tR/y8/7djJxpw38ddyeZb9wITUJP9a1iq4przF29xnY3DGdYYggJnrOoqO4GtH24Ol/NCwoFMDqZBFTRvPSYEjWkiKHK72A3l9MQGGEm2OY77bxnGhvVsfP2ykEixu8z9Dl03uMk+5cRRV9GLYS0Bp+TaIqSy+iTkimf21aH8lCPCqnYH46WjUCFPqB4+n7RVbn0uruLoTZ1BO5HNX1Q1bOXXVf1vwGiMPXd8rCl+j3AvxneLLufpl6ypyvba0ZB/W6d87JzKOFLfcej95RHf2XiM0u/l4Qe2GTmbW95kUm3lcNPj22BmgCH9umpkhn0BdSPPfTLJU4Hv0ag27EacKzQ9Q1BuurA3zPIXKBLWQlyDDiNZVpkkzmf6RRs5H4eC1UDMfIdHM/fcLECsWh9PC0s84KquCPrLWYxhaOhRhx7XwLfw5/sdhbCIT3iArxJvhTOv23led+vxMPlKo8BtHumnI9QAtTmnjK1yr5XulVfSTRPl1lGlJ33c8m3Y9cnjrICzs4d8rMNdcOsNItmEi9SdfHsv/wIEWjDaQUXQrTHg0W6g== X-Microsoft-Antispam-Message-Info: szLuye+g7duiWVFPqBDEw59vG5BBdC+oDvKjIUDkktS4sticdfDvvEDuaam8kcvd3d58mA+s/gIyyuu85ET9Y8DAGBxD+LZpol1OuHpY8ltPcoJZ+1nZirOrTi8pD2wb9RICmQE0nV8sPcIReyma5WvO8mUfGF99Z3ehp0GBc02fJdeCO4gY22TKu2qzT1fAKlgyIUzdP9RZuNOm7Ra7NLe9n0dQhN4N1yrgNPwbcZ+9qCWUN+Jw8gD7xAouu1tl39YU18Q5V6dtw6MwjNraHue9IoV6OB6ru1blzJwM+7jaeFBogeY3HNXmEhoxjg7hyTPRUcCugxNV/SzKx5NAhs482D+/aQi335/2l2F2CSw= X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB2623; 6:NasFCAEhrdf3fkYNnJA2twVdp807xDodmCBUlZapGTNMi284hsd8ssWddFK0KeDd6/Xn5O0BMKs3U1z9k1OUwhhQLbSZcB+flR3qFL3EXVSd8gmbzRsUmpVvodYR8PGWPlKiOtb4PtIuhkvjQ/NXDVXaQ3maFX/fLJcMbe/gxcL5c9fXZ696CjXiVwQ+gDzbTKt7pj/kMdhnd6X4Gbk7pRKuNExjvMtDodAzzyNs5Fcg3SLqElv5oduHlNCbOrqzr6H9H5irR+HSdxbX3xVX9gYl+dDY/q+NqDmMHn6jM3+YmflihIwZeUI6VhNwJ2BhaBV47OPifL+/C4MDhlchLONdA5ajfw2BNz0uI0BGeSJbJfCmT0PqoPKnwQKBfbIiKfecbwOjI7c77HnEKJJI26+fTmwkmi2oOhGth2/G6G0x5XtnpjdOJfqOrXtizmk/tz6otvpHdrludR+rZzrwoA==; 5:gt49xogBS8qAk4JUeoEh+2TqfGFS+BHthH1Bo8QAEoufDqai0u1Uzrcn4iWS0MhH7DEfptnV+HTYdA4EPkF7lzjywGg/1L30kIe0GWY121BpfjBrqphyGw5tpM8Z3AMEiPNfDMxCZRQJulRH480ZQg1fi/P2DzFzFEkZiVnGgRU=; 7:JG27TJu2famX1Gsh5MN375atuW4jA8osS5qMdPFrDrQR8QuPYxyyWl6l5dvkK4cmsRjR8Hx0GNrqmeK8wdp1y9/kdX8OZj/SOF7VAyIldG+PNOFA/SGc2zqN0218ViC35AQVSnvBoK5z/iE1LqcAZ3FLTZ0VqkHs9ggSCxV+K40wz7x1V7qg+HqATZm77rcnMmPrUN9loJzq9S1P/sLa3zs3BLzbK/8vIjyRE4IiJlHRurh0oTV28CpWAWUr5X8o SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: janustech.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2018 06:27:24.2342 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 26b4184e-95bd-4d08-031b-08d5fe8a573a X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 34eb020e-3cf3-43a1-afeb-f5cf1310628e X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN2PR07MB2623 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.34.132 Subject: [Qemu-devel] [PATCH v7 4/9] qcow2: Avoid duplication in setting the refcount cache size 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 , Alberto Garcia , qemu-block@nongnu.org, Max Reitz , Leonid Bloch Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The refcount cache size does not need to be set to its minimum value in read_cache_sizes(), as it is set to at least its minimum value in qcow2_update_options_prepare(). Signed-off-by: Leonid Bloch --- block/qcow2.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 7a2d7a1d48..053242f94e 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -829,16 +829,13 @@ static void read_cache_sizes(BlockDriverState *bs, QemuOpts *opts, *l2_cache_size = combined_cache_size - *refcount_cache_size; } } - } else { - if (!l2_cache_size_set) { - *l2_cache_size = MAX(DEFAULT_L2_CACHE_SIZE, - (uint64_t)DEFAULT_L2_CACHE_CLUSTERS - * s->cluster_size); - } - if (!refcount_cache_size_set) { - *refcount_cache_size = min_refcount_cache; - } + } else if (!l2_cache_size_set) { + *l2_cache_size = MAX(DEFAULT_L2_CACHE_SIZE, + (uint64_t)DEFAULT_L2_CACHE_CLUSTERS + * s->cluster_size); } + /* If refcount-cache-size is not specified, it will be set to minimum + * in qcow2_update_options_prepare(). No need to set it here. */ if (*l2_cache_entry_size < (1 << MIN_CLUSTER_BITS) || *l2_cache_entry_size > s->cluster_size ||