From nobody Wed Nov 5 05:23:32 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1533712554440855.2574481098839; Wed, 8 Aug 2018 00:15:54 -0700 (PDT) Received: from localhost ([::1]:42149 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnIhF-0007R5-AS for importer@patchew.org; Wed, 08 Aug 2018 03:15:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47147) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnId8-00047e-H4 for qemu-devel@nongnu.org; Wed, 08 Aug 2018 03:11:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fnId5-0003De-8A for qemu-devel@nongnu.org; Wed, 08 Aug 2018 03:11:38 -0400 Received: from mail-eopbgr700110.outbound.protection.outlook.com ([40.107.70.110]:16032 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 ) id 1fnId4-0003Cy-VI; Wed, 08 Aug 2018 03:11:35 -0400 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.1017.15; Wed, 8 Aug 2018 07:11:31 +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=u7R0mDv/oqXjyp4/c8DRsrMkN8ni4Y1myVPwCrkEqdE=; b=nuz1nNx1eZqA6ghLkqXXyVlSl4ESH/DjfU75XS/MhGi9tjLnvWVAr2FPeX6/tcR56wwh/t7l2USXnYMPCiBZwdW96g/OZMUvwQERn/86IoP5uisyvVEOUDDNJ5t2pnSjGDW3Ps6b2TDC3+Xk0QFgHkzdEHrE2625BCJDy4lQi9g= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=lbloch@janustech.com; From: Leonid Bloch To: qemu-devel@nongnu.org Date: Wed, 8 Aug 2018 10:10:51 +0300 Message-Id: <20180808071051.30628-6-lbloch@janustech.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180808071051.30628-1-lbloch@janustech.com> References: <20180808071051.30628-1-lbloch@janustech.com> MIME-Version: 1.0 X-Originating-IP: [141.226.29.227] X-ClientProxiedBy: AM5PR0102CA0003.eurprd01.prod.exchangelabs.com (2603:10a6:206::16) To CY1PR07MB2617.namprd07.prod.outlook.com (2a01:111:e400:c637::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 72cbf5b9-6407-4074-339d-08d5fcfe2bce 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:CY1PR07MB2617; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2617; 3:FV9nKgmbwdiT9oTREipywOg427OSDRmfTOcTjPX6a7AEYpC0SwhRxFvCoYF7YL0d+pyrRH0iM259ktfJIL+fJt7UQlBfv/YXPp/UK9NG2CFASJk63dl1ZBC0/TF5JhpPA3CBkBgOBwiaJ9JtuYUUiKWfVogZimbpPfknbHIM+L6dg6IHLKG+NqhXY5fZ3cgCsGzqvXbcGKSXaz6/bcbGzXaPUj6WCrkwyZWJ5Nm1hMV6LowJNUtM1CoIlOXRPn2P; 25:hvHQmKqMwh9FrXk/4x4VRdDENR8++OQE+VE+SEpTYynTnGkO9CX1LWj3mW6hhG+CNnWcGc2MgPTa/+5EllfwmaoycuP/TQySuuiSVArQBIQUI+LFgsJ0rXmnqN8On9s3UyCgAIvr+y0Rp/yo71Zy3shHd7ScWftS7YvUfY5BKIedU9ncMU8Y/dVe2DfRvdVejy697KS4iyIHWnlvPZiU0ph1R49bSmP2GPd6W2HURNx+mpgEJ5HZ0/BSK1xlbTTLNKkavhzL+As6AZV725Bj09dUD62IDq0EBmFyQ3P77XhPurigtNTwZd1SfFQmot5HYqa0/pKpuwFYWRKVXy2XyA==; 31:ygpqH2NneWTLViPzV3CV8Q3h578T3Xe/Cx2Lq2huO5UHadU59B/hkdLM337Gy4P7NHTGeKiRmjjZWkww3rtI1eJsDr7mlFP0REb5PsZOS2x3Gw+n/+j36aaGRF0BswCvtj+1f8loEAmiJYRoyTN4D5HndWj35ZRwaofxvo5vBm1Ux8vmN9kK+tot3TaWLGkdB6inObMt5J2nENBoB0HCuuzlmJkMsSv7x7UUi0Ybu0Q= 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)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3231311)(944501410)(52105095)(3002001)(149027)(150027)(6041310)(20161123558120)(2016111802025)(20161123560045)(20161123564045)(20161123562045)(6072148)(6043046)(201708071742011)(7699016); SRVR:CY1PR07MB2617; BCL:0; PCL:0; RULEID:; SRVR:CY1PR07MB2617; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2617; 4:rQjlgsPYYH8emFPTnFdBzJGDu2JLFVvpHOmw6SevTp4NOIHhVriRRQuBDfwUl5q3n0uy4g8AR9+w2lyZdMTeW68OH96rNo+S72KNNFbd5BWLVqJiB/F8QDaqNpYY4kYs2eaKWarfyeXKQkUvOCi2ejv6rupdeAlsTlx3vZbNwnNRWe7bRRHaSnofI1EFdEYK6ENbGVlDDbO9h2+o6SLKRRzMGFrAEuoywEbjwaQzcgDMvAt+KRsWYYeICcgsun7xLiKeI8I/oQinUpUO11eKUA== X-Forefront-PRVS: 07584EDBCD X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(136003)(366004)(39830400003)(396003)(346002)(376002)(199004)(189003)(36756003)(6916009)(107886003)(6512007)(4326008)(186003)(53936002)(50226002)(25786009)(51416003)(81156014)(48376002)(6486002)(8936002)(50466002)(8676002)(68736007)(81166006)(52116002)(6666003)(2906002)(54906003)(97736004)(16526019)(105586002)(16586007)(86362001)(66066001)(305945005)(2361001)(2616005)(316002)(386003)(6506007)(2351001)(47776003)(106356001)(7736002)(76176011)(1076002)(11346002)(478600001)(26005)(956004)(486006)(476003)(6116002)(5660300001)(446003)(3846002)(14444005); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR07MB2617; H:Jupiter.local; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX: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; CY1PR07MB2617; 23:E0fRmd7Rd7CU9F+Pk1zwfKcTyqol8BG6r6NO6bJNp?= =?us-ascii?Q?53OjWXH454vCt1RwRXvgCbkyyc9iw4EVT09GxrJIx4E1XaDkXmcfVsYreJO/?= =?us-ascii?Q?mUlbHVbF/H7OpKHySJ/25BBo6LR1Rzh9Bea4vyfNp6P6Bh3FUpPtaq7a1lq9?= =?us-ascii?Q?M6Kp/AIR1UyiLKFaj9EINc50Bw4Rr+PvMR8Ff8vQtpvzJugnKQEFRCJikE3f?= =?us-ascii?Q?wzlaFJbotCbE0Zq88n/S5nEZ20wS/J1TMdVVmpX2cSO7Xw3f8ZnIlcReYnXq?= =?us-ascii?Q?eb/8ihnuxTOQkcUZYtAE9gi1/WtNSpJ0FwrGCXIqvpUd6HbxnOwIKUyTFm1r?= =?us-ascii?Q?9SqH7GPS15O2fWorUzgQy9z+HPtxvJlTGRwodcXslxwCG9vs2QjTpHWPYdCW?= =?us-ascii?Q?PKZSHYnSyT5eUVm7dwQAJ/vemzihF8euEbyi4QviU5z7PecZaJCiYMbDv3pH?= =?us-ascii?Q?Za0Gh+Elu/EBDKyT8DwtK7dwIIF3T3NpXAhiytPph+Y4txoySZfCpkOSWeZc?= =?us-ascii?Q?7rK97HywjRtIqnubvZ/cuwB2uyEsSup+k5j+IiQVWqYvHJcSlna8stRDoEvv?= =?us-ascii?Q?zWq19NRmNJi5j877s6we/nCig9UIL4jHYKOq9jZHr2fdKloBPoJIkoSXdhTE?= =?us-ascii?Q?pNxOd/Ve8tao0ioA42p+lFLjXreFPMqHgpXY2KhPjbyKCA6dRJlaXRgB0h4+?= =?us-ascii?Q?iFjH0MeTbZUGsaiLBbl148n14xcjnJaBGsZk33pmYVVVqxeg/j69s6jxxOWj?= =?us-ascii?Q?KNPRc+khQQPjYTBiAFfYOJPDTys3qIkZWzX7GDsSA2h3Pbt6d9d157NgWFjA?= =?us-ascii?Q?AJVrnqwu/GKrhEoO0dwZTI0O/oR3smd03ijY5KqLr3FMz0hbfZi+Z//eTF73?= =?us-ascii?Q?zo4uKM1Emq5WOG5oZJeogTZKyek81J9rtKOD2XOW5GrofY7SWoH539hR9KMw?= =?us-ascii?Q?K2/MJy6HSFEIZCNuIQAeLhH3FNSXKK0/nVDhlTlxM4RuoUiT5FOcVK7GMeuG?= =?us-ascii?Q?YGmgUBj78a0LYcLwOyzPMmxhtD/60QqTmwrl9CtskgSWifMqtfz7pCOVxWUQ?= =?us-ascii?Q?yHormchaUQJfHJJ6v901QuM4Ko2SGcGgkowRHOwM4sWm9RdSN9pFBmo9LpA/?= =?us-ascii?Q?nUNwcL57MPJsRFfLZ0XbnihdnsqPmAl4XabXUL36ZFadUmhncUN2EZ9o1h7Y?= =?us-ascii?Q?56LirYQbTUuk4wIGitH0k7Iyg9xm0EiA88ZHERb3QTsq7n5zi72EzISA+h2y?= =?us-ascii?Q?GRvIuCArtJjDfD07AM5owyFjM7958Mna/pKebS0xcXYKACHrUdmVilAA8g+B?= =?us-ascii?B?Zz09?= X-Microsoft-Antispam-Message-Info: BNzCK2FyGWSIYY3iwemIGD2ND4h1Qjl4hMxcAggEjd4gS1tndm5y4J1bgSQSdz13k6P/LoIcIglg05M4ADotPN8DQGICF+rOd7m8ndayknFUZdOs807GDRPGd0pll89P/6BXg5gfbVLdgUkwBKU3tCTo+t7b/QBNs0VnU5N0W7xcQNr+CiljkrPkUZWHPA+tLMdLHEljWK1cd+4JsZD7CD93d+f6A2YVklGJll7wf4Y4Aj/9hHyh1hcZF9ohyBZiUEGJfeVdAyi8VgDF/PKs6hpju9vp7FE51EZqR5oROZEe7RX2KQC41mPfY5UK82UUnYYs8EaFqw5LmtthZtbtx1qUQ8oUvs+8cvN8fScJvsE= X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2617; 6:/LDI9DrGCbT3Wk5Qf38RfVrVnaTEYMyAu9gjOQua19Y1x1Y5Mhty97HJqrDCeJF54j/pcnSdFxq5OQvT4GVD8JgDxxVFrkSeo/fczve8tyfaeJULFssqXJPUZmz9wl2tYUf8yhvE7QObRzpoQI9w9v/WOtnrxg9rkzyzsIZ1hj2jMsu72O39JQVKjUNSBPxgt7s4XSsCFu3VqOGY2GZ4Cx6fHZXOc7jiQOdZ8TmudCQgs/HRAxjfck1cwtKT5pTz4F4tPuxapu/kx7Qwbrp1SgplQtCSB4Xsfx0L3OFIvIgE06arUgLk/fXLVuZ6VaesSR2MbrSc/SlEMTvNejqKsDgGH3q8N9M4I3ErTeJWV3gCZuW3UzyOd3MGFUFdQKYFThh7j1YzcjNncl4xRzKzw/ZSqhOyPyMvrmFprixONIeji3vsZ+w5U5a0t+kiFahEbHyZCFUf8xswvpDjd2lH1w==; 5:r3gTkjSUuNAFuqQTmW/48c/kHWPHJo0oNSxbxniD0gnIaHSjpNXAY69Pyy6XD5zRfHJJVvR8bOAupVQpLeHnyQ9MRO9vG2Wsqmh8hMMTRCAfZpbFZQekkOMjm0l7QAIYJZP9NPYfr5px63hvNjnTjAcoF72Ap07Mml9AKFqd1mk=; 7:Au09e02QtFw0KCNbD9xOqUaVAo8ONMnDzzNR2dgU1kRY7dvFBuZuc8PwmmZrZpt/zlguOhtilkCaVD3BEjQo3Dv6EUl724ZQL+UIqLPzU2W3IiF8qYire/w9zjCRWVK8dVuwa5h/PgQSt1wutqaPwPvQcMdMTzZDMuEMrz+Nf6o8ZnHWIrTYC5Bk3A3PFSuzDYI0WSKWIm6kGx/iY2NGgrsXus/eMTHczkAIvEU7fwzrokCy5VN1kO919Z4IJMWq SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: janustech.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2018 07:11:31.1474 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 72cbf5b9-6407-4074-339d-08d5fcfe2bce 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: 40.107.70.110 Subject: [Qemu-devel] [PATCH v3 5/5] qcow2: Explicit number replaced by a constant 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+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: Alberto Garcia --- block/qcow2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 453a6377ac..a54e20402b 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1321,7 +1321,7 @@ static int coroutine_fn qcow2_do_open(BlockDriverStat= e *bs, QDict *options, /* 2^(s->refcount_order - 3) is the refcount width in bytes */ s->refcount_block_bits =3D s->cluster_bits - (s->refcount_order - 3); s->refcount_block_size =3D 1 << s->refcount_block_bits; - bs->total_sectors =3D header.size / 512; + bs->total_sectors =3D header.size / BDRV_SECTOR_SIZE; s->csize_shift =3D (62 - (s->cluster_bits - 8)); s->csize_mask =3D (1 << (s->cluster_bits - 8)) - 1; s->cluster_offset_mask =3D (1LL << s->csize_shift) - 1; @@ -3446,7 +3446,7 @@ static int coroutine_fn qcow2_co_truncate(BlockDriver= State *bs, int64_t offset, goto fail; } =20 - old_length =3D bs->total_sectors * 512; + old_length =3D bs->total_sectors * BDRV_SECTOR_SIZE; new_l1_size =3D size_to_l1(s, offset); =20 if (offset < old_length) { --=20 2.17.1