Message ID | 20180809215307.18241-3-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="V6YTMvaM"; 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 41mjGh09shz9s0n for <incoming@patchwork.ozlabs.org>; Fri, 10 Aug 2018 08:14:36 +1000 (AEST) Received: from localhost ([::1]:53159 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 1fntCT-00067X-J0 for incoming@patchwork.ozlabs.org; Thu, 09 Aug 2018 18:14:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48181) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <lbloch@janustech.com>) id 1fnst5-0004Kz-24 for qemu-devel@nongnu.org; Thu, 09 Aug 2018 17:54:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <lbloch@janustech.com>) id 1fnst0-0006Xw-QI for qemu-devel@nongnu.org; Thu, 09 Aug 2018 17:54:31 -0400 Received: from mail-eopbgr700117.outbound.protection.outlook.com ([40.107.70.117]:52025 helo=NAM04-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 <lbloch@janustech.com>) id 1fnst0-0006Wl-HN; Thu, 09 Aug 2018 17:54:26 -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=RLbPvh6ml+sdi7+vkh/qiPcJVZJhttLkt69wrdChoLo=; b=V6YTMvaMhYzzKeR1sJbdLjmLofDyohf5legxeaCcmEP8tQaniQ25Kz5ZdfgUeT/X+1pdEjPPsXi8i+1FrfKLG+s80zAs0rSui+NAuxTBuJgaysQVOG9d0hBvDuhu/11+B5TJ8+Lf78Rg1BmiA1lhwSFX33rTTTJ7X5f8glp9qbY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=lbloch@janustech.com; Received: from Jupiter.local (141.226.29.227) by CO2PR07MB2615.namprd07.prod.outlook.com (2603:10b6:102:14::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1038.23; Thu, 9 Aug 2018 21:54:22 +0000 From: Leonid Bloch <lbloch@janustech.com> To: qemu-devel@nongnu.org Date: Fri, 10 Aug 2018 00:53:01 +0300 Message-Id: <20180809215307.18241-3-lbloch@janustech.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180809215307.18241-1-lbloch@janustech.com> References: <20180809215307.18241-1-lbloch@janustech.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [141.226.29.227] X-ClientProxiedBy: AM4PR0101CA0050.eurprd01.prod.exchangelabs.com (2603:10a6:200:41::18) To CO2PR07MB2615.namprd07.prod.outlook.com (2603:10b6:102:14::10) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1fb94a51-c3d1-421e-fee1-08d5fe42abd8 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:CO2PR07MB2615; X-Microsoft-Exchange-Diagnostics: 1; CO2PR07MB2615; 3:574FkSSq6H5BsNUpNLEIcCBnaj1UeOl0rCyf8MkRkbSWtww6hKKHVEsX+8CJ00uG7xOjUuJ1FTBEibJjEtpaFZmhcSKw0SLNwMlaN3+1P0cUZ0+xCoRO5+oO+HaGAOxv6pWAyFbMXbCCobtHY8uM3X4Vj+DfABSuocnuzk6I2mwquY07p3WG1jt6cCCY+CEgmgaZTJreWOEan2WNz42ZNk03UC1eCwX5H1PbPhH0swOXG9kmCKzLC27IwvfGc4j8; 25:vOn3hb9uy5oHth/r+zKMeGcRSO3flRpzLr1fS/+MDxnRL5rmkLJIzActlWAI9IeTRyKpgesP0xYr6vC2ABUEJacMYfKpQD4mWQ5Kk/vPpeKUk115uH2IVZSV3ko1/2ZMHmB5Z9nx5iYDNL/w8eMzv3oC9wjjMMoRt+ecqetW9t0+71G5nWmdBPjQl1qdAbHioe+ZVsEbqoZs0nP21JCHHDEniIC4jDh3eB2x8BdvGK8ey2PVxVTeXKD3y/veGUyqF9G0/eH4EFd9EgfRi017LophX55GTwN10ZzyQChgF5oWFVeyWEa1Q3rXj6ybFecfXLdB+f3QhJTE8zlzEpDR8g==; 31:l4wO+01R5uKOkBPWJ5GwqGbXEU15xZr/IuMi7pofe/wkZdSaZB7kgrevX0VEzvAbpw6GDBl/lBkxRTDU/DpgryDQ6B1FT5+tVG+C4knHeSxlNbbsQyBzozvsAA0nbA7psV2SC4UQdtk+ytMj84Jomf68ewsCbUFlTTio3ffCXrM1n/YilFM6MKeezl8XuFLLTnTYCIOb/0SVExIhcar+co0yaWRN3ncJHsr9ZX0dAJk= X-MS-TrafficTypeDiagnostic: CO2PR07MB2615: X-Microsoft-Antispam-PRVS: <CO2PR07MB26158C8ABB347684A2E70E3BCA250@CO2PR07MB2615.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)(3002001)(3231311)(944501410)(52105095)(93006095)(93001095)(149027)(150027)(6041310)(20161123558120)(20161123564045)(2016111802025)(20161123560045)(20161123562045)(6043046)(6072148)(201708071742011)(7699016); SRVR:CO2PR07MB2615; BCL:0; PCL:0; RULEID:; SRVR:CO2PR07MB2615; X-Microsoft-Exchange-Diagnostics: 1; CO2PR07MB2615; 4:PpQj0RWLy1ZH8eMzW6MQtwG1jPoi6JG6jKa1u0u9EnHa9+yifrahrX6uYe5nM/xcqBAjvqMcL3kR6RBFsRrt1p+xqoCZ7u9ncXIY+UAiNpyJXvHov+fQS8TvUIO+MBLpM7pe2/5eGuruXlBIwicOZSsfiULOqefDfYLw7tWBTv470BYavFYWr5ZLcT1QsFU0rwgMXE8ZPYcSbLRVejNzFtE+IhY/rNzBpT3pDQDQv6VfRFU77TTEMuFFDkyMrt9BhZDKwPLZRbAG5PSL7MRuhQ== X-Forefront-PRVS: 0759F7A50A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(979002)(376002)(346002)(396003)(136003)(39830400003)(366004)(199004)(189003)(486006)(2616005)(16526019)(86362001)(6486002)(7736002)(8936002)(16586007)(48376002)(478600001)(446003)(81156014)(68736007)(81166006)(186003)(476003)(26005)(305945005)(386003)(2906002)(8676002)(50466002)(50226002)(956004)(11346002)(25786009)(316002)(52116002)(51416003)(6116002)(6506007)(1076002)(3846002)(5660300001)(105586002)(6512007)(106356001)(6916009)(47776003)(36756003)(2351001)(4326008)(97736004)(53936002)(107886003)(66066001)(54906003)(2361001)(6666003)(76176011)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1102; SCL:1; SRVR:CO2PR07MB2615; 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; CO2PR07MB2615; 23:LZ+ZFnWdbIRuPbRo25zmwp0Xc2/p48vUZDMg1iGWB?= jOhWS84asxiHEoKuxRIpelYFUDZVnYM8ELfEX3Q9wL8vO7oZmw2eBmJiGqmMwCepCT36hKsU3tsHB8Mo7Kje9LLmeQSty5VfqaTFNu+Xg9APRaG6jUqqz/zupBv1BLbpgpqCN5U3VvFaSk+PTldFrKvyvgkKYYkQLs7vQveiSlB9bRJMEIQcLPqF9/ML/iAiiTAxY3yPXeLsONJDVs5aOUK2DY9sfmhEx1flC8qyJh8ChYHrmJiNTmnxIC/lYywsABBUD3/aRa0Ncf8T90X5ky/wpkeWc2YRo+A7VbBfGgUyV3yjerH6iNVpjWQEFp/6n6YxEOvm/WaTgDaCcJDzKDNSakz3p2GgelpOluxNC7b9Hb1DltS5UtGBsqaSBEwZ7d48VV6LIuT0W5bR7yqqHL8cr5OUSk1HZM2g7Db0RAPKk76IkV1wn/Lg5FzWGx+G3RHovP7B0pUdxYoC4Dtk3wHccOqjaPDSi7SPA49U+HNMZjjzt3DqAEsyLOMhWD9mvMTMPTdzBU47dAb4mGYIJPX85ce0MKWrZk3APyVH+hlqLD+n9gFu53PQhQNi5uRD4sAKzSMryyGosEoV0hVKwOUGXcBjg4a3hVWve7FWTnfIBjobz+rs0KHKBsrhaRR8j6KLm9TQDIRw1dS/3cYG3AwDKN9JKcMiOZeBkfYsNB9K5tSKIu6qtUuBZm0bFQ4XDk3M/pX9TdGd4Y23peK9/4HRyKphlwApByDYsfL1i3/JVLEKYm2Kq3oGK4qVC2at9SDEhStJtVFbHfnEz7r84VyvR1zjr4RlBiLKdymXzS2+0XBLZ6M+13ryub41bjKBm6I8d0av01UycnQNojWCXI9PKpMn9HsH5KZp0gFUdSi+DE/aKd6kOW6NvyiXj2jh88AAuqdgTQgtwHjIH2wvbXTJLuDhCU9m0O421c9a7Dn2yBRBAFJ4erq8M99Z9qo4M4HX+jEK2F/m5rXcIWgmMIE2Mgsz5HfW/Zo96jP10FESs6I9NbYOefgnyinnuDo5ue5F67HdK4Z50KRt/4IFBctr4SNVflVUkOzXLDo+ckmwVHIUYhQnXop+UcyzMtgKA00jfXxjJd7Ree5n/zgIj8LO13RAIbU3yABKMWTNmks+2mrQquoBwvq4tq3w9l/DrKiu80tuGFeM3sy7JB5N4bUPDFQ3VyCiPeAiceWahhOBj7VKTFsZIGb/FOI0/5/mIb8oo5fkIzBZDzpp6YBADEjEuO3/m4b/hmZrJ+srqIPqhU37tZt/8w6X986KUEnVmsL90ree5J5ETt2dU5Ohj/phsyjgu+04SGty94HhaJVDQ== X-Microsoft-Antispam-Message-Info: HiShY+ldWYgudIehzb6aWgYTjvKehAHcuig56OsrRyeS9WiunoZyHG+OrVMt2a8ULzKobzPnJHVEK0VYKj0PKBth7XJMTnsJk3NOmt4kSxpA0aJsnNV2iJvenYFyk2zctr0IVbkY/CBFM3MYJpoC9vVQbBZ2OALYuB8XhJ8yaosc0Hy+SfKFq8RmwtzlMGhZZ69ZBEpmblW2lQZFG0ChfQqWR7C9ffLF9JMhjB6UOcJzzE3bXc4hzHYJL8OK09F1X9znWu18cnP0TTzp4i+JAdKdp2fWL7hFFKzGhoLNboEr+gm6cbaIY1A8fQOpVahhbSvpGVVFl4RFnqtKP7PS7rdfnnu0i7DFWjzjp+N/2Ks= X-Microsoft-Exchange-Diagnostics: 1; CO2PR07MB2615; 6:EHMgHLoAMOCbm719qbfCvibLmORC+VWtEhgq9cbjd4o65MIdBo1KmKD9/dtyruBKxWyehRjOl0cM7b7s5mv75rNS4SWW6ihNydfwkYKF9N2YW60/fzBFZ0Q8vyMmLAnywJBWElUqh6cSjhglYwIShtwzr8XcxI92U+EJC71kr239R9tkY7K0c9LW2R8TI/sC1qNpYqC/Ux7S2zMi5sRIiiu1Dl90oRHDXH1B3WaAZyZCdfdi6ZGHfiVVPmyGt3wglu9I9ieDeER/3ee5jAlUvCGO+A++IK0JMOqYk22tK0RzVUU3evyuRVuhw9y3P6id0JXqQAMZVpVZayO4wpxEoG9UDAFKziZnkWvIAvdZ3s6FPAWuqV//bP62Y78cdkYNR9Zgjjj8mwtNzJqC2QBP4VkxIWHGCzTCD9cUgjICP4d1Lp4sI/DVFRdJTdHrG7MgWkrfIRvVk3bHC9h/P2qBiA==; 5:Abc0vvSBZ0fnbu3WUQ9vWQtFtYL7UZATUU9W8NMlE7B5VGoyX3JwiAc98tmJtWFlrjbBy5ZfV/7hHkFFf4zZcDzsmInCf1Dz32EaecB83e8tMorQcOSOK5UiJM+m7vILPJp8eUke10aWJEY7FD0UpKrEiKzqsY6pUqCnLInUrrY=; 7:M8oOqYXCbcKAaONSSChG/RW9TTAu98sD8UzQSpcndWrHC14zhlD2SPFEae0bJJMG9hETwbO+z6uZg7360pCna+jV21AOiixJW9gonmQu+65YVloS/2yPwCX1qPfByi5AXlSA6IMWALnHxrJDVmiEdvK4+rpMAl5Wu8/XUp07nd3MeDiffD1E6rlhFXmMTh1HVhBSvhUfLlnJ5l33Lr97++9SGRf4dclFojzHG9x9E6hnxg4G9Wi/x7HAsTfU96N9 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: janustech.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2018 21:54:22.6986 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1fb94a51-c3d1-421e-fee1-08d5fe42abd8 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 34eb020e-3cf3-43a1-afeb-f5cf1310628e X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO2PR07MB2615 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.70.117 Subject: [Qemu-devel] [PATCH v6 2/8] qcow2: Cosmetic changes 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 |
qcow2: Take the image size into account when allocating the L2 cache
|
expand
|
diff --git a/block/qcow2.c b/block/qcow2.c index ec9e6238a0..3f4abc394e 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -790,8 +790,9 @@ static void read_cache_sizes(BlockDriverState *bs, QemuOpts *opts, *refcount_cache_size = qemu_opt_get_size(opts, QCOW2_OPT_REFCOUNT_CACHE_SIZE, 0); - *l2_cache_entry_size = qemu_opt_get_size( - opts, QCOW2_OPT_L2_CACHE_ENTRY_SIZE, s->cluster_size); + *l2_cache_entry_size = qemu_opt_get_size(opts, + QCOW2_OPT_L2_CACHE_ENTRY_SIZE, + s->cluster_size); if (combined_cache_size_set) { if (l2_cache_size_set && refcount_cache_size_set) { @@ -823,8 +824,8 @@ static void read_cache_sizes(BlockDriverState *bs, QemuOpts *opts, *l2_cache_size = max_l2_cache; *refcount_cache_size = combined_cache_size - *l2_cache_size; } else { - *refcount_cache_size = - MIN(combined_cache_size, min_refcount_cache); + *refcount_cache_size = MIN(combined_cache_size, + min_refcount_cache); *l2_cache_size = combined_cache_size - *refcount_cache_size; } }
Some refactoring for better readability is done here. Signed-off-by: Leonid Bloch <lbloch@janustech.com> --- block/qcow2.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)