From patchwork Mon Sep 24 22:53:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leonid Bloch X-Patchwork-Id: 974164 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="EQxMObBj"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42K0Gn3KrGz9sB5 for ; Tue, 25 Sep 2018 09:07:45 +1000 (AEST) Received: from localhost ([::1]:49142 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g4Zx9-0002cr-0I for incoming@patchwork.ozlabs.org; Mon, 24 Sep 2018 19:07:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43752) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g4ZwI-0002Zr-47 for qemu-devel@nongnu.org; Mon, 24 Sep 2018 19:06:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g4Zl2-0003YY-Ea for qemu-devel@nongnu.org; Mon, 24 Sep 2018 18:55:15 -0400 Received: from mail-co1nam05on071f.outbound.protection.outlook.com ([2a01:111:f400:fe50::71f]:6784 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 ) id 1g4Zl2-0003Xg-7o; Mon, 24 Sep 2018 18:55:12 -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=jS1XoaXJ2fQ0eWm5KWEhHbY5Vo5ZTR5O4rtmfAvoSbU=; b=EQxMObBjoJvU+UKZfs3SvsYNLawnsmPOH7629EI9mFOi7Nv9onFKZdY/b2fo/YCgEDYA+c8xZUhaWIn6MdIALzTjYyjOgHZq99yFfsj17XAAGNfs46B1T503ZTqi1f89diwfwqhIeDcImntFiur5UymUYOtmkfLt/3SLRc8WRyo= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=lbloch@janustech.com; 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.1164.25; Mon, 24 Sep 2018 22:54:51 +0000 From: Leonid Bloch To: qemu-devel@nongnu.org Date: Tue, 25 Sep 2018 01:53:57 +0300 Message-Id: <20180924225357.24245-10-lbloch@janustech.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180924225357.24245-1-lbloch@janustech.com> References: <20180924225357.24245-1-lbloch@janustech.com> MIME-Version: 1.0 X-Originating-IP: [141.226.29.227] X-ClientProxiedBy: LO2P265CA0063.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:60::27) To CY1PR07MB2617.namprd07.prod.outlook.com (2a01:111:e400:c637::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f06931e1-9462-45a1-3410-08d62270bd87 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(7021125)(8989299)(4534165)(7022125)(4603075)(4627221)(201702281549075)(8990200)(7048125)(7024125)(7027125)(7023125)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:CY1PR07MB2617; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2617; 3:YOOjLPq5K6Li/aMZopJvQgDBNG9/ToEknha1cjZsYSbV0HHw8tLazf1q4y6jQ1v057Eq04NxcVHGDnuRCcAdv3br1Ss/FpTmsJlyecBJ3/9aoi12RuoP4ZPsBQtU8NKEz0/gV7HeacG0N6MSBYyUqNzBaW1KV/R8KenHZz9c+yC4k3Blq9Fgy6tOPyhjSOx3cUarObYUIA9/CudH0j0esf2t6msNQy+ZTUCE/MSYURrBqTdRP1myLvCc92XJtIlA; 25:VW3hfCVxWbrhA90TQ743ftsWDVGW2liNJAHVP4r4ZCUfua4R8Wgu3szkNS2j5oy/x2WWdkWF/yR/M930WBZwPW71tj13cjG46GJOMPlqTcUlyEdnjVG7nKZIBAf2/z+TgrAt28ccUYHCW3afeBYUI/SrE+gmQmmj/N6+a59s1HTnOMcGFHz90N7LZUQHB8WZUse04JXh9LQ4AE5k5oiwemSVvKRi4+SRBodfpMSvir1siVd4Wy2fLHgatuMa8bpL0HiLh9IetjS84Gx2OPGDsIpo8e8X7+NO9fC3gBOHBu9wzAXGbkLUgRcSJsRK71eprBQEgc/iASz0ZT2z9XWqiQ==; 31:NEfRuOwTZdPXXWETYDeC6wwQJt1FuAyH7w97mLyH41WjiE9pFm53fp9hSiNLPHQIOFBpg7igAqax63r5eRFwN81e3PpWcZhUCOgjVPDlMPplStfgK7kUmRLcKF9JXu/pAbl2QryRnRLOjknAi2kqt4hkaj4g7RXz7drxjGSJa6427toD3s0IoCUhWLQzlXJRgtCQacoURrcvawtu5CO8chUvl8Yk9SR+/8WI7ua+ZOU= 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)(10201501046)(3231355)(944501410)(52105095)(93006095)(93001095)(3002001)(149066)(150027)(6041310)(2016111802025)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(6043046)(201708071742011)(7699051); SRVR:CY1PR07MB2617; BCL:0; PCL:0; RULEID:; SRVR:CY1PR07MB2617; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2617; 4:py0jB7vDjPB0zQ6oo6+y7K+K88P9m+Fsj2mrJtwCpBgkBL9tcGYsxpg1FK20XwTWV21/R5PXm1UT1HPYsWQENawldudkJ0nHVMOEX85YIhveeg8Qh/G0r8X+38GWQ7DXDs6nAHeWHTV7+2x06dBUbiZfDeUdoAPheoXvxavgHIp2/yUDmmIadC7PyI3BCQyGNLBpLtnijkoT40ktUwISRxe1yDZQHZM/j8zCwjKVrd82q0uPYTkmaSaOqKiH+htd39k3ChBxmuehUJi/zPw+dQ== X-Forefront-PRVS: 0805EC9467 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(396003)(346002)(136003)(39830400003)(376002)(366004)(189003)(199004)(476003)(54906003)(68736007)(14444005)(956004)(2616005)(16586007)(105586002)(86362001)(66066001)(7736002)(486006)(47776003)(106356001)(51416003)(11346002)(76176011)(36756003)(446003)(6506007)(2361001)(316002)(52116002)(386003)(97736004)(186003)(5660300001)(8936002)(16526019)(1076002)(2351001)(81166006)(8676002)(81156014)(26005)(50226002)(6512007)(4326008)(6916009)(53936002)(3846002)(25786009)(107886003)(6486002)(6116002)(50466002)(305945005)(2906002)(508600001)(48376002); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR07MB2617; 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; CY1PR07MB2617; 23:DILykj8SfwQMxjDd6ntI7KjubTrnWolMHucO7VVFP?= 4CB7WbTByYnvFXyXOIKCslZOgc/jcCMYqGhyP9rg2EPSek91vok7r9khP5Afs7p+H4JfgSLTgFHhx7qzosKT5hFbG1q565R8qev8wAlNAO0ICfWbIzym5uV76vyXCQl/zflRfPm9BQY7Zi9ZqVBktkoTuZQ+LHiESnEiKN9z2gfRArLwi4IA8YQTIxeAAxhxDJl1InY99GMiWXYa3QHbOg1rSteP1pVCQYjMHpGnJFnNhHWYbsztMNPfcBy3+VynWp+PsEIZYWEva/IQPcWkTK+sJcW3s/Gd7GrEnReDnHvK45Tb7dDH5AE3D68cZ15K2/a7ewCX7urFAlByB3eTWT+D5zfQqwwVvEMge0ijerxH49HqtLbWlsHNJEN97gcjtpWugPeMghH7Ei+Iiv6XaaLGRh9XHttQn/6QoYhLfxrXchPKgHAdeR+C82EzI4JOh3tO13y+Zy1B9FAPGlqu9Cniv18md1y3cQryZB0eadfzzi6mWAu8zkeUuRQv8auEdQb8KsPja/b1EPdqsCsrngyhYYyrrnsgkTrhsxH9aGGGWB+W94Vs38uhh44+AhK72lrvG9RWctv1s1jz4OJCFob2NosPqSe4V91LejOwZ+++CtcqtyOBeFm0/W2OJApaYBu1MA8+SCawKBOHaDa/kwq7gdCLTqGGLDBTf+7OT2Z+AEKn9vqbdSos0ler5f0A61hNTEgDWiohSx98zVHIQufnfSkjkBdTeIdfH6oY2ti6BSjcC/3sLy8Y5VS09Gej/KKfOpjlRS7Zdbz5FyVl1ebt4b+yTdrZG2biasLpvt9WhN68JREeDubpjN+tM/wLv3N8MV/pVgW2T3S56zRIa2xBnmjB0DF4jEyirplthDMPTiX5aqiCzLjBy8n7HX7haxb2EssXNrb0zjyNL5A32PWCPLXZIyMeGyXNGn1aYVWNzOEPuiJwObjvk38hiGqYskQDUimSUoVH9JkiU5AcNBZd6UCLEJbSxc+jkcyUyQGlEZFf4xhBa+Ho0mOzbU/WuIinvHBXlIeEdZtkq39Xe3wgvLpl1O4aiSPFprDnhxUjIf/IreHa8BoqEQfTl3QpjdgdJ4LZXDSQm6AUfYKX2gGGBB1Kpd3qf/YUyv2u01cOYmMhfGfLSuWFSKetUEjWmHaJtYfqJKH8GhbKVSTNbDz+Xp6EhRNHVu9ehHhdk9fte9bhDkFGWc5m1S8OaAIUikGUlJVzpzaf9Utc5t6aMHB X-Microsoft-Antispam-Message-Info: AkgLXK/1wjL4RUEeqKDPJw2zyCTyXJj+XZToZTong2LZWtN309K7LU/o0VgLRal82pTyS77+WtALn0MjrwDtTZCJMTSzOND2yCwtKfZf24YzrlL635HLw/Hizx/f0cyJYheYn72Cz28RvgU5+QMzIt7Yy7n1A98q+m0sx23GaaPyUBuY62ZPBaTuvIGqYf4uvj2A69Uak05pnQvGVX/vg806spxV+lIK+rIYhogKrb2stmYp4G2jX12tfJdlhEitwMG7XqpBkpG+U1DgV+peUTmZPl8GZ680wA4jJOvIIeMh+LATLgUe0JjbL6M8lScbPHM4JDNxxvjeM5r+tPxxa0gecUsEjfkuK8PTnVDAyrY= X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2617; 6:pRz7rEta5s8Tau0FDhPBdUkrCCZ/CB8SfoxciTSeoVrDHtNBLpeBEgIvRKqRUQR+7dEIFOhXYYQVMGGx1mejmQg6pQn4K/wbpih3Sy8yNI1IsWiR0naQ7cdw1ROc3++GFVlyu50PobUPsTUenJ/txBs/dbrK+GqE8NfHs9UyrZMs3pBJIypHjRZBFZfSYL0FNqsJ9yU0LtoEr+PuemLvsscSkDqJIyoSwYpT7ZEF4i6WU+YzZoqJw9nh5AY06LQCj/SALlN31tLgRceOGEAN+1ZrAzAMilfuX4kFXnfQUR5c8KoB2KsprvnkTqrb7ssAmWiyaOtTfePxJ7KhY7c/RLrn5ilgw49RJYA6YlWjTX0QRAv6OmsyIi97xvGPRaf5ZCrWcFXkc3Io4xcEap3bvimwM9HEPTVIqUDHfW0v+vXmdTMZruhp4O7GuY/41xZmN5cQzGGPrRdjRMNNRvmZHQ==; 5:rF7oxe4l2nx66iewx/p004xJe00V/RbPbNfG0zPGGcdIgpBoUe1ZpmsHoSQEAwIaFhE9gY5eXsUEi5ia//8qnIOGXLCrC6k6DkrLAe000PJvQqMgWi2Qz/RM7PDBnJ9FxcGSAy7VcDnR6+TOoQ9hVGYdqd50a+1+lDysQxP99ME=; 7:wcOiHYZAmNpWcJ44CrJybOD4uluPirNCdalZ4zxqcw3qQW2MNcYex1k4SrLg5SLX4QP4hHM/KQqfG7Mz9jRcVcrp0fHb/1X1kAph+O8BK2pcZhq500yBliCil0iv+vCojpK8n095gVPN8sZVRfC2HbpASYH5R1gmlQaRD/KaArlGbMYlku+MQts2wSC9yBsUlcCJOevs9L9qChKU5r4BPZGuSn4p+kkygDQH1ZcJjV2sGsZqcdhb8zDwZDhSmBdj SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: janustech.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Sep 2018 22:54:51.3283 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f06931e1-9462-45a1-3410-08d62270bd87 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: 2a01:111:f400:fe50::71f Subject: [Qemu-devel] [PATCH v11 9/9] 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 3c1859f9cc..983d4361d7 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1324,7 +1324,7 @@ static int coroutine_fn qcow2_do_open(BlockDriverState *bs, QDict *options, /* 2^(s->refcount_order - 3) is the refcount width in bytes */ s->refcount_block_bits = s->cluster_bits - (s->refcount_order - 3); s->refcount_block_size = 1 << s->refcount_block_bits; - bs->total_sectors = header.size / 512; + bs->total_sectors = header.size / BDRV_SECTOR_SIZE; s->csize_shift = (62 - (s->cluster_bits - 8)); s->csize_mask = (1 << (s->cluster_bits - 8)) - 1; s->cluster_offset_mask = (1LL << s->csize_shift) - 1; @@ -3450,7 +3450,7 @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset, goto fail; } - old_length = bs->total_sectors * 512; + old_length = bs->total_sectors * BDRV_SECTOR_SIZE; new_l1_size = size_to_l1(s, offset); if (offset < old_length) {