Message ID | 20180813010729.4844-4-lbloch@janustech.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> 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=<UNKNOWN>) 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="auV6Fd4c"; 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 41pd1H13H6z9s7X for <incoming@patchwork.ozlabs.org>; Mon, 13 Aug 2018 11:09:37 +1000 (AEST) Received: from localhost ([::1]:36959 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1fp1MU-0007ft-7I for incoming@patchwork.ozlabs.org; Sun, 12 Aug 2018 21:09:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44551) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <lbloch@janustech.com>) id 1fp1Lj-0007fQ-1c for qemu-devel@nongnu.org; Sun, 12 Aug 2018 21:08:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <lbloch@janustech.com>) id 1fp1Lf-0001ip-Ug for qemu-devel@nongnu.org; Sun, 12 Aug 2018 21:08:46 -0400 Received: from mail-co1nam05on0729.outbound.protection.outlook.com ([2a01:111:f400:fe50::729]:24113 helo=NAM05-CO1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <lbloch@janustech.com>) id 1fp1Lf-0001hW-Mk; Sun, 12 Aug 2018 21:08:43 -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=uGSLkWKBjNggyPXIXPvoOaLTM4o2cNEEKa6kahOvxBM=; b=auV6Fd4cEeSBFlyffyDpn6BDdUp0LrR432BA13cP73YbLhbOdDXIjIxJCMvJaSyvH92J6b7zNeDDk0M0dU9rpL1qcrwaAck633qeIOzlAMapozvVeFwAUGP+2Dynzv69N1xtc8s5bubNV+GvF1P5TCn0ZKj+bet1g6BquwQeJQw= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=lbloch@janustech.com; Received: from Jupiter.local (141.226.29.227) by SN2PR07MB2621.namprd07.prod.outlook.com (2603:10b6:804:7::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1038.19; Mon, 13 Aug 2018 01:08:26 +0000 From: Leonid Bloch <lbloch@janustech.com> To: qemu-devel@nongnu.org Date: Mon, 13 Aug 2018 04:07:24 +0300 Message-Id: <20180813010729.4844-4-lbloch@janustech.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180813010729.4844-1-lbloch@janustech.com> References: <20180813010729.4844-1-lbloch@janustech.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [141.226.29.227] X-ClientProxiedBy: AM3PR07CA0120.eurprd07.prod.outlook.com (2603:10a6:207:7::30) To SN2PR07MB2621.namprd07.prod.outlook.com (2603:10b6:804:7::27) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a5e34ade-12fd-4705-baeb-08d600b94746 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:SN2PR07MB2621; X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB2621; 3:oYOCK9++6IjPfs47f8NOWGK9XG6neSZN02jXn8d9S7Qk3hQxtfea//MUafS8okygkHYIeG/oD2mixuaOb2W9T5Z94GLu//eQSujPvGh14WH3+K3RxzJvuWeT/w0GSejh4DTw892dxTz0kW4QNXHsBCFWI1YFKSWKUGRgJ2fAWeCt/n0dDUzNAAU9zcPrNqfNxPI4EyXptzrWg4wQZGUlSfKY2FRnPPbR3ZEmwpa5hWk93+k54XV9HMsAIV1QNgBg; 25:iEMLXoIQUbU7vy1uLImuMgYsj97rfdaweWl6dvdbFJ4P7X6ua3VGkf6qcsYlZCuKsPe+z6Vm8vLzYzRx0qrlB5i/1WfhFjVI0jxb1lq8fwb5PaLbD27EIApyZO5aiNvxPEw278MkFgho/R76+K4Z6u8vNPDyCVPSrZ4ACbYCqaaQ8K/i2k1Mg7aWQQ5Vw/QGA2sf7iL4TdnzyBE2sU0KD9krtYbjl/ErQZUvuGTBItXATjKSte9LBnklqj6VuTx79M4c47wKhyTKh8ZH6pQRclQrBe0WnR769qdsW0DXOvCRqom8qDSlVdwPCQZ5gAY5xaUItd+3AJqmbHYmwgLfvg==; 31:PghNR2qSVBbzIRi86EO7Bi33vNAd/OPJrnJtpykbQ6GTeHq5aGMRJdwPPB5axW1EIveT3LfPXSmOp3q1S+lZmweon4qR4nFKH0kwG2fI8bVYOOE7CfMZbsd5LyCoASIVMQneHD6vkHWlbG+d1f6Cm1WY7TaWmsB+MahIH8Etmyt+BUkUkvzMw3rTM54frxX4lnbZSvPPIkwvojMW+nkGqtdIiA67cGOa3h6I01m/alE= X-MS-TrafficTypeDiagnostic: SN2PR07MB2621: X-Microsoft-Antispam-PRVS: <SN2PR07MB2621EFC1C06089DF62074066CA390@SN2PR07MB2621.namprd07.prod.outlook.com> 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)(3231311)(944501410)(52105095)(3002001)(93006095)(93001095)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123562045)(2016111802025)(20161123560045)(6043046)(6072148)(201708071742011)(7699016); SRVR:SN2PR07MB2621; BCL:0; PCL:0; RULEID:; SRVR:SN2PR07MB2621; X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB2621; 4:zPduWU5vAs8EXDkpBcbuH7INZyTTC0+sjmZbvT3GroO2bWrPApYx49j5DkSksIge3c7sfHaE9RdamLWFTWjQhcq6Cn6ooj23jgu5EdqwG/aZ/b19TeD2wAEbHLr/J9qFy7ybbRa22POON841NGc68wg/PlKFb3g8iNwjhFzlkL6NcSmPnEnX0El3l06fW8SIBc4VB3eX0yXnI2R+bBlS15Krpuw0FyOKLydG79wxEPJPRj70MHhy1laFfpERhnTH48aaCdkZJHs50dy77BFMwQ== X-Forefront-PRVS: 07630F72AD X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39830400003)(136003)(346002)(376002)(396003)(366004)(189003)(199004)(478600001)(105586002)(11346002)(446003)(50466002)(48376002)(8936002)(106356001)(7736002)(81166006)(305945005)(2616005)(8676002)(476003)(3846002)(68736007)(956004)(2361001)(2906002)(6116002)(1076002)(50226002)(81156014)(2351001)(36756003)(575784001)(4326008)(6486002)(97736004)(25786009)(107886003)(47776003)(54906003)(6512007)(66066001)(486006)(6506007)(386003)(316002)(14444005)(52116002)(16586007)(26005)(53936002)(16526019)(76176011)(186003)(5660300001)(51416003)(86362001)(6916009); DIR:OUT; SFP:1102; SCL:1; SRVR:SN2PR07MB2621; 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; SN2PR07MB2621; 23:EpyeeLljhM9N2BbQmLBE782ZBvggZN65GHmscckY4?= 3LCMgQBJFMGckpvuWafPgRuL2Wvl138YyKl6mM823oGy+5u5opfrDMFZ/DKCEAeTw85d3l8hCUwDB11oQo4FpfMcWDiCK2Pb9XCETWAN0iLJSGuy7CkWGRkY5M1d4hrA4YJA4Xn5CJrrpQID3ap9NBauSs+8THX2BSUf2s8tLbZ8ZD71wZ5CpCRrs7XAHP07+s30fmg0bgeApmvDB1slXqg37ECddeECvQEiVZ5tnAkKd3ZKho3QF9mSEnd+n84y4vtPWwQNDHVvFiHE/uPqy5FZBoGLQ44B1mly/wmGCYHjpo0X5kBKevie758wP/lUeRHxC34yjAukKUHyZDrI8qEPfZuSl3JGz4zRIhMkjRY5obRvFgz03n1O6KTldtRFTyfzN/dKzQL+chJs8S5K0Eqzcj/Gy0BwOmDWn4oKCNdaO1vC6ehljicTjlPsoiAGtmJrP3SP/0TEqhGSOMJ/Yt5xgXajzE+tlLuyNbNg8PI1vTizo/ckOdy2GdMtwXegkixGNGUCmwbrlckMuGTJHTlWcxZ7Jb8b8SiwpfpUsPjNuIA/xVCBNKdDaJcdAmOPZLKe2pos9rFOA07F8lwCudXSBDlTYaXVpkQ0MHsVcvcRPeTfw+c3JfWRJUFqt25dITsfK418Xyprbwj8hnKnxZK9pjxWhMOQ54poRncOvyUFAv4UZa+u1O7Nq0MTB9tGiY+awQKXIh+etI8ugNx6wKhYQXFwazQ6Yu9blR8/ShogvgLwGO2BPh588xfygDPpd5XohsKCeqJzZ07HaG8/ToYs7czF3TrdwuhavXmapjcp83LM9JKjQzQwPOZ4XIqY7nDOJfrtGK2zrRPL8KnCCA6+/LqEKdjOYlMj6uj9U6o7LQbZLWwNWS2NTn9jnVdHLkEk8QofybZwoPJIpwtRrw7ds7lWZG5Y6FlV5YxZzpBKfvdZQNI/GeP4t9oRBqeryPzhsbeX3bqjtEIJVNQVfUycIoLk4zj80OX3bK3fxGmvCSKz2D989JG+KMER1CzgtHQ8bOf8DPpTX9soVKmuukWaAwAJdeFp187i9oBdzo946WznLpJHXVi/wH/3VaDKV6USMcPKIFjtm2CUiKGO9rwUHqTnuamr0LQ6lBPE/dDEuJPga71nBpqs4YzSsIE5lOhZkrh520xs4/WsEiLKyHp3DhuDwJybresCzN1GjkXHhRU5BcqtR/Gy71zVay2cqmr0X8PWZ6f+GAPl1exIN0MNMmkyYQiTEtiHISmdl+1eA== X-Microsoft-Antispam-Message-Info: O4j5MOHYzk+CJmqkFcYVBZlNGj+l7QKcWGdOiH6TJTVw5psvXOMEIASOO4hJSpd6/1H8TGL8hvsCT+J9HkCMNZpPvtgMw/8OPP8jd+eJtmvmfV+md+MNdPKSJD6rqVf/gD4XzqgWJOv0uQzzJ6ziTerrgeItUbDVrDbKfj2UeLwyqCiMnlNV42iGVrBBaVsiXxmBqo5hnII/dyd2aLT4bfXuvUIneYB0Wzevaoai+5gT29hEOCJG54FO8TrayomnSN4t7BAW+Wgk36vfIWxtCdbii7gVxFET/+/NHXFzrpPZYOB6cXzhubhSXYS8mLh2Lxbk8UwIYmUqeHH69JKWlg== X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB2621; 6:OGF7xX77MiUMKfyTbG5dtBgtuFoRE9IuG91MeceKPSdSrYSE576577U1tae5jgh6H4f932w9hiCxaNZFsUW2pn8F8aJeddBUUyvSroRFHeKYrGYVT3OdmfwOTuIfXuSmH6DAB/tfuAn3zKG9YsZxgHmzYf8FuzH6CPFZE4AXUe70nwcTsPeFPicEf10xhXMAb19b9LwRW1zDB2Z//+LvZH/KIPVH+QEoEKM/QcvT1bwNllHLOtwG0HfwvZk8EuJLGQ/v/nwvO5RqWkYs2o9wnai+vr9VzRj6zOWBYVhYz6mmrauNFYHVb0sRZRMEpJBRmkv5m+GiJ3xckMLf5d9TEqLM+WdtFwfqsMp529srbJPVH/xZiHVHnSs70IM/PW73rQHihTzuWADwvxf4p7Td5TIprghSm48zK+ZWv8UH2akwsYnEo46huyFqJwk9R1FjKXKDOIJY/ZzaCzwJxfkODQ==; 5:m9ItdO+rcQ91Ow8ugVNmotWGAt1SmYi8PNxPePiFSzYc6THTj0OZHuYR267I4Dxbk88oEnVl23AiUptZIe0fu2/YbvNPil85bYNXa/L7tDfPD6faP1rYCyZ0VOcshyyHc/70cguAXRBoyTlTSjin9kRncfv6VrGx6in5kF5yooo=; 7:w9yjKzjT6PzDpGJQ1W+8sIgx3wGYDEyDFoO145SgaCIQV4LuvIcLyaR2+CUg2mzPTyZ8gYCiHvnbC4l5ctwd4owEc49dtz14jq7i+TMKfQCoRBsyqY2Rr9T8tJhZs0ZOdQuS9R4z5xb4NboYAs0gScJla248wdiTB06TBklkOPENgylP9ZSP1iK+v8NHT+NYeqqJGX8zBJ5Mj71Y7ULTYUOWZ9gDz7yRhtZ34wkFYv5TnWSxT7MyCy0Tkc0LF83v SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: janustech.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Aug 2018 01:08:26.6927 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a5e34ade-12fd-4705-baeb-08d600b94746 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 34eb020e-3cf3-43a1-afeb-f5cf1310628e X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN2PR07MB2621 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 2a01:111:f400:fe50::729 Subject: [Qemu-devel] [PATCH v8 3/8] 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: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: Kevin Wolf <kwolf@redhat.com>, Alberto Garcia <berto@igalia.com>, qemu-block@nongnu.org, Max Reitz <mreitz@redhat.com>, Leonid Bloch <lbloch@janustech.com> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
Take the image size into account when allocating the L2 cache
|
expand
|
On Mon 13 Aug 2018 03:07:24 AM CEST, Leonid Bloch wrote: > 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 <lbloch@janustech.com> Reviewed-by: Alberto Garcia <berto@igalia.com> Berto
diff --git a/block/qcow2.c b/block/qcow2.c index 67cc82f0b9..7949d15fc6 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -834,10 +834,9 @@ static void read_cache_sizes(BlockDriverState *bs, QemuOpts *opts, (uint64_t)DEFAULT_L2_CACHE_CLUSTERS * s->cluster_size); } - if (!refcount_cache_size_set) { - *refcount_cache_size = min_refcount_cache; - } } + /* l2_cache_size and refcount_cache_size are ensured to have at least + * their minimum values in qcow2_update_options_prepare() */ if (*l2_cache_entry_size < (1 << MIN_CLUSTER_BITS) || *l2_cache_entry_size > s->cluster_size ||
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 <lbloch@janustech.com> --- block/qcow2.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)