From nobody Sun Feb 8 14:26:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1588841418; cv=pass; d=zohomail.com; s=zohoarc; b=e/QFtI6iOpTqOtBX1I+nTlxWSZj+xzYwwIRdcqtaC3qlcqrgatCDa18DCJYS4HltEuQh/czRmv/mZ9r9uzp4nFXVto+/e0Z11fjnXLjX/5Hdq7r+AWnrcuNDyJMXpMnjcnMtLPBvUt5i/iOOsG4bWTFnESioyMjZlOfz5V84pxI= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588841418; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=A4pWlrhdL9T8Rq4NVPiPL4D8ieKlvCJLtG+/pIFicvE=; b=V+xWcvjhm8zELeA7raVrMHmBGEEg5GRz/zmAtrVBmJtcOjtdvoyxMDAp04VTclYTSZ2ezRLur7CQ+prLI+MtGYHYlRVknIZ3AReQnBkAo8E2a5QX/uUrqHiHpPhI9yVKyZrPvnCaqduxcysrYqcz4wYvG8Q83tPY3qukWOnNR/Q= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588841418029627.7821315820793; Thu, 7 May 2020 01:50:18 -0700 (PDT) Received: from localhost ([::1]:54314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jWcES-0003gb-FI for importer@patchew.org; Thu, 07 May 2020 04:50:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52194) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWcDA-0001vf-2f; Thu, 07 May 2020 04:48:57 -0400 Received: from mail-eopbgr80138.outbound.protection.outlook.com ([40.107.8.138]:13902 helo=EUR04-VI1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWcCz-0006Er-5e; Thu, 07 May 2020 04:48:54 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM7PR08MB5495.eurprd08.prod.outlook.com (2603:10a6:20b:104::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.26; Thu, 7 May 2020 08:48:35 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::acfa:5:88c8:b7b9]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::acfa:5:88c8:b7b9%3]) with mapi id 15.20.2958.034; Thu, 7 May 2020 08:48:35 +0000 Received: from localhost.localdomain (185.215.60.171) by FR2P281CA0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.26 via Frontend Transport; Thu, 7 May 2020 08:48:34 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O0r+wwyT4DLPB99vAIOqs0goaIXrXr0lvyB8z34WFySiXa+5rBxaWCrYakvMdRe+HMIEZpRlbbygRDwitFUUOD5XRK3fvivrjIA9SnbsknazYBZRgbQQOe3UbJmhyq1RirrhzwZqF5xcQ24nLU97aA8DCjEWJUIV5wsSCbF6KiS2PB92Kz+9tGEhC73D62X4FPhg+8MsR4jaVNLSvM9eCDwHSjEzcwTJQIT2Zn1x2/uNbC2O0FNRXk/YkLJOUtgC/OJJG+aDS+ib/7Gdc+vQ5cGIVekKt7RVySInZXunfLjSxGpHCEEytH36cWqMXf6PbMd/hkI/pLqrnzyexR4Cww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=A4pWlrhdL9T8Rq4NVPiPL4D8ieKlvCJLtG+/pIFicvE=; b=AAd8O4VgwVJFxstNHCeutX07iu2w8K1/bxvVYVxHVHD19YN76AEjeD+CX7HOpG46upj3IiAy/w21qMGQp9XZkPPEEMIZNIxq0am8Sazzo91Q8hfvkkmVXY6MOTM38HQlbX/DNGgiXPLIAr/fPvWY82mcOto/gEgkWu5oOroLY8J5NwtT+BFFrQNwXFC5F5U9SjRaBDFlDtEb20aWYXYiUYJA07StkIx29aquWJ+CsXwur3JcBCbVyIaSI2pUSQdQZi5R6dPF6x+DBciN7YDOzFzR/qRdppwNIzyx4MlMI3OgDkVHTD/P5wrhYOg2zZG0EizcZgknf45CcIHr74Bo8w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=A4pWlrhdL9T8Rq4NVPiPL4D8ieKlvCJLtG+/pIFicvE=; b=Xjaml2c7iEjcll+rLARMcLOHnKUcYl/pKvfz+rp64PHfXeO0vpVt4lWlfRfvy9rPV94WNVhD8HyRLWAGsiMaZfPodGClCTKf7JQlbZt/oIzDHZyrF7W9q7s8IyWSuFqOt5+XCN1o1TOM8QjOH5Y83EQxutowsLNBW8/I4kPCuoA= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v2 1/9] qemu-img: convert: don't use unallocated_blocks_are_zero Date: Thu, 7 May 2020 11:47:52 +0300 Message-Id: <20200507084800.20596-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200507084800.20596-1-vsementsov@virtuozzo.com> References: <20200507084800.20596-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR2P281CA0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::21) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.171] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c7acfce8-318a-4ccc-1c67-08d7f2636ded X-MS-TrafficTypeDiagnostic: AM7PR08MB5495: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:262; X-Forefront-PRVS: 03965EFC76 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2I94GhPKAElWc32aPhUWS2UVmrPlMfJWsTeBMf+3JHNt9A1sGlhF0xUvL9UqxSwksPjOOmBXpYtzrJ3VUfDlWsk5vezjA1HNdEfSFhVI2CO4fiQM/tQt3EBHBqLnmqSdcvWeVEeIXUNa6QkHIqN5bGky6n4uOaBMz+evUE49CaoEUwawVCrlm4mc0VxUzxEar6wGR6oZwNBGX/gBQaChdtm2sJxgovmYFGvo5d0jLgRZ6btTwZR5325UGbmCsg48lXr9gH4BU4nJiFf+7K+OX00/2sCWYAyAB5IA9HCqnv3BAUVW6lyw5y49YYhOGof3j/O6VhbI4b8tkCPQ/+3noU36J66a7aSuzs0b0fpqgIB1a8rq1rY7K03om4wqYio/zth6aCwXHnikDT2FOVO87Td8ZofutRR433ASrZQyWMVx5y4ubQkgzGHUBFfJglcLOvQv6BSi31nSstM1yKh5GNZ4GFCzx+ZCn4bsZk35WoPw1z1pi4WGGrv7JsGVm3ga6n8waQcz1USUxFdQHoxsxyOhyQEfMcEtgU9DBMZe+slKYHUC4JHv4wbb4NqVZMXh X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(376002)(346002)(39850400004)(396003)(366004)(136003)(33430700001)(4326008)(478600001)(66476007)(66946007)(66556008)(5660300002)(69590400007)(2906002)(52116002)(7416002)(6486002)(1076003)(36756003)(86362001)(6512007)(83280400001)(6916009)(186003)(16526019)(83320400001)(956004)(26005)(33440700001)(8676002)(83300400001)(83290400001)(6666004)(2616005)(83310400001)(8936002)(6506007)(316002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: dThsPGRrlaslBYljFbH2PeOHMUydWdxl4SF8GDC+vmtnUyAqnO66G14Sf3pP8rU92ofNhDBGZQy+3jmLQUf9SfCIouLvHu85UC/qhVqsqGt36Ueiii/SAwDynbGtdi90zy5iUQbA/Hi6vGH04zIPtjidNF8VA3f8O8Cq2BpfKzADz3w3nPbv73xwe4EXM/+16oR1+uZnPLjrV80+vSqe7SEELZzV1SD1qSlp3ob4U9oHuxvCPKL5fLGP8dXgm4V15MIZrGipzHkvPYTRa51XSjcDFXwTWBxqpfFuhXqjmszIsnUf8OpkobezDAT+M5leU1/ZFrSBBnVw5yz2KOciYTG3wHgRrCNdRHoVLs76OXtUwNlOabw1hJvBHFbop6nTmhBtX97gngBlWrEvx1ChO5kEUKYRN7CB37t/cj++fmx5KOhJSySYvy2UmizkrNyVS9RLouxvBrrKkbDBa+Vs7MNx20j9784vkpR1c3MII4uhDDW9XgnP1sJkFoCpQwN+pWrfjKWeBMsoPTSCpjs59mEMcsaE3O395UYxuLM8uqGYI9pO+nS5kCpAFhO1y7nGu+ZE6nDLS+fj6w/7lx5J/SfPFIhIDlq4oqKqdmS5e/KhqTxEWgv3b9qQ/NVN1ASxQwV93+vmB8HX1RsO/aiz3XGVom46/JbTeTnKvLV9Ufd7u0Tkx0nEQM6hRQ1dDiwmvo6gru5mN/Q2/rqkC1WWb7oJkNpeT+w+Vna3fMh0eqik4+mZbgbDLNjhCXE+pjoqntxIH94NjbHMMkfBfzOBmydkWxjORTFGqVhhx/bc6DM= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: c7acfce8-318a-4ccc-1c67-08d7f2636ded X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2020 08:48:35.8225 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: mawCAlJgB5sz98iePCwJubWpGELx/YRUKNaXRWjr5nfJ1FyxF5Mhbvt46TExydM9JX/o4CcJuqAxAn1pfc932dW0EYgonzDTae1XRBR4eZY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5495 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.8.138; envelope-from=vsementsov@virtuozzo.com; helo=EUR04-VI1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/07 04:48:43 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, kwolf@redhat.com, vsementsov@virtuozzo.com, stefanha@redhat.com, codyprime@gmail.com, sw@weilnetz.de, pl@kamp.de, qemu-devel@nongnu.org, mreitz@redhat.com, ronniesahlberg@gmail.com, den@openvz.org, pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" qemu-img convert wants to distinguish ZERO which comes from short backing files. unallocated_blocks_are_zero field of bdi is unrelated: space after EOF is always considered to be zero anyway. So, just make post_backing_zero true in case of short backing file. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- qemu-img.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 6a4327aaba..4fe751878b 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1632,7 +1632,6 @@ typedef struct ImgConvertState { BlockBackend *target; bool has_zero_init; bool compressed; - bool unallocated_blocks_are_zero; bool target_is_new; bool target_has_backing; int64_t target_backing_sectors; /* negative if unknown */ @@ -1677,7 +1676,7 @@ static int convert_iteration_sectors(ImgConvertState = *s, int64_t sector_num) =20 if (s->target_backing_sectors >=3D 0) { if (sector_num >=3D s->target_backing_sectors) { - post_backing_zero =3D s->unallocated_blocks_are_zero; + post_backing_zero =3D true; } else if (sector_num + n > s->target_backing_sectors) { /* Split requests around target_backing_sectors (because * starting from there, zeros are handled differently) */ @@ -2580,7 +2579,6 @@ static int img_convert(int argc, char **argv) } else { s.compressed =3D s.compressed || bdi.needs_compressed_writes; s.cluster_sectors =3D bdi.cluster_size / BDRV_SECTOR_SIZE; - s.unallocated_blocks_are_zero =3D bdi.unallocated_blocks_are_zero; } =20 ret =3D convert_do_copy(&s); --=20 2.21.0 From nobody Sun Feb 8 14:26:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1588841550; cv=pass; d=zohomail.com; s=zohoarc; b=MwJ/KdCH/pGkWfXxlqNjaSgePap0f2P4TNy5ZjjCwV0vd2dui6yDcLEi1ctvVFPgXwNjPbrFmJ+K7ZLswCpXFU9zhiwLysIiAs3nj9jtBYUjRDCXTHpslA+h7uxcFZYHayHIYgTY/zRoq6qpuTo46APo3WJ6DnIDDbINswiRN1Q= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588841550; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=rO/M75YVJtl8je8wd45k4tiRsB6uC+AxB6yt81k+DWk=; b=CnrVvfvvjXwHOx5GEwgpQQIJ3XWQ5odWVxz+BeDXqHtCC0hLMrk/ayVtnhenM7TyvThv7f0USlk27jlz7NiEOs02JxMarxGHA57hQcE1gN0/eR98nWIC4Wwp6rXhuCo9QqdAlzey5oZKi3auCSIk2MP7two6ZI6WLxB8B6u0B5M= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588841550547463.1555877888786; Thu, 7 May 2020 01:52:30 -0700 (PDT) Received: from localhost ([::1]:35852 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jWcGb-0007it-AV for importer@patchew.org; Thu, 07 May 2020 04:52:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52204) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWcDB-0001w5-GM; Thu, 07 May 2020 04:48:57 -0400 Received: from mail-eopbgr80138.outbound.protection.outlook.com ([40.107.8.138]:13902 helo=EUR04-VI1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWcD9-0006Er-JQ; Thu, 07 May 2020 04:48:57 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM7PR08MB5495.eurprd08.prod.outlook.com (2603:10a6:20b:104::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.26; Thu, 7 May 2020 08:48:37 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::acfa:5:88c8:b7b9]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::acfa:5:88c8:b7b9%3]) with mapi id 15.20.2958.034; Thu, 7 May 2020 08:48:36 +0000 Received: from localhost.localdomain (185.215.60.171) by FR2P281CA0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.26 via Frontend Transport; Thu, 7 May 2020 08:48:35 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fw7tTrDKA9Y/W0+CxKbWzVSW14hEb+G7ADguZLCOaPf47m1xmmvNfHhg04+ML88OSLNa6ittAX0gwVXQdDsPGA4YP6onBTk7xzWNGomi2nBLnWLk6cSvHoG5b9Ak3VM6gxa8oGJwVr1ZNU+oMHuBvmuAIEhk7uP7zDEj7KoUGDddckXXCSBzESdPImVYd/o6zBhAKt7XYsArT5ZOwYhPPBWAErbCdMBOBlGUGVUVUc0sOJtAzyalXAKNA9cl46tvsYeftX8UzGMwX7zODr7wsuDYPPEDQzhkhFyI6zfxB19FfLNa6K1gJYQCnnf04FDTD2ry6/+wkcP+JEZuZKmDyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rO/M75YVJtl8je8wd45k4tiRsB6uC+AxB6yt81k+DWk=; b=adR3juPJ+2GRnE5r+uvzkLMhn1UzE06uq7AnceBo9YAYeLCZqwd/ihCx6i9tKz/GjamFtwdrgGEb9ouAIEHjXKbwcvpe+ZiTk+lwWyNJfcIUs58r567kOR17vFlK9yuvcdX0zyq3u6hP9pbGLY1K9R16dLJ8UN74MktbE17u95Igbq7jJJbf3VQDyNzA5vGezPIPRMznJG35PTzDIcynPPsMTzz+fnQpQBIwPF+jdIOejDCDeXO8x27uRMKhZzWiYGtrrgbS+eLSv8xqyuJKfMq8+pDAL+CFVaHIuldCMAgcvASdjDPqLy9gzHRmEf5039jNOsG0/lDFda6DngpFvg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rO/M75YVJtl8je8wd45k4tiRsB6uC+AxB6yt81k+DWk=; b=BLdMS1JHIpwxv5g2GKP9GqOkmkrxcJQiTtaIKszm5ExL0WEhlWASZiaLakKHPXiRW27WSjh191GIXDqWvgE9twEy7mquL07z+SC2j9cj4LzQu2dWVcA5d+7ClAPZQUJF66PkA2d852edG2qqB3CkzqHBR8kAJWcummhPY3SuqZE= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v2 2/9] block: inline bdrv_unallocated_blocks_are_zero() Date: Thu, 7 May 2020 11:47:53 +0300 Message-Id: <20200507084800.20596-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200507084800.20596-1-vsementsov@virtuozzo.com> References: <20200507084800.20596-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR2P281CA0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::21) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.171] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ec9787d9-be24-4553-d151-08d7f2636e8f X-MS-TrafficTypeDiagnostic: AM7PR08MB5495: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:549; X-Forefront-PRVS: 03965EFC76 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: asrqZ7HfeXrDiUJBtQ1ytAtA9On9gjjGJeVVf/keKtaXpi+cF86lMmGg1oV7zNp1aIWm0D1dXs7OxnO4WotQzNKDq1Ahgdewt2gB0SziRVCcQ1ahO4pigkO43N9n9gBcUDfzoNJNvPDsIj1bswBpglhbxFTKDaGIK7LGEqPpPaf9B0dr8kqGiZ8g+SO1NPma9VwEd06XgrHTMkKPcg+Lara3s1LGhO+d02jWkTma+jx1eUgv1VMdOuzqSp2DR2MtwcywJD6swlDy7b8j2Do7uKubI7uQdGvTkHv23ws1WGPUertDYVyprEGZj7P5XJEj9q/AYl1Nm7ESxQMhale2VaOt6zY4gKFVmlpsxBIzreQaJLlMqGqjYl+BFC4dQbE4xfq1d2E3WyyHoJEQdsZ+aeTEwf0Kf1GMJ/6FhBdyJBxPwpVvTcfDexGS2PjFECAGmD+ladkW83s0vmtQ8Ie32Kvg6HddEgus5KQmVxmteP8Bl/30hulqP+HvcHvCzlIaOAyS3p37HbIl1VI7qEfBmjBHQ/6C2naqGjXjcwqzpndeFpBgUJCB7uaNdXwMvZOh X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(376002)(346002)(39850400004)(396003)(366004)(136003)(33430700001)(4326008)(478600001)(107886003)(66476007)(66946007)(66556008)(5660300002)(69590400007)(2906002)(52116002)(7416002)(6486002)(1076003)(36756003)(86362001)(6512007)(83280400001)(6916009)(186003)(16526019)(83320400001)(956004)(26005)(33440700001)(8676002)(83300400001)(83290400001)(6666004)(2616005)(83310400001)(8936002)(6506007)(316002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: W5B4SAzvUtoYl0kD6mXE+l5HYonuN5lQXE+puUxbqzFd1keFJd68iDukjzxpzc7NO7iuEv0fFV4TxDQEGtvIwHGHsbw9a1niuJLhmxzPf4Nr1f1vVNWgFghQzCZVAfIJexIi2T6ckW+HJ83i32MJT46fFgd6DOOBkz0lc/6NiDgKPf94u8Huru0XKj11uiMacA/IolKa/oOJUh5KNHDnN89jWPNsZtGjjsWefgezksqTz5ReAR5fKdYmQVQ2LaeZei3+sASpBX1f29cdMeCzsYILiDry4QsFd+BhHjGqIgSfSa8JFyPjL5q0lK8gdzPZ5tpvusFCmrwiPTQ6nZ9nJkkvZiWWLe/57OIV1HBBWjcgz1iWK9Ow0pSGyXaO0deFj/zeZGOiTqERDWOupq4+F+rQPMVO1tRQBZ/4+9NpKCIAGPKsyb930oX0L7lJ7hnUN+XfEzfVJnOECCa+bybWYSWXT8V1TdbHFaklNnKCoIAu55jBAvsNQDmly9gstcTxOQyPSKU6fidtvMU/yQ7OcgMTjpOISidiRdt9hDY92RM23NrpdlUIRkuKcC47ei6dhCZ+B91lcsj0V/glJD2YNHgQ8EdfCW0wYlL4m1BqP6o4wR3w2nFq2/epBfcHOy0Z1ngaYzkyEmSEQBnPJj4IuZHCXBF50AW67WfsAeDQhDruJIw632cAEqK6WEElD8i8B6jd1Xqf8QEZvXM0ePzsBM/iDXSvRT5VLMXOuj3hGQf1hy3VFPy6ZhTVu5oUX2iiLrwkExEx+G8wKDyJigtRsV9CjzwEFoni2SLfOJHRf2w= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: ec9787d9-be24-4553-d151-08d7f2636e8f X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2020 08:48:36.9127 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: T4O8832rIOZpEGhWo9YELOAyOUyA1PHeZc9/WrtURbduvSQrTl0UO2O1mdhYEWqMyJtrWZrqUzy/U97AxIYwpw/hu4JI/p9egu5HjZ4Lj6c= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5495 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.8.138; envelope-from=vsementsov@virtuozzo.com; helo=EUR04-VI1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/07 04:48:43 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, kwolf@redhat.com, vsementsov@virtuozzo.com, stefanha@redhat.com, codyprime@gmail.com, sw@weilnetz.de, pl@kamp.de, qemu-devel@nongnu.org, mreitz@redhat.com, ronniesahlberg@gmail.com, den@openvz.org, pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" The function has the only user: bdrv_co_block_status(). Inline it to simplify reviewing of the following patches, which will finally drop unallocated_blocks_are_zero field too. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- include/block/block.h | 1 - block.c | 15 --------------- block/io.c | 11 ++++++++--- 3 files changed, 8 insertions(+), 19 deletions(-) diff --git a/include/block/block.h b/include/block/block.h index 8b62429aa4..931003a476 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -431,7 +431,6 @@ int bdrv_co_pdiscard(BdrvChild *child, int64_t offset, = int64_t bytes); int bdrv_has_zero_init_1(BlockDriverState *bs); int bdrv_has_zero_init(BlockDriverState *bs); int bdrv_has_zero_init_truncate(BlockDriverState *bs); -bool bdrv_unallocated_blocks_are_zero(BlockDriverState *bs); bool bdrv_can_write_zeroes_with_unmap(BlockDriverState *bs); int bdrv_block_status(BlockDriverState *bs, int64_t offset, int64_t bytes, int64_t *pnum, int64_t *map, diff --git a/block.c b/block.c index cf5c19b1db..0283fdecbc 100644 --- a/block.c +++ b/block.c @@ -5305,21 +5305,6 @@ int bdrv_has_zero_init_truncate(BlockDriverState *bs) return 0; } =20 -bool bdrv_unallocated_blocks_are_zero(BlockDriverState *bs) -{ - BlockDriverInfo bdi; - - if (bs->backing) { - return false; - } - - if (bdrv_get_info(bs, &bdi) =3D=3D 0) { - return bdi.unallocated_blocks_are_zero; - } - - return false; -} - bool bdrv_can_write_zeroes_with_unmap(BlockDriverState *bs) { if (!(bs->open_flags & BDRV_O_UNMAP)) { diff --git a/block/io.c b/block/io.c index a4f9714230..00e7371d50 100644 --- a/block/io.c +++ b/block/io.c @@ -2386,15 +2386,20 @@ static int coroutine_fn bdrv_co_block_status(BlockD= riverState *bs, if (ret & (BDRV_BLOCK_DATA | BDRV_BLOCK_ZERO)) { ret |=3D BDRV_BLOCK_ALLOCATED; } else if (want_zero) { - if (bdrv_unallocated_blocks_are_zero(bs)) { - ret |=3D BDRV_BLOCK_ZERO; - } else if (bs->backing) { + if (bs->backing) { BlockDriverState *bs2 =3D bs->backing->bs; int64_t size2 =3D bdrv_getlength(bs2); =20 if (size2 >=3D 0 && offset >=3D size2) { ret |=3D BDRV_BLOCK_ZERO; } + } else { + BlockDriverInfo bdi; + int ret2 =3D bdrv_get_info(bs, &bdi); + + if (ret2 =3D=3D 0 && bdi.unallocated_blocks_are_zero) { + ret |=3D BDRV_BLOCK_ZERO; + } } } =20 --=20 2.21.0 From nobody Sun Feb 8 14:26:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1588841420; cv=pass; d=zohomail.com; s=zohoarc; b=Ol6iqW6pHDxAP3Wy79pLk4zhKsDicN1ET5vvKfjuaV2dYzU8zF5TWpds5AvsHCRSQJej7D0Q9/HTo6nK19dvbilkVrsUckIymtdQ1C9d4fCqbPw2w3m4Ox9kCItD3vx7zpZrRr/w35PjpyKnVJxfz1F4rOsxh69OGWy5fVRjElg= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588841420; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DcbgjCYYvhfsWp15T1RdkWOxF9JlG4jbjmNvT/in/0s=; b=dmzdW+Nzn8qv83uVRsnzDtTXdQuoFuedguAsxv87uUHiXclwJwQwlcnAsLA1j277LdXMxq/inF+/2MpzPqj3xFFdRSodCPNyaK/t0IZi7gZ+A2mDZVbLqywhle3F7oqTcenMRnEd3mfM3NZn0wRAvx6ZUOApREtocUmRw9joFpQ= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588841420477655.6508195470985; Thu, 7 May 2020 01:50:20 -0700 (PDT) Received: from localhost ([::1]:54464 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jWcEU-0003kb-Vi for importer@patchew.org; Thu, 07 May 2020 04:50:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52212) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWcDC-0001wW-C3; Thu, 07 May 2020 04:48:58 -0400 Received: from mail-eopbgr40111.outbound.protection.outlook.com ([40.107.4.111]:2308 helo=EUR03-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWcDB-0006ET-FB; Thu, 07 May 2020 04:48:58 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM7PR08MB5495.eurprd08.prod.outlook.com (2603:10a6:20b:104::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.26; Thu, 7 May 2020 08:48:38 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::acfa:5:88c8:b7b9]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::acfa:5:88c8:b7b9%3]) with mapi id 15.20.2958.034; Thu, 7 May 2020 08:48:38 +0000 Received: from localhost.localdomain (185.215.60.171) by FR2P281CA0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.26 via Frontend Transport; Thu, 7 May 2020 08:48:37 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PXMAxRhHVSPe8GaY0ug2ibaeqMlyBeWTKzVlHiw2Qo4dqevkUQgslW27hnH51kh8HpcnQ0UEE9klOtsx+CYm5xonCBmfM6j3Qw2HAjOLUMF1qNwi5TTMwp8k30KqIOIcCfESIT3jnCA/Dned/hbkbjU9g+Xzli3anWob513cF0WaRSJO37zGvENSP+jEVHodALLtQqlyUF3691WavFaU/yodXiBkvZsAQy68EoGvv26ETezHQTiG9WKwLG2kxvkFZIzccj/SG6uGOwJNECoUklwa/fkjOlILBIANWzAtdWd2c7QIYoHHFuP9gQN4NVU+CTeRtlMYWCtqJ9xqQxITSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DcbgjCYYvhfsWp15T1RdkWOxF9JlG4jbjmNvT/in/0s=; b=cOZdpyR2FjPiv1kzfWZD7ZG4WU7INPbRulr287T58/scoyJDO1kXeEURNE4FMDskz6EGftbJj/EVyRhpCqk9WOWtHzjGhyALLZK+0SoT7KDqQ2V3iy8ffwaZSPUM/C6q7O2UDPyp73KZLfb+bxkjbmawkQSTv7+ymVkUwhoI2d25hImCz8pPuCMH3cPfbW3qhT5R4quPINOF4CNUjQP9kfvIxZQYEtz90fBXG/A2sE3dW1zvSIpBuCMeyvnmgo7UAduLZTWc+QSohxirjeEwh8k63w7LLYEYJrqYUQz9dY4pgP6D8LQTRIZnd9r6XgG0jh3u1R5wKW/3DQYNvL0Zmg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DcbgjCYYvhfsWp15T1RdkWOxF9JlG4jbjmNvT/in/0s=; b=XoxHw4EpTK0YPvahnebBgrdqnX0ReQDs7Ccfi1IwMHshqvQ9+iDzucx3yVQX/k74KO5jL3EUHjpHKIPKPZ4P2h+Ym2mTX7xyabNQnmL4Ak3Ntla5ZKD0kZdOQ/VqAd5Jyccuvz0Ti6vpn18AmAR0EFLpDj0mOKixONsuah9IyyU= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v2 3/9] block/vdi: return ZERO block-status when appropriate Date: Thu, 7 May 2020 11:47:54 +0300 Message-Id: <20200507084800.20596-4-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200507084800.20596-1-vsementsov@virtuozzo.com> References: <20200507084800.20596-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR2P281CA0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::21) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.171] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 38e8a38e-f5a8-4918-5f57-08d7f2636f32 X-MS-TrafficTypeDiagnostic: AM7PR08MB5495: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2887; X-Forefront-PRVS: 03965EFC76 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4dmncv1BX6QvOdhpQ5FKAkLfywAv8+Pyt/rhcGiodmc/ZG0xPIQfMcX5hzU4n6HjHVaVqe8zBZSzCtXTYuyuxfYNLXdM2CY+o/M+uG8Qx8VzjKYdPH6CFaBe2BC7hdbA1rI3sGc/vzNC9YT2w15gybJLniTjX5RzjxrCe2YYD34Vz1buy9cS6F7V6NPASyOPUJYo/9R7icqiszYuYlbH+aOlSFP+Uxllp9RDocrMHfq1Sn5CHPxk5RJbGT1vM1B0e3boQWloTK6rEHNmCDKoSDHRzeLNShUTu3YYe7cmwFBCzn77+56fSg27s/TnH15vF3ZN4e5qpKDAc+cLZt7rPacVJjcnWm6QmRgyM07ryOQoad3biHNec2UpEy5DMoj+/0URPA71awsIwf54yER7rS+0OPJ1I2GBdoU0wkdpmi99bRwB12Rp9RqBg8UIXdgTPWJ1yec4qLOH9gosVGzdi/qcgfslNDYl+1ahsSCJjlie+v2APvG4KWnSln6axrS7AeoraXUXblDKoqVaXBF41QcVjIe/fhVL0sf6TlXs4agkVQeonxQwzGEdSukxZ+Z6 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(376002)(346002)(39850400004)(396003)(366004)(136003)(33430700001)(4326008)(478600001)(107886003)(66476007)(66946007)(66556008)(5660300002)(69590400007)(2906002)(52116002)(7416002)(6486002)(1076003)(36756003)(86362001)(6512007)(83280400001)(6916009)(186003)(16526019)(83320400001)(956004)(26005)(33440700001)(8676002)(83300400001)(83290400001)(6666004)(2616005)(83310400001)(8936002)(6506007)(316002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: JyxStYvnbb0oViBzGWvJGFF0VeNYtbgKW7Q0DEGljD2Z2dJR7WQzINJXt3SfncMPOuxkWi759gtFiNqjQjEXCtbctDe2oftlcj6d7V/rDQxssaeU8HjZEWp+oy7ahAsMibpub1fH1ozNNIxF7U1ZkgWnbn56k3qQneyi0zcBlYysImocFJH3d4gsrMIOomko8Yn9s97R5JT+q2ekrlOCG041XxyfbuuhyRqoTa3ce+HGqowIxjEfxcWXrAPtd7mDaT3YxeWN7F9WWB33Ii7Pqm9L8L8Upck9iZO8NpbIiPb5QiS9eU3BqSl5eWk5ygcKpMFb+wsgoC8aTi8XeozQyH8XYarNngU9lDxJ5lPVl9ofdfmCSGL1WXEDZvB7YHcomWe5qY5ykGP7nOIW6IHjbLYwKfeg5HOzsJXUE0x0l8MW1LkWR5FIBICsMKhkuDaZhdITxKIMv0GW2T2wi0QVkv0zRHtlidVLRbRhkPTZu1GIRRRIxXHq84xuTeuDbddZvFwt3CGPz5NiezzvvwlQgMXuSyvkhdnulXUkOQ3GVKK6BLHL4Qb2ZVIwJ6Pdj65dfJs13NoBqjN1711EI9BAuMnLZMEVWZ4VhavQsyBygrpCDeUC85m+WpQR5BTgDIc1yiBneU82BeRwLUa+5XzbW6ST/ZegkSjSjk6h3d+aiuE/2raNzrLnVDkguljyBHRJQuNXLh2ev6869mhQsU2VEjYyK8IiOfsvmD9TtkoEEvqKNYpmrs6Jxcc0LJS9Jp/sG+rOzi/hG82H7DYyE0TQAz+jocwM+gNonlPHNXYQGDo= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 38e8a38e-f5a8-4918-5f57-08d7f2636f32 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2020 08:48:38.0188 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: qBlkmBzS49Bmv9xFrdfv1c4O3pMHCVMb1D0EP36U6aD0AYpMNvVQ5KHtvpH182ATweqt6JVC/hfMqttKi6j+EoIY+HhzDIPoq7BoLrm11Ew= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5495 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.4.111; envelope-from=vsementsov@virtuozzo.com; helo=EUR03-DB5-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/07 04:48:35 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, kwolf@redhat.com, vsementsov@virtuozzo.com, stefanha@redhat.com, codyprime@gmail.com, sw@weilnetz.de, pl@kamp.de, qemu-devel@nongnu.org, mreitz@redhat.com, ronniesahlberg@gmail.com, den@openvz.org, pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" In case of !VDI_IS_ALLOCATED[], we do zero out the corresponding chunk of qiov. So, this should be reported as ZERO. Note that this changes visible output of "qemu-img map --output=3Djson" and "qemu-io -c map" commands. For qemu-img map, the change is obvious: we just mark as zero what is really zero. For qemu-io it's less obvious: what was unallocated now is allocated. There is an inconsistency in understanding of unallocated regions in Qemu: backing-supporting format-drivers return 0 block-status to report go-to-backing logic for this area. Some protocol-drivers (iscsi) return 0 to report fs-unallocated-non-zero status (i.e., don't occupy space on disk, read result is undefined). BDRV_BLOCK_ALLOCATED is defined as something more close to go-to-backing logic. Still it is calculated as ZERO | DATA, so 0 from iscsi is treated as unallocated. It doesn't influence backing-chain behavior, as iscsi can't have backing file. But it does influence "qemu-io -c map". We should solve this inconsistency at some future point. Now, let's just make backing-not-supporting format drivers (vdi at this patch and vpc with the following) to behave more like backing-supporting drivers and not report 0 block-status. More over, returning ZERO status is absolutely valid thing, and again, corresponds to how the other format-drivers (backing-supporting) work. After block-status update, it never reports 0, so setting unallocated_blocks_are_zero doesn't make sense (as the only user of it is bdrv_co_block_status and it checks unallocated_blocks_are_zero only for unallocated areas). Drop it. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- block/vdi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/block/vdi.c b/block/vdi.c index 0c7835ae70..83471528d2 100644 --- a/block/vdi.c +++ b/block/vdi.c @@ -334,7 +334,6 @@ static int vdi_get_info(BlockDriverState *bs, BlockDriv= erInfo *bdi) logout("\n"); bdi->cluster_size =3D s->block_size; bdi->vm_state_offset =3D 0; - bdi->unallocated_blocks_are_zero =3D true; return 0; } =20 @@ -536,7 +535,7 @@ static int coroutine_fn vdi_co_block_status(BlockDriver= State *bs, *pnum =3D MIN(s->block_size - index_in_block, bytes); result =3D VDI_IS_ALLOCATED(bmap_entry); if (!result) { - return 0; + return BDRV_BLOCK_ZERO; } =20 *map =3D s->header.offset_data + (uint64_t)bmap_entry * s->block_size + --=20 2.21.0 From nobody Sun Feb 8 14:26:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1588841420; cv=pass; d=zohomail.com; s=zohoarc; b=KCZZVnighiCYhaCBCEvQYiG1Y/sb5jaTXVacHggdJGQD0NCwKRh148wiOc2ghooV1dK7ww2WBWSHuXmpjtaImJTgTJmSpW1IUcOUJaawKUwnnM/h9yfEsTKI1pE0WICvVBYDEzR3SPE09pVtiuE8BmEcZqNOOQXsysFLD3uTGa0= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588841420; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=oPSUYPd3IO6BcOKuN2decCqpqrULTee4ydrzWE+/T3Q=; b=ba9+eswtFhNlyNbaknwmyiOSOkwaWXHO5jqzBc2OrB4rB28zp1AxaqQ9FzyYv/uWbAPPQXTRVjrsw6K8aQqpxZW+xFfSmnboPU5XEx2UPIOH4vtcbfF4gj2V/6ikfpLUKIuE7lSboOzgDbATC3Nia0FmAb9WL6WgOFiTJftHhgY= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588841420568134.50174272287325; Thu, 7 May 2020 01:50:20 -0700 (PDT) Received: from localhost ([::1]:54478 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jWcEV-0003ky-3z for importer@patchew.org; Thu, 07 May 2020 04:50:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52222) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWcDF-0001xb-FF; Thu, 07 May 2020 04:49:01 -0400 Received: from mail-eopbgr80138.outbound.protection.outlook.com ([40.107.8.138]:13902 helo=EUR04-VI1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWcDC-0006Er-4w; Thu, 07 May 2020 04:49:01 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM7PR08MB5495.eurprd08.prod.outlook.com (2603:10a6:20b:104::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.26; Thu, 7 May 2020 08:48:39 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::acfa:5:88c8:b7b9]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::acfa:5:88c8:b7b9%3]) with mapi id 15.20.2958.034; Thu, 7 May 2020 08:48:39 +0000 Received: from localhost.localdomain (185.215.60.171) by FR2P281CA0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.26 via Frontend Transport; Thu, 7 May 2020 08:48:38 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iXPgKKYOlXRtWUS/lXf4MIc8nNRUim9uNaz7orzj8RkaYQOO17YT+FqHoaxxj2QiUU6cLgFamXW2TKwTC4IvjowZyMY3TIMv9m2XW7nkTzAoEwr6WQcnX15DRiizFJ+6hh2k12iAhtRFu0PvBGmW5Z4PpJul6c9oNU7XVlNEOskzEfhxFOy4KimVrgABlTpi/kKQ62DhMQ2OJfPoKOYbQpN5oiavyIJyxmkuMktuUR+DsnXKvFCGHTy3cxeFLyPjIFn0Ssqn/K7mnFVwxujQs+tqyCC7obe67k4kCrKa52mjpTwOffYfPsEhvXySeqWLIKqkxmO14HoGVb9EGQUF1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oPSUYPd3IO6BcOKuN2decCqpqrULTee4ydrzWE+/T3Q=; b=Rj32mQoL9AfKe6Mxol21LhDzdLvCk9Nog3Z20+Czy5F6Z/ad1XSJT2lqucllJMdgD2jwXWqzv/Bc2qlJpIkZKAWIEIUZUKlqHmWp4ftJC4zj4Rh2mWH7XlUyQhYrcJihsSnEtGwDA1DVjjzaXOFwCSbdzeXySFPJop+sjm2VygY6rmrVQ3d0xmMGpSmxXsInjoa+KsPgnGXQ/XpB+YTcHDlEXJEWhASg1TSOSKlIwqswez+gSwbftudfcJLUQpu7/JL0CQ4naAY1poL1aiSkGCwHyOY3+i+GuRJX2QMZySt+vewbhJ2GV3zXCGtesNjeAmY9s6BZvosvlK9C45MTvQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oPSUYPd3IO6BcOKuN2decCqpqrULTee4ydrzWE+/T3Q=; b=WM4YLBJgXH3LcjWqZcmoDecroc3e53ain8vyJUydX8wgmRSUtLhu2eItQOPyMM1955PDX2X/noP+k5+cIHDvmyXOd1EPWhE6mNpn2A5qNb82/BqosQbX1ru9OyMIM2j/CCTrmMgyMMjX3VW1cAjH2yDWHkwQbx5vmRk2XvE9zLw= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v2 4/9] block/vpc: return ZERO block-status when appropriate Date: Thu, 7 May 2020 11:47:55 +0300 Message-Id: <20200507084800.20596-5-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200507084800.20596-1-vsementsov@virtuozzo.com> References: <20200507084800.20596-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR2P281CA0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::21) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.171] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 69d75208-2fcd-43a3-0765-08d7f2636fd9 X-MS-TrafficTypeDiagnostic: AM7PR08MB5495: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-Forefront-PRVS: 03965EFC76 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lj7yT6Evd7TVJgdnQbu01sTTU1HqZN3Rn49K5E7iG2l7B71jV6d99FbrV+XkZK6kUgUkYe1/gfhPup4bVmNzdLk7iqnLgBwGObuOApyMEQNcS+Lr+nCy8ibJN2I1Pm3myIr+GlkgPzYa1SvaddN7PfnEh4f825b9y0LoGR/e2Em1P/u5T5WJvM8VHUtRv68sUY8XiQjA5FoRWxVm2ogLATpF/WhyOuhtlZRka0QV4gxfvZUi6+HBIh4s6oYdF1Q/emensDJR3XiPYPQFDgDgBW0+4WEhgaR6FYHOPhQO9RmxdawVFAStAoCZ7YiB2gWJgAWCRYkhhknb3kwZ0yTGSEiPCrVzEj9t0ZioYZRTQNrF/3mfW/zUngByx26FXtdF+/fSLxyjnkbxr3yQbxTYfmk/ZRQQCPDa0RNMqseCR6ch9/ob6aIKYB0KOTS3aa8jcEnIlS32+NGjncmaKDX5D9xRTzaEnZA9gcb8knfyK97y+k142anuD7J0MiI3N7VUxXjdMhis+4eaTbwRaKXQ2woSWWZlISHKrySgMEAiIuN24lPIDNS/1C13S4Ei7CZs X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(376002)(346002)(39850400004)(396003)(366004)(136003)(33430700001)(4326008)(478600001)(107886003)(66476007)(66946007)(66556008)(5660300002)(69590400007)(2906002)(52116002)(7416002)(6486002)(1076003)(36756003)(86362001)(6512007)(83280400001)(6916009)(186003)(16526019)(83320400001)(956004)(26005)(33440700001)(8676002)(83300400001)(83290400001)(6666004)(2616005)(83310400001)(8936002)(6506007)(316002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: AHyG4rXsP5a1W99uHC1u4+Egv/NOAAnHc5x2Xlc3ygCjfe+GkRbhVAPeQwZFC1VMnyDi9m6zAMkF0xYDi0i3KRkWbsFtb4wPVD2LBFmav34N2sTO/OZ9OooGYoviO0tFauK7M+VLIA+XYV4JSfWJfnrLjk7Z3cZG1X/TtUDOC3eg90eECmYFsJxmWjiT4Op1u5MwfdUmcOQBuvmtG+J8mDbwXX6P5wYix8O34jr+x6P+CYCI2KrgEtOgJro4r6qNjqRmM7o7tpWXGCGJS3kxcEBCpcEP/5/8fcq/cYZ0crFsyfg8zN64Kuwb2MWd/Kxn4kS0Nwauh9yoY7KuZ6FJa+V9kBR9r4ZIg9gfndPodJwOcNIFobM1aSFfcgcGKVLvUO7pmAonApkoY0rOpkfEYUh+2ZH/ezcUoE3mm/MxZJY2lgYaUoSdwPaN1oM1a1LOk2rBOV+Uo3rRBLn0kiuGE2B02C0TXSpjGwkvh4zZ+Yzq6OImS3Pgu+yqN0jMBZwR5zo1vpd55g0sPklYSEGw44sSphhqk10Qdb3QnYzpy5Vx47Vx/W/LrswauL7Ti8uEZ1vdLzfTeVEpfsFSz35G4myTMP/j7rabPro/2U7iGy8xTnlHFjDbLluPVuURohTC56MS8K1QyTWGjKz3W4xxtM9v5rCoirNIVeA77NzMakQaJm7GC9VLfhREOPPRfc2NxT5FLuuzfTZ/oN1ho3/Z7yD+B8haV+c11zIOUjYu/8QmvQn0TBa6S2XNGVia7qFmqCivVXVjSp3kC/EzF8n5xKhKX+T2CMYiDbW24spG6fs= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 69d75208-2fcd-43a3-0765-08d7f2636fd9 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2020 08:48:38.9896 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Jnl1lVPErGMuGITbyxGovTnvoIPj5O+hnm9publpycqhXzQOWtvn+V9N3BFljE8VEUUZ4r7bEd19ps9O9KOod7smMssbBku3GZDvqKTDaAM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5495 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.8.138; envelope-from=vsementsov@virtuozzo.com; helo=EUR04-VI1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/07 04:48:43 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, kwolf@redhat.com, vsementsov@virtuozzo.com, stefanha@redhat.com, codyprime@gmail.com, sw@weilnetz.de, pl@kamp.de, qemu-devel@nongnu.org, mreitz@redhat.com, ronniesahlberg@gmail.com, den@openvz.org, pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" In case when get_image_offset() returns -1, we do zero out the corresponding chunk of qiov. So, this should be reported as ZERO. Note that this changes visible output of "qemu-img map --output=3Djson" and "qemu-io -c map" commands. For qemu-img map, the change is obvious: we just mark as zero what is really zero. For qemu-io it's less obvious: what was unallocated now is allocated. There is an inconsistency in understanding of unallocated regions in Qemu: backing-supporting format-drivers return 0 block-status to report go-to-backing logic for this area. Some protocol-drivers (iscsi) return 0 to report fs-unallocated-non-zero status (i.e., don't occupy space on disk, read result is undefined). BDRV_BLOCK_ALLOCATED is defined as something more close to go-to-backing logic. Still it is calculated as ZERO | DATA, so 0 from iscsi is treated as unallocated. It doesn't influence backing-chain behavior, as iscsi can't have backing file. But it does influence "qemu-io -c map". We should solve this inconsistency at some future point. Now, let's just make backing-not-supporting format drivers (vdi in the previous patch and vpc now) to behave more like backing-supporting drivers and not report 0 block-status. More over, returning ZERO status is absolutely valid thing, and again, corresponds to how the other format-drivers (backing-supporting) work. After block-status update, it never reports 0, so setting unallocated_blocks_are_zero doesn't make sense (as the only user of it is bdrv_co_block_status and it checks unallocated_blocks_are_zero only for unallocated areas). Drop it. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- block/vpc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/block/vpc.c b/block/vpc.c index 2d1eade146..555f9d8587 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -606,7 +606,6 @@ static int vpc_get_info(BlockDriverState *bs, BlockDriv= erInfo *bdi) bdi->cluster_size =3D s->block_size; } =20 - bdi->unallocated_blocks_are_zero =3D true; return 0; } =20 @@ -745,7 +744,7 @@ static int coroutine_fn vpc_co_block_status(BlockDriver= State *bs, image_offset =3D get_image_offset(bs, offset, false, NULL); allocated =3D (image_offset !=3D -1); *pnum =3D 0; - ret =3D 0; + ret =3D BDRV_BLOCK_ZERO; =20 do { /* All sectors in a block are contiguous (without using the bitmap= ) */ --=20 2.21.0 From nobody Sun Feb 8 14:26:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1588841543; cv=pass; d=zohomail.com; s=zohoarc; b=kOQttEEeWY3zvNJEs8UIgsL7ZmBVwGCsEi732HY8dUWGGiwkFpljawD4PDRqub9TLNDzedeMU9AZi7CEHWKKTTNAYrBwijXjNGcgFOPoiusQc3d74V7S8I7uWdCZyHzOrmEDMGaeH4fxpNkugtdRSKeArzS73vALtN6qlnYB5rs= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588841543; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VOaypRfiO7/3OqqGZj2p4/wH2ojzLpzi22c9NHEezSA=; b=NrsExTdDgXVNQx7zaTGPuV7TvFK29POZ7y3mOu1Jxw7fezmTcsluE23rPmleJCwtrpYmJs/LFhKaSx8oTDERA2t1wvFinkCwCmWklv4b14QraLMYk1I5Z+gSVXOqA4kSDQD5mgSGVLFB7AfAGHcD7KSPgciIs5Ka8qLuN24VVwk= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588841543253344.4835070912509; Thu, 7 May 2020 01:52:23 -0700 (PDT) Received: from localhost ([::1]:35284 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jWcGT-0007Ur-Me for importer@patchew.org; Thu, 07 May 2020 04:52:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52224) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWcDF-0001yV-Tg; Thu, 07 May 2020 04:49:03 -0400 Received: from mail-eopbgr40111.outbound.protection.outlook.com ([40.107.4.111]:2308 helo=EUR03-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWcDC-0006ET-WA; Thu, 07 May 2020 04:49:01 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM7PR08MB5495.eurprd08.prod.outlook.com (2603:10a6:20b:104::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.26; Thu, 7 May 2020 08:48:40 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::acfa:5:88c8:b7b9]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::acfa:5:88c8:b7b9%3]) with mapi id 15.20.2958.034; Thu, 7 May 2020 08:48:40 +0000 Received: from localhost.localdomain (185.215.60.171) by FR2P281CA0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.26 via Frontend Transport; Thu, 7 May 2020 08:48:39 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YIJtBW6Zj+VyX+/03ECgVG2YsrA1B1lvMXu48QCuxyBruDLDQdMVfYXAOPNn/Lh/r2IODRhUDQ2FgsPGnLLKxieyir1EssRm5ZU3RlKOost6Ue11depn2VMGQkuMLQqyxhTBeIPAksC1aNxYTyYCtvtTnaNG3JtDdtsD00rmR9R/QvbBxU7mI24lAYCfycLqBJ+yVdIX7wZpBsAwEFZmANcLNlxRfqg1fZb68hCmeEu47Rsf9cI25eko1p7qmEuTNsWC6bSfTo4k7Z4Q5yrJ2BCOmaloNX6MbGSIGToV/vLFwklGkV/WwOjlYcoxZmg0P1mUGxZ+yiE0NeWVOhKQxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VOaypRfiO7/3OqqGZj2p4/wH2ojzLpzi22c9NHEezSA=; b=MMmddUa7lgHY6X1phFIqLPW9XeBUuEK4lJVhb1vnPoapjaiRJAHe81L9MBrNnZDOjsVD07b8DyyeAfirzrO73vhZIMAtxuhlKSTOf4rSxtMSlLVKtPAQ6VBRXpTjaadS5TfRlt8bVjZozSXt1BIl8m183XwEe66FQx+wdqIMT61K4z+IiOgP0wK5f2v7Ogg3Q4dDMWC0taopjZYBc8s711i4W1UtJML4h52TyppluhWPDwW8N1qalmUnN/Y4WQ2+/niNfT1x3n2TYwhS6Vcv9mh+HDF6eGt6GnVUsOWNFE2D+715ZX94W8GQIUiFHd31zkBGnx6Leew9fJmLrVe0qw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VOaypRfiO7/3OqqGZj2p4/wH2ojzLpzi22c9NHEezSA=; b=jrHo+C0eydLuhqBTSifXKvqhGGj58rODorn+BkpAGhdtOOJrumfib+/YgR3YxB2AP4gdZ1alem/UE2XTZbE20YKr6t0HDndTyAIcKejxvlyk2RHjLaIFqhoGBA3pQTO8ZYMwZOIZqdM2vNiXf+WL2ItNdlLNTNXUn2EguwWNv54= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v2 5/9] block/crypto: drop unallocated_blocks_are_zero Date: Thu, 7 May 2020 11:47:56 +0300 Message-Id: <20200507084800.20596-6-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200507084800.20596-1-vsementsov@virtuozzo.com> References: <20200507084800.20596-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR2P281CA0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::21) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.171] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b1524f8a-6960-4497-f37a-08d7f263707c X-MS-TrafficTypeDiagnostic: AM7PR08MB5495: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:632; X-Forefront-PRVS: 03965EFC76 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CvyA7cFmzc396adzgQB2RNSrBrgGevptgw9hYoUdiGZHvCd2/EeCOWVWBt2/ND81sOpApe96sksZjRZt8I5GQLc0/IFH2MFxIetXyPS+5H7n5Rt++DchRYxMXX3dY8SlC7Fm1UVD/tC2JLPPod52fhCy3tO1gOrh3ZZ3hHMR7k2ZofzxIx7xg1cUlhzEYw9wX9+VJNvlKBHNe/1/kmEIEs4SJYTOCSnvsuE0IYbVt3kVRuEkxydqZZqzW5QR7jLWG6pBXsPPp/5/7UMLkEEmkg7RcQj0su2ABJMar54MQowy8JC6sghJD+Lh4uSVmMkjHzrKRlpsqcFt8AfGXPwen2WhApY2mr3J8ZZIV3D/xY9cb2257yNbKY96Nn6tF8yi4SGX5a/f61JW0eIcnbIBOEDZSTGXHFT3PKOW0cgGtyPWr8mvhcKvyfXcoD6sSlWfNoN++qz5BuxcbiKbVZ0rBuF3VjUNQwXcMylR5Psee47Vs+31PkRQ+CwwgPr4El2S+mn61nzrIuwEVeaW2wanWWIcaXvpRC1P6Dfb9NuAx1NATVcR4rHuWTfVTx/QhpwL X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(376002)(346002)(39850400004)(396003)(366004)(136003)(33430700001)(4326008)(478600001)(66476007)(66946007)(66556008)(4744005)(5660300002)(69590400007)(2906002)(52116002)(7416002)(6486002)(1076003)(36756003)(86362001)(6512007)(83280400001)(6916009)(186003)(16526019)(83320400001)(956004)(26005)(33440700001)(8676002)(83300400001)(83290400001)(6666004)(2616005)(83310400001)(8936002)(6506007)(316002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: T2l/B+c/dop2L3u/Z407y39iPCWtkcvAP0uvtaC00EAIkX79jsx5HJ/wNVGFvIVd6fQSdF9IwjBw1dFlklRw5EW5Y+qFzKTVhU0aZPjsK0OYLlglTju2ACxT6Uvbt0m59JwH/PcwwJmAJu5PAmP6hWjWhpG90QIllWESvbjxcrUkNVwB4XVm0WbGtIbHM4xRG6FTlqsQaVezH6I07Jo9LIEVow/icG2a4d6Yk4L/0sxN6r0MR/RqkXj34kkdXuYmlva8ICfD91UgYYFh2Mbt5cMcV8u+RCNEQtrl0S0d3i8lmb2P+OdrAAtM0ZW4i23GLevo1itpU0si5c4imES7RbnVmZ/eX7Y1fFq9oSWeyIQCGUUhGummKVlNlBopdBbcQm1KbEiEEELjUPj9CbwKamJ1fcJko/bRtSTolGKTtyGPsMg/FKIAUthGH+0L6c0yDDxznueEMS4onOGm/Bk+5Ll+QSxcFjyDoNlXmwnUB4SIDznutpCdpUNC6pL+YA53GxLaZK2Br5+wVqFnw7ugyqoi8P9kVEcZ6dB0OuFKiDuwhulA5m6lVGmufqHZTwDp9d7icfHc2++vWjtCBqqehQ6qatUD735R87rW1t7q5M8rM2vj5Ct9qg/+9ZguJ0tv7vzH3C53HV+rlC4us86+I980iV+t8HyZTpY/fMCxBGie7Qv8v786QZ+jQbeew6OnDXXVnbf/sl5+OufUaCftHg3rxRsulv2TAjHYIs2rzBtaOJqsSBHZBQ6FcuR+MZ0KLi3ZOYKklCFufsS9q5a+iCbmP3CzkF+5H5ERHMHmrew= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: b1524f8a-6960-4497-f37a-08d7f263707c X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2020 08:48:40.1096 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: p//2NDnIcwMbThHGkRA2R7+JURJfWoilStCQcmeO4J8mjKtOH5mg8TB5ypDfdysLGV7QVhLxCvv+OlnEtVozQnAFbwkP+rV85j4c3MH5ss4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5495 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.4.111; envelope-from=vsementsov@virtuozzo.com; helo=EUR03-DB5-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/07 04:48:35 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, kwolf@redhat.com, vsementsov@virtuozzo.com, stefanha@redhat.com, codyprime@gmail.com, sw@weilnetz.de, pl@kamp.de, qemu-devel@nongnu.org, mreitz@redhat.com, ronniesahlberg@gmail.com, den@openvz.org, pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" It's false by default, no needs to set it. We are going to drop this variable at all, so drop it now here, it doesn't hurt. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- block/crypto.c | 1 - 1 file changed, 1 deletion(-) diff --git a/block/crypto.c b/block/crypto.c index e02f343590..7685e61844 100644 --- a/block/crypto.c +++ b/block/crypto.c @@ -694,7 +694,6 @@ static int block_crypto_get_info_luks(BlockDriverState = *bs, return ret; } =20 - bdi->unallocated_blocks_are_zero =3D false; bdi->cluster_size =3D subbdi.cluster_size; =20 return 0; --=20 2.21.0 From nobody Sun Feb 8 14:26:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1588841622; cv=pass; d=zohomail.com; s=zohoarc; b=HF1Nl8kIBuSwttuqeZd/r99OuL0dMNeSTvkE+6a660a/St7VUAzwbaaS6BWU9bb6TvWp0/HEhuc4jm5S30hxrY0/LY7cGV4ptY46uZPjE5ryXI4S3sNGTj31+UIz/S/yzcGBh9ueAtmG51gFxpWlEz9Lo1f8GOmE4L0EbkMdoEY= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588841622; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tEw8sfNryfOBsTwhETT0Gfn5CiFm4JvafjhcfrJ03ao=; b=MtXSB47CA4QXWKyDtXIJIyqnSx7flrUkrRboZSYMvC1hm8k8rR8ODTn2aMfJV3WHoLg27Bjqb4h7fFG/tY5a0UAp3+fyJ9JdN976AVnHESP4dVo2l0/sambfa7G5UYPA2ynczja5Bh6gSd27rr9mFm5YK4mpqAxqspnUQFNaYU8= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 158884162253354.35103299603588; Thu, 7 May 2020 01:53:42 -0700 (PDT) Received: from localhost ([::1]:41802 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jWcHl-0001o5-9m for importer@patchew.org; Thu, 07 May 2020 04:53:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52236) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWcDI-000218-4v; Thu, 07 May 2020 04:49:04 -0400 Received: from mail-eopbgr80138.outbound.protection.outlook.com ([40.107.8.138]:13902 helo=EUR04-VI1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWcDG-0006Er-3B; Thu, 07 May 2020 04:49:03 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM7PR08MB5495.eurprd08.prod.outlook.com (2603:10a6:20b:104::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.26; Thu, 7 May 2020 08:48:41 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::acfa:5:88c8:b7b9]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::acfa:5:88c8:b7b9%3]) with mapi id 15.20.2958.034; Thu, 7 May 2020 08:48:41 +0000 Received: from localhost.localdomain (185.215.60.171) by FR2P281CA0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.26 via Frontend Transport; Thu, 7 May 2020 08:48:40 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZwHId9oXgjIFqdinBOwW64a3/9ePKh0xw9TEo1uoADKaoQ96mBi3AzXgOE1F2N9Ojh7C4NMEKKfwYDfIHYsZQIklE8uxVT4BwYVOYTvF+Bw5c4hqbJVKs7ziDjGW90vcW6j8HSrgjmRzG8Sp9kublSmtglU7UOEdfdwxb6g5o7MPvnH8t35EECNX0hT+zQ+V6jJ3FTIjDNhNivk7pLMXISbQzd9NcKcFLlEyJbzVYrK6JRQflSb9s2PWMq1JMSSuDbBvVNIW3+vkA1Q7he6jcZcUO6cBsrFW1LdNSpuNyHeg2Bg1pvZIkG8akCMBdLRhRCfnsu7z5SAc/rzCB9L9og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tEw8sfNryfOBsTwhETT0Gfn5CiFm4JvafjhcfrJ03ao=; b=Lbr7SSH49sL5UUS9J9UQ/qu10eiogU06PfHyoemssb0Wb+vWRQUMtweqY29ds/p9C3zx8jGw3TK7BHyCpMUzHvROnE1xdMhLw+rVbwEWnxh+UXNwWowEmBV7zVFBZwoYQZckwBNCKwnraSz3MkXLhgAwjrOwysQV2jq1wRpmFhK/zE8QK27smgVszrYWFMhL53TAbLjtC+4SzX4r3AXB/SbijKbFAJOpvvdICjHIZK6wxyvKbbFflsmf1qRxIY7nyxNdqz12OLFVOaUav+vZalqSqv073El1pJ+RjrzD6WTgb+7AiVlvGr+IRFMigM/v+pFEFmHWE7yod5Hcvgs7Ig== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tEw8sfNryfOBsTwhETT0Gfn5CiFm4JvafjhcfrJ03ao=; b=ESqwlr0arMmk3hezbxRS3/tTpkUgwrSu1u7raIGeiTUgAgyLb3C50CqAschmIJgDbiBtnllomEEi0BPCVAHVhZxfjWb4RG82zo5mWmdOheBgP6pQh1wwl0T1vnBuxWEtBp3SBC/xO1U2E4NiwJtlyyHT+SKYcaR1FSDDItB879g= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v2 6/9] block/iscsi: drop unallocated_blocks_are_zero Date: Thu, 7 May 2020 11:47:57 +0300 Message-Id: <20200507084800.20596-7-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200507084800.20596-1-vsementsov@virtuozzo.com> References: <20200507084800.20596-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR2P281CA0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::21) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.171] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 402c554f-c1ee-400d-7518-08d7f263712f X-MS-TrafficTypeDiagnostic: AM7PR08MB5495: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:605; X-Forefront-PRVS: 03965EFC76 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: o0OUJg4JatHM5vLnKMemDx9MPxZgPWujpN/VoVEmG0luJldA+nfwRG4DzMUJF2XMTc/fRA5MAmt4Tfsau+m/4xJ/puTfOXUht58k4ZmYfqWN3OxDYRruAwBWGqQ11n6Ab1OlnYGDmXPMwSvjvoWYDZty3SxYEElp++2WeYj4PtJ0ickkSpBhdKUFGez4LgpcqiQgz+WmQqql8CBH+f8UauXSuAhbWCg/UO4JAOxJMnOhdlVpIjiUWpjPpuubdMPW057EsFWjXgFfl4t2Wg4UyvSTqfqYLrM9HzsOtWw08rjQWdYS1fz2TvSrfzEqI5KLBoP1Kp2iSSWcc/mESJDRLhAZaQx308XjEvnviKY1c9upqq7bxlgzPJEmngEWlBKgAjEf0mcJL/od02PG8dutq23x/WsNbNJT+PDdPUSjhVy6X3CSV1gcNJm/2YhTnjLHbBlF/r5xa0Kckg+48RxwspCktcE4Vyb51Rw7mB/R8aPljlIYH28JwKhfRbAnfJ5hn49hSB7a5b/X18xVWCeW+3RAmZWwNqQTrCwd6IjwBuKoWoMsM4pn6tcCOfDRDzPf X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(376002)(346002)(39850400004)(396003)(366004)(136003)(33430700001)(4326008)(478600001)(66476007)(66946007)(66556008)(4744005)(5660300002)(69590400007)(2906002)(52116002)(7416002)(6486002)(1076003)(36756003)(86362001)(6512007)(83280400001)(6916009)(186003)(16526019)(83320400001)(956004)(26005)(33440700001)(8676002)(83300400001)(83290400001)(6666004)(2616005)(83310400001)(8936002)(6506007)(316002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: O2We9lYFH6kqA2EgSOXAKCme4f/AbyssJMWZZTU2wfUSJsWa2j9egYm7Krf5h6WF82q0311Ssda7dkjq6s1KCfMbUR+smMmuYpddhEAhH+kHnFh3r9uJpNUPUkmk/irpSQ7Tf1ngf8hUOWpyIWfESoAmHf8NP5zyueEQNf/PFMXigKkw8UIMWI+dt294G9EvAhvsp+IjIP8m1WRT2jpXLLCISkVs/BdDlt04fxXtoegpZ9FvmEujSPFFBaDmeEwDenV6+LPdKDPj4laEoeJxC9P0ULG1puqsT8IcmqmJeIf2bHCOcuo00G2G3YZ6ceLIyPOcHSfr64YqtDDd1D4EHwqgQkagV+ZGxCfMvLs8SUc1xUehRAfcew1Rqb2z9fXTMylnVWwrSHKBROXgdpp/9Qix8LDsHJKckAFXY/beWVVFVRrkut4locmLan/YKwp9cy6/cDCHj7nKxPJ3Xll7kDi8e/QXAJIFad/JiNVAq1SSI3zLIh3gjTh1G7tGbH58eT9Giu01qv9rQOgBt977FdoG07Sr5sHE7OYnpVVjLcUrduvuxQ7Eo/pZF/v0TUqKqTKw7e+aZB0dNBxJ+yMqyvW7ZYkejPP0hXxrRJyOXkDluwlN/6wQ2NDbhKUlJTtMGwqmsSdFmBsE0i+WEiGgiTTofsMnVnkzjpdwaKbtxuxyK7ALyTkoFmPDnZs6+YcnBl0mBrbNQS2o3zPPXLwVkn48Y5yaKAkULa13KXfcMXZ/91z8dBi+nJwo1mmrJ/r/IG1m6ltZFEXlbclZx4uXA9cUKLgyRAeontyn57lxcok= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 402c554f-c1ee-400d-7518-08d7f263712f X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2020 08:48:41.3034 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: js4A1ssOGq7Y39cPylSurrY13ZkAAV3yLVY6dziNUu4BmIhsyxr1yfvyVa7/xAf+0oXyQLV3X3+UFgW+1GlUyK/KqygHVS3ahC3SJpViXHM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5495 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.8.138; envelope-from=vsementsov@virtuozzo.com; helo=EUR04-VI1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/07 04:48:43 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, kwolf@redhat.com, vsementsov@virtuozzo.com, stefanha@redhat.com, codyprime@gmail.com, sw@weilnetz.de, pl@kamp.de, qemu-devel@nongnu.org, mreitz@redhat.com, ronniesahlberg@gmail.com, den@openvz.org, pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" We set bdi->unallocated_blocks_are_zero =3D iscsilun->lbprz, but iscsi_co_block_status doesn't return 0 in case of iscsilun->lbprz, it returns ZERO when appropriate. So actually unallocated_blocks_are_zero is useless (it doesn't affect the only user of the field: bdrv_co_block_status()). Drop it now. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- block/iscsi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/block/iscsi.c b/block/iscsi.c index a8b76979d8..767e3e75fd 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -2163,7 +2163,6 @@ static int coroutine_fn iscsi_co_truncate(BlockDriver= State *bs, int64_t offset, static int iscsi_get_info(BlockDriverState *bs, BlockDriverInfo *bdi) { IscsiLun *iscsilun =3D bs->opaque; - bdi->unallocated_blocks_are_zero =3D iscsilun->lbprz; bdi->cluster_size =3D iscsilun->cluster_size; return 0; } --=20 2.21.0 From nobody Sun Feb 8 14:26:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1588841533; cv=pass; d=zohomail.com; s=zohoarc; b=CL1YMC7e2OpxKYNnbGIRNf9ydgG56/LYRAGYwxsm3bfIEDbMITlcVtWq0oSVVnlR6YR/iGYB2eUs/6ceNaVgBfBG3K+zt+uAdUsDG4cOBrnsp66iOgj0KpW7EtsPhV3yh50Zn36ZncYV17tX9OJ8kJAzmRubrqLcTUV9gtIggtM= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588841533; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ELUvFv5R20eBBESfHssSDSiMo/Pt4r/eBrm8poHTVjA=; b=KCVqbop4Xxdn4jJoPZKKyen6O5nsQCKHN7ATNFJINxkw7YeZEtFmofNrJBMy6bcydeGeJhj8IvWzNmo15Hdb2UAjIQ64FQAJfxvi/+dJ8IX0Lq+u5AELxvknQhplr/R6YV/Bg4k6pfm7cQv4Wd+/JmFPFAnRy2PRQDhm4I4J0Ng= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588841533121383.6286920351181; Thu, 7 May 2020 01:52:13 -0700 (PDT) Received: from localhost ([::1]:34460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jWcGJ-0007AO-PI for importer@patchew.org; Thu, 07 May 2020 04:52:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52242) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWcDI-00021z-II; Thu, 07 May 2020 04:49:04 -0400 Received: from mail-eopbgr40111.outbound.protection.outlook.com ([40.107.4.111]:2308 helo=EUR03-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWcDH-0006ET-DJ; Thu, 07 May 2020 04:49:04 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM7PR08MB5495.eurprd08.prod.outlook.com (2603:10a6:20b:104::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.26; Thu, 7 May 2020 08:48:42 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::acfa:5:88c8:b7b9]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::acfa:5:88c8:b7b9%3]) with mapi id 15.20.2958.034; Thu, 7 May 2020 08:48:42 +0000 Received: from localhost.localdomain (185.215.60.171) by FR2P281CA0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.26 via Frontend Transport; Thu, 7 May 2020 08:48:41 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bQYAZgbvcPaICd2r5JsdvgQWjJCzbmPFyeVe235STX/BU61e2FvOutJvvPN7dM7TzNytxBGI4/Yzh9OA1U3vCv0AfaFgZw1wJXRlTmUtsFfgo2QOqrFifoaC39jItUO9PfyNsfQ80m9FIzoVKgjIQJZ7L233qRSP+sl6kRmM+D6Q1AA0oiSvSx88Yx34U1Q/fYKUVXZWxcu1Ao2P8j5I8kpeestijuKQskABgK9ZVXCoQzw3ccLaW4YE9DZ3wFc8R/PywSHfZZxCaWeIyO3esDTGtHgU+J599LdLtk8mKLkO2xtutskRFAD63NOZ1I4NsKT6zWPuhkE2dlDPzFXsLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ELUvFv5R20eBBESfHssSDSiMo/Pt4r/eBrm8poHTVjA=; b=D9tQI7v+it9qbF2biV3MKk/QqcQrqffbYzJISOLY15bFPWpZTEfYJhWhQjMfE7YJkIijrZ95Mq4sZwH1QF2vqyNLw6+YlghncYuj8ij23b49hMC+4jlwDUJntSkiiku4VgSTCAwu9ZchZbEklRiEqNEnDiogEnoirFbj3SFOc7TQGVsGV2SNUveT76A+pR95EwPYuNjeCYQVT6r3wMJ1kuGtZIYqKb++nAnmoT5rUnXwa5bNDIC98Q+Hq3xvK5KOEzqw6wqz/VduoqhulcIP4PioORvBHwUp9WSZTaOVai7IAA7Ifp44BdliXrTCPMbAiJPBD9jif9dnojY4dwR6RA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ELUvFv5R20eBBESfHssSDSiMo/Pt4r/eBrm8poHTVjA=; b=XeaNPUpGLaC0tgJR728awZh0S63aQgwdnP+IDJoH0RV1kmR/Bel4KDsWcNVdVi4wGQMqmG3biy7TLIin9+xJ399mXlRoZMe5KMW5QAl64sP+GmdTB2G2d+BxGTGmr+vkCEiedg36tFTAlIBDSZF7X7Htb1wIWFSqkqiupRLA9cE= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v2 7/9] block/file-posix: drop unallocated_blocks_are_zero Date: Thu, 7 May 2020 11:47:58 +0300 Message-Id: <20200507084800.20596-8-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200507084800.20596-1-vsementsov@virtuozzo.com> References: <20200507084800.20596-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR2P281CA0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::21) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.171] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 031abf18-5639-4035-df98-08d7f26371d6 X-MS-TrafficTypeDiagnostic: AM7PR08MB5495: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:83; X-Forefront-PRVS: 03965EFC76 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8Di8X6hBXqZPoSZx+dhBqhW3U4Cfx8WmSB3VQaK06UKvUDO1WLrpm44geqwAKJ4TWr/C4IDQJZMHIVnN4+YvHS6bRJ+XznivWiDso59/KdILP+it+TdcSrpZ7MvGxBs4D2Ro1NAy+KNIKFeaZ4KccJMGFPNPE1H9J3WxxRfCONTb4ARNEWfYXzS48sBhgVVSDOMznkDt0qDq/+VE+YhXpnQh6vYQ0oZsASmEGZanG+XPXaIOhShJAlQ3wHDVqjBsyRC7dB3DhMbgOn46zHHh06OR/DqCs3FM4iS7uqxIugkMnH93TYgI37dTk4gqDfs9IVCPgh43xDSUVbDUELvtzQan57xOsHXcVZ8JoJP2yzZLOCPYFcWSatQhYBfiFvIcMRajyWFuIkkgn8lAXVlZzB2A5mX6eWKD4DGWqCm7c5tXAxDFEO/3M9hvZug8EUMLhjxpjsK+Kg9u8EykagSKp+Jkua6FNRARiwYb0e6AJN88xKvANfHYgfJq0ApYTg4UgB1j+WDPr+Gkq8RusjdOMByZvm/Mvi8RfCtUXTFzj4OPy4D8H4yvitHtsewdCZoy X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(376002)(346002)(39850400004)(396003)(366004)(136003)(33430700001)(4326008)(478600001)(66476007)(66946007)(66556008)(4744005)(5660300002)(69590400007)(2906002)(52116002)(7416002)(6486002)(1076003)(36756003)(86362001)(6512007)(83280400001)(6916009)(186003)(16526019)(83320400001)(956004)(26005)(33440700001)(8676002)(83300400001)(83290400001)(6666004)(2616005)(83310400001)(8936002)(6506007)(316002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: nBdx3cRSfA/Mt2QQOitHqz4GDcWodq1EnFXyrUdXBXwskgW/4dN2rabymgMml3xiYXQsZ3XOJikGYb/IW754ISHG87dBgGb0rNnw6myDBAo6I8lx7fPEsF0yoeuaxE7EuAL6NjqAJMKZuMcLzkAEQ7AT3LV/NmZYcejkYBjMpZbqaPnuXghUn10nq9aWs4n76XToKuOt4GiemuEORdGjCHqmkNigHZ1+2qYInPrTXDyZlQtNr6/MA8jAN2LxgPZXHm/jXi/zQCfW3oxgdcYT6XllCcBxcsr6Yrly+UrUtluhoMS+Dz0Ylwk5hLs7Y08N+IkxrNsGwknAr20UeLcJoqljrNYA/nx8HymMeZhVKskbjrov8To8CcCcsx7LecLLimXeeQt90txyYIAqYD5Wl9G2GrPcJjylUKvjBhcQQ34QvQajoAR5SW8jzbPEER5rp4IYI9oVUfdAMhCiJHocm3ediLaxR7/0BavqPN7ShZ/D3Ls+gbD4CUnWKywVAVdjdd8dooT6iIYR1dfz+oT6Zf/HyolqntghioKTyYvjrMEUvIMMTQv4jyCbM5x3Fh5oNf+pMxgjg2DZh9HEGXBZgOX2x/8AYBpFtAZNO4zGkzKk2TTCN8Y76eavGY8zWIaVXiXSFdhYckfwfcpo7HFj+WEUSI2yOfvcVqTJHNjp54fhZZ+yN7p2ReejhAFhfoAuWNv06mrYrb0RA/D00pTj8YqdqlBVIifqPkqpxLuZuIO9Rx3IMMeGMUN7kckfT1lir4W9STCP3KG8lqPaZ4C6Wagdp0ayJPEOf9eDQH/nPYU= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 031abf18-5639-4035-df98-08d7f26371d6 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2020 08:48:42.3837 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ufqNfO5AXy9bKbMCPxPJ4+HIYyDOU4kl84qeqTDv5ZVbNnWysRmL9n4fpCXU6UWsRc6LI53ElkZeiAjJBoZ1cqzMzFjkxiLJzdHW6PYemxI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5495 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.4.111; envelope-from=vsementsov@virtuozzo.com; helo=EUR03-DB5-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/07 04:48:35 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, kwolf@redhat.com, vsementsov@virtuozzo.com, stefanha@redhat.com, codyprime@gmail.com, sw@weilnetz.de, pl@kamp.de, qemu-devel@nongnu.org, mreitz@redhat.com, ronniesahlberg@gmail.com, den@openvz.org, pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" raw_co_block_status() in block/file-posix.c never returns 0, so unallocated_blocks_are_zero is useless (it doesn't affect the only user of the field: bdrv_co_block_status()). Drop it. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- block/file-posix.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/block/file-posix.c b/block/file-posix.c index 05e094be29..5c01735108 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -2878,9 +2878,6 @@ static int coroutine_fn raw_co_pwrite_zeroes( =20 static int raw_get_info(BlockDriverState *bs, BlockDriverInfo *bdi) { - BDRVRawState *s =3D bs->opaque; - - bdi->unallocated_blocks_are_zero =3D s->discard_zeroes; return 0; } =20 --=20 2.21.0 From nobody Sun Feb 8 14:26:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1588841641; cv=pass; d=zohomail.com; s=zohoarc; b=C46Dx/TXHIXJIFevnUX56DM7AOKqxO5z0U5GfRpJ3VF6gZ7Cncd2yuTn9RndnyC7zGnGlSP6TvWw5T5TghoFdeR2kEeLiWfIErwKc2DpF3/JwDYwjlNPm9ZGyapM5KKmw2tN97mqla52CG89gGLJo73I9JLd9Gw2lvM5MrouLaE= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588841641; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HAXFO4PGkoECMrka3NeTmIHeGqfaW7zgtjVmbJiOv+M=; b=jLj6etnT+60AKTEvZ31Aa6/CPrKicxLHYg3eXQHbS8E604lwDY9zCAcR58ICbK461Ex3xiI1kYm+whh6qxciqQMoGp9WNpSaGNxM601xFKkCjtpewclC6pebLkifr4yuBO0uam+N12xvdag1UkdKtTK8Ymd0XE48qqN06RbF0pM= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588841640999157.31042776835227; Thu, 7 May 2020 01:54:00 -0700 (PDT) Received: from localhost ([::1]:43332 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jWcI3-0002QD-Pn for importer@patchew.org; Thu, 07 May 2020 04:53:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52250) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWcDJ-00025C-Mz; Thu, 07 May 2020 04:49:05 -0400 Received: from mail-eopbgr80138.outbound.protection.outlook.com ([40.107.8.138]:13902 helo=EUR04-VI1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWcDI-0006Er-Ry; Thu, 07 May 2020 04:49:05 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM7PR08MB5495.eurprd08.prod.outlook.com (2603:10a6:20b:104::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.26; Thu, 7 May 2020 08:48:43 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::acfa:5:88c8:b7b9]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::acfa:5:88c8:b7b9%3]) with mapi id 15.20.2958.034; Thu, 7 May 2020 08:48:43 +0000 Received: from localhost.localdomain (185.215.60.171) by FR2P281CA0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.26 via Frontend Transport; Thu, 7 May 2020 08:48:42 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dOw1nevti1faf+gPfVzg4abrZoKlbFoqbNoCoWSarNflsPaDKkTTHJoC68Dl9R8l8t023gU8fpj+zrnQO7r4ne81Pc0ScMkEITIu68GDYU/9uCEBjgnHWbjmmc+02CC+2HRmw/5vD/IGaXj4Y/wyG9rUzXvsWoSl6R2K1pZfS/kzxNSVzk5yonBkj5LE9ApFYTlob36HWMDaS8nUhTU54i6KXsCgycr6G6+cMA1ziMy0OhGVbNGR2NLoaguSlHr3RQNzF4/5pHxmJVhBIIfdJeMM0yuc1pIOlaiB5MUfnR4p8LgefCp2tL406BN3o5LdvccZYyv2mYCmPTiZMfDO8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HAXFO4PGkoECMrka3NeTmIHeGqfaW7zgtjVmbJiOv+M=; b=ZNFULcJ56D0zVaYiGndLzgV6op59SHdsg+vJe+iue7tVeJeQjlVa+/b6Nvu4IGQUTiSCy7g4SMbDNc/DD+odbYl48PQec0kQZv2dby2xx+5DYbRjtup72AYm/MKxKf81s+2B+zkJM1pgUGleOMkEGneV1PUH86YxhxY2AO/s8Z2OogfgUqgG4iiEWiHPJr0o8hoa08kfJ7COvKqyvDoSrB30T9YZEJ8n2+rpvPqGnDUYYKB0wASMdoeUgY2T25DVffz5rzbdsXXujdhjXoDpv+jBI7xW+miguEH1tE5L9sG6SIWlCt5FnF17iU34RCTF6/hX3UY71HUOcdINQcjhXw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HAXFO4PGkoECMrka3NeTmIHeGqfaW7zgtjVmbJiOv+M=; b=hPV5okVmTHGIUy2OdPkL2He5PtcWmR9z4lT65DM2TiC3Rakj4E4UXrkLjvOINrjLjuc1VogqGwi3bkAwVbkkQE37G4AYebVT/2gBnJowHdl7+Bq3EZ7dRhn2cw2Ftm+s2XDTOrrMFvh4VZa3lFsvco8pc1afMmpF4jWQjYWQ8M4= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v2 8/9] block/vhdx: drop unallocated_blocks_are_zero Date: Thu, 7 May 2020 11:47:59 +0300 Message-Id: <20200507084800.20596-9-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200507084800.20596-1-vsementsov@virtuozzo.com> References: <20200507084800.20596-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR2P281CA0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::21) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.171] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0cf06539-5b44-4c7a-0d0c-08d7f263728b X-MS-TrafficTypeDiagnostic: AM7PR08MB5495: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:85; X-Forefront-PRVS: 03965EFC76 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wNSQnvM8vhVbIJAZWlcAPHTV7FfWP8m/UmHuNkKiz/n0Gjok28gcTJvwBvEWkqfbaP64oMiMJ+PbPiFT+K+XM6hLg1PsfP/JisGuc14XVXmHdfkIzHnsXWjjnxIUxkVm/aeyk4qzZBk9Yidrg++DhsoZR734HFlKqtDIo6E+AqSi1MDLYQ+pJNiwR/xbqc8cnkrtVPD96Fk2jzSi0JXKmEIjXj/envtbcfoGaK8KNB7dAZr/PUdvi2ppsbZh58Ks5V/ihMkfCW5sZOjZ86tDNv/llYOzNrLRvKcz6cZp4nENtmVbvllF0k9WCRpshram8ljBihX9FuxNGI7M1Z+DpgSIA+lzZeLoWxqlli6UCcLOONHQzi9xYYn+Ouzv71qPP1r4mDWz+n1R+hFCTd2OSWIQKsstOIpTZIrItJ2ET85lLNGB832hCyS3ccNjRGx0dWeuW8l0sSyH7X5m8COMHdoqPVlSe8W+x+4g7bu9Y9V3lvp7DCPBR4BmVhPhZ/S1CGtJJOT+eP/XbBQ1l5UL6QLZcxnLUZjmMr56USauIsyAFu39ggOMnIfBKi9G1KuN X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(376002)(346002)(39850400004)(396003)(366004)(136003)(33430700001)(4326008)(478600001)(66476007)(66946007)(66556008)(4744005)(5660300002)(69590400007)(2906002)(52116002)(7416002)(6486002)(1076003)(36756003)(86362001)(6512007)(83280400001)(6916009)(186003)(16526019)(83320400001)(956004)(26005)(33440700001)(8676002)(83300400001)(83290400001)(6666004)(2616005)(83310400001)(8936002)(6506007)(316002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: 6udyDmxfb4i7U5a0sQA4Jzw8zokegShFaMGWAp4ZfsL5CeE6tPUkGKUw9lulWxKm4wHv9nKf5ZBEimLpIvemGW7HphYgWPXb24HzJUO2MZYt6ZXgDUS6yvnfv2xKYlsFFYwHSKDKKFW+01JvG9yeYAcmBWYCBl4esUXMtLcfsw+CoTIn/3Bys4SX9LVeswq6MgJrioVMRjaByyC0PqH8NmN8TBJRuvxXd+2D4FVfxe0B0CgVZGjKmKpKXf3EjUp2IMTuEnvG84DC61Y221adecq/q2AMthstPhcnzwhLOp3iZ9+MhlhwCFbBjJ95DgAHcptWWzSGJBYP+zau9B8GPV1YSj6dJqicB9bTnug3QAEY0hjsj0yBwp5p/ZyUYTbXLg1cK2YwfEmzbDUbLy33d7tO6AfegEFSQhc6a2pnKDwMC6fCCFjh/J643t6FFqfZcTTj+DRDyjuoS2Uh52P/+ed2MILNK/cz+R2Hr3OfjRoupwH86hxfyQ+Zbg4I3gevaa2MfUQCeRtqNdFCJx+jXLxMNNprMW1HGPrVo+Cl4doPecDLJZsGhIGFgnr60sgDzXl4OJRypnIPkXqI6B7GeVwhBag48Snmj1h5TwnGi1M54IJiJ0r2irgv01Fn/8Clnm2gXv8PrIVnETORabjp6mlgGSz6gQe/FSBL2VDbI8/rOQ88TyDdKRK+T1mnj5gtw06emOo/S4dzFuM9wEQUAvwm4nHHMdz5OovkQe0Yj1bpz/n25dDQ/kWcbS1YQu4eqghrZy7qknxxIxxBnrANBAGmW01UYzDCMNnugJd6K8U= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0cf06539-5b44-4c7a-0d0c-08d7f263728b X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2020 08:48:43.5714 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 13MYRqRET1EJUut9JH3SL7OsNo+jD1Dmy85BP+BpRh91lIVbSYDyhC5bdYe100KDqqyMhhhbvB4c+wBQVBEVOvA3z6OJ0NLU9hlFCjfDygM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5495 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.8.138; envelope-from=vsementsov@virtuozzo.com; helo=EUR04-VI1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/07 04:48:43 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, kwolf@redhat.com, vsementsov@virtuozzo.com, stefanha@redhat.com, codyprime@gmail.com, sw@weilnetz.de, pl@kamp.de, qemu-devel@nongnu.org, mreitz@redhat.com, ronniesahlberg@gmail.com, den@openvz.org, pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" vhdx doesn't have .bdrv_co_block_status handler, so DATA|ALLOCATED is always assumed for it in bdrv_co_block_status(). unallocated_blocks_are_zero is useless (it doesn't affect the only user of the field: bdrv_co_block_status()), drop it. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- block/vhdx.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/block/vhdx.c b/block/vhdx.c index aedd782604..45963a3166 100644 --- a/block/vhdx.c +++ b/block/vhdx.c @@ -1164,9 +1164,6 @@ static int vhdx_get_info(BlockDriverState *bs, BlockD= riverInfo *bdi) =20 bdi->cluster_size =3D s->block_size; =20 - bdi->unallocated_blocks_are_zero =3D - (s->params.data_bits & VHDX_PARAMS_HAS_PARENT) =3D=3D 0; - return 0; } =20 --=20 2.21.0 From nobody Sun Feb 8 14:26:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1588841613; cv=pass; d=zohomail.com; s=zohoarc; b=IjqSAZhExcCoN5RxQ3ZOs/D8LZtVJZH56TzZWnd1HToCqwb14qUpFaVbTsz2WlXD2gLPUhXGKMkFfgQTp/RohIiApYKmq+/LsDxUSM+i4oTI+BpUxKjSFUsSmp8AHdl5/2DJs9MKo/FwGmvRO3hwTdmYDrsXixRX06wn/OUZ2kE= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588841613; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Mn/VD7SGrYD9isyxJr+qPCOSGyJdWiVJSY29xgLanPk=; b=ep78jxAaw3De7wpMzf4GXpDwqoHbXntu0wbCtbjltWqnQ0aKu4eCQsF0UMMh+C9cjupaAYGVXSISEjlFTds1HGikfGzBsK4/2Sd6EJVQ/cIvwvcOF9iBVVDGGoTnBmsXD+3LZLlfdG3EpEddd94khMp+r8XocLVBukO7eGi48UY= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588841613352379.87616459830747; Thu, 7 May 2020 01:53:33 -0700 (PDT) Received: from localhost ([::1]:40972 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jWcHb-0001SV-Uo for importer@patchew.org; Thu, 07 May 2020 04:53:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52254) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWcDK-00026D-6D; Thu, 07 May 2020 04:49:06 -0400 Received: from mail-eopbgr40111.outbound.protection.outlook.com ([40.107.4.111]:2308 helo=EUR03-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWcDJ-0006ET-4r; Thu, 07 May 2020 04:49:05 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM7PR08MB5495.eurprd08.prod.outlook.com (2603:10a6:20b:104::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.26; Thu, 7 May 2020 08:48:44 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::acfa:5:88c8:b7b9]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::acfa:5:88c8:b7b9%3]) with mapi id 15.20.2958.034; Thu, 7 May 2020 08:48:44 +0000 Received: from localhost.localdomain (185.215.60.171) by FR2P281CA0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.26 via Frontend Transport; Thu, 7 May 2020 08:48:43 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O6pmF64j7uHEuEEEBMBPRsh3XGO43FA2YZyC/SBt5SfysVLQ/MK+2jojedAuzZ6P8Ovil/i3g62vZMRjvI5Ypbss+nCmX+nt7DENKI3PkyphFENjfOy59hshEJioursrfjkBP27pdChFGlP2y+Xf6PRbfEKgrwt/tIx6Ol32aSa+RMvd7Ee8U+G1MyN+RIyKfHzS6be+weM1eDPBJYHe3Bxhs7SLOhmSVYIlTY/phRvB1txAjx1mL4OZT9/zOGe3p3rjniO6/Azuk34qQVtvcTA3uorxc/6bPn+zKUlOz/iAerOZYdyndDaNwlDkc0Lf+dkwKaOqgLOWFQGd6TWTPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Mn/VD7SGrYD9isyxJr+qPCOSGyJdWiVJSY29xgLanPk=; b=Fk6TPV+WiPV+QvIXMyaPEb/iYNiVB48z5Ut6vPW1Vrr7np0kFM+FMDZnG0NONxE9Vu9YahgUBpHrHYJk5FHgST+SMR5Uq5PYiyKnuK2Ta45NF4qqPDSKrVO8rNmXZxMCN7lQP3xwznAoK0s246yYFPrEZC4Told/upFeMtZy/jQRagFLW9rgx3bDOBOj8EJcTeDoDt76UWzO6MYxCp0zfg3kdlbCTj9oLuSOFBXuTKkx9ZWt7q3lNwQmxZYBId4NtoHMQZC8cuihFX13WttwGE09jRya7b5CNN5yyBj2lTMOAaUxe2K+aOHKu7YtpXA2hIr6mJmIvvQx4JigPbaX/g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Mn/VD7SGrYD9isyxJr+qPCOSGyJdWiVJSY29xgLanPk=; b=IVrfCsqVBTdTOF9LTfhjtSRHFVyCFA6zXJr2+blDVo+M+vErpw+MAd6KGEEPfR+gwqIYtmK+H5/CqAJHK3U0bWYzAEISq24VLSbJwHBCwwABxu4Jf3LUpqjF9WSl4sBfGqP8Lu7d30U17MoV3CE8b5UYw2+NxiafvFaoRd7HMTM= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v2 9/9] block: drop unallocated_blocks_are_zero Date: Thu, 7 May 2020 11:48:00 +0300 Message-Id: <20200507084800.20596-10-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200507084800.20596-1-vsementsov@virtuozzo.com> References: <20200507084800.20596-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR2P281CA0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::21) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.171] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 30ffff44-3b0b-43eb-f2a5-08d7f2637330 X-MS-TrafficTypeDiagnostic: AM7PR08MB5495: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1227; X-Forefront-PRVS: 03965EFC76 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bIhS0CMUsznp6sgxyExV7gPz/tMhgh1oJlcF/wAP0CTi4c5XBHJkuVAFnpw5wzaYVGFCcag9KVGV3H3NWK4XOnxRt1owEsNbrvavoRSaeFB5PyfB6IP2B5JtwfnSu7JbFkYCliA/3p/lhCYJ3LUjCQ0tDTqyv5ScjoOANiJehzdoxpdPhR84rnORSI4yp6dgoM+xfL/amL2OpHQ8712YVqHVuS/iimTbiz2ApjPEoPTEcGvh5/MzD4WPc9rSmv4CMaeKRDFwdX8Zptrvu1BtTMl7qCyiIu3mODaotRgOOTI6m1yJWQzV/wFL4sgPM4auZZ9lBvMkWPnXHap2hwYC8sLSPARDubT/gn8ffxEGEE5CTe3QGeJ7N96Kuy35257w/42KOhC52wUlYOBFHJqD8o2KS4SmRrLuln5ndwvMyjOYLkPUcD+/GYqK6tZLLBftcJKSC4d+ogA6H855a2GCe7G98NiQOPedIN2cSz9cE7BzBHrqvbyXsqR1GakaeJJR6K43X6vq9SYjK5xkWjHsRd+qw5MvVUAQ1/cJLOiOibQGu7gfPaXCawqq1Su53In0 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(376002)(346002)(39850400004)(396003)(366004)(136003)(33430700001)(4326008)(478600001)(107886003)(66476007)(66946007)(66556008)(5660300002)(69590400007)(2906002)(52116002)(7416002)(6486002)(1076003)(36756003)(86362001)(6512007)(83280400001)(6916009)(186003)(16526019)(83320400001)(956004)(26005)(33440700001)(8676002)(83300400001)(83290400001)(6666004)(2616005)(83310400001)(8936002)(6506007)(316002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: rXTvLwBxwv677CGecbRAtwyaMABTZD1jFtTr2HTkVZF2jloOXS0OXdVvmfgfUnGuu4aJ4ETKJr+Vd0cYt1v5Y3O4NsO1zh7iFDJtUKQGEdi3pjRhEB1AwYHoa1ACOGZFQmCSyW+OLQpkAtFHVWy23E6jXXRyLVirOuHxccUJo2dEsYwtv+8CZUxiepaz9uv7uECUOxDIR/iu5hVMMNAI28pvUY4SjwyjMkFIbtL2N1Cxsb/4I3eBDzxX7fWAit3G7uzWa0zbU5XIGFChOHdVHhw8mrCI00qXcmnI/TZQMBrqgJoYalQbDRm/4mOARenBpxVg5qRuRX2RBAanj6NULsuQ4+UqXjXOyl4dSrMf2LzcZQqrjtQ46T9irOa+MtOzkZn2XvufQqg+GYbUBzZSFdtoqM88bwhuXD6hpBB/RLqLnIB/zD90BJ6H13rZrM5XsF8ZUiIWiqsSPyz6+T1Ka4jKWsTngoKdo4gkoZDd/s8g4ND0QLqQxrVkclPnT0LmOLs7c+luIzmtiQiK48Hy9KmtWvJZkvf6Y7C1nYDqhIkhkEcrQKZdZk/hDYKC8Yrx1Ygry6la3UKj73NH8++abSHe6QkJLaXR6aZWrDsnalbhgi0SFGH8qXWQmq60IHgOiG7A6oZO/AzUiJv0mnxAb6jjdehElspHIfSrNUcLdtv1FpOiru63siZ/c+nLoxW6spkRM3sEN9UwTDaRWK7nlijypPKbLZSv3DcD6PHyhH4QVuZKJTZjy5H2jkQ2pPkQSFF6GANSrOxDttgAE14j0sMJulje4klRzxkWAfrVYLQ= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 30ffff44-3b0b-43eb-f2a5-08d7f2637330 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2020 08:48:44.6905 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 4Mqd1F2d3sEk5tL4I6K/S6Oxdf+tfOPWUrvI878BOcijcL/SWzrp+gA6NDqsqNY1DaPpt59R+JedmIfw4mGP1jy7xhVL3hRGf6G538mg9AA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5495 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.4.111; envelope-from=vsementsov@virtuozzo.com; helo=EUR03-DB5-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/07 04:48:35 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, kwolf@redhat.com, vsementsov@virtuozzo.com, stefanha@redhat.com, codyprime@gmail.com, sw@weilnetz.de, pl@kamp.de, qemu-devel@nongnu.org, mreitz@redhat.com, ronniesahlberg@gmail.com, den@openvz.org, pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" Currently this field only set by qed and qcow2. But in fact, all backing-supporting formats (parallels, qcow, qcow2, qed, vmdk) share these semantics: on unallocated blocks, if there is no backing file they just memset the buffer with zeroes. So, document this behavior for .supports_backing and drop .unallocated_blocks_are_zero Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- include/block/block.h | 5 ----- include/block/block_int.h | 12 +++++++++++- block/io.c | 9 ++------- block/qcow2.c | 1 - block/qed.c | 1 - 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/include/block/block.h b/include/block/block.h index 931003a476..db1cb503ec 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -21,11 +21,6 @@ typedef struct BlockDriverInfo { /* offset at which the VM state can be saved (0 if not possible) */ int64_t vm_state_offset; bool is_dirty; - /* - * True if unallocated blocks read back as zeroes. This is equivalent - * to the LBPRZ flag in the SCSI logical block provisioning page. - */ - bool unallocated_blocks_are_zero; /* * True if this block driver only supports compressed writes */ diff --git a/include/block/block_int.h b/include/block/block_int.h index 92335f33c7..8fac6c3ce2 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -115,7 +115,17 @@ struct BlockDriver { */ bool bdrv_needs_filename; =20 - /* Set if a driver can support backing files */ + /* + * Set if a driver can support backing files. This also implies the + * following semantics: + * + * - Return status 0 of .bdrv_co_block_status means that corresponding + * blocks are not allocated in this layer of backing-chain + * - For such (unallocated) blocks, read will: + * - fill buffer with zeros if there is no backing file + * - read from the backing file otherwise, where the block layer + * takes care of reading zeros beyond EOF if backing file is short + */ bool supports_backing; =20 /* For handling image reopen for split or non-split files */ diff --git a/block/io.c b/block/io.c index 00e7371d50..484adec5a1 100644 --- a/block/io.c +++ b/block/io.c @@ -2385,7 +2385,7 @@ static int coroutine_fn bdrv_co_block_status(BlockDri= verState *bs, =20 if (ret & (BDRV_BLOCK_DATA | BDRV_BLOCK_ZERO)) { ret |=3D BDRV_BLOCK_ALLOCATED; - } else if (want_zero) { + } else if (want_zero && bs->drv->supports_backing) { if (bs->backing) { BlockDriverState *bs2 =3D bs->backing->bs; int64_t size2 =3D bdrv_getlength(bs2); @@ -2394,12 +2394,7 @@ static int coroutine_fn bdrv_co_block_status(BlockDr= iverState *bs, ret |=3D BDRV_BLOCK_ZERO; } } else { - BlockDriverInfo bdi; - int ret2 =3D bdrv_get_info(bs, &bdi); - - if (ret2 =3D=3D 0 && bdi.unallocated_blocks_are_zero) { - ret |=3D BDRV_BLOCK_ZERO; - } + ret |=3D BDRV_BLOCK_ZERO; } } =20 diff --git a/block/qcow2.c b/block/qcow2.c index 2ba0b17c39..dc3c0aac2b 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -4858,7 +4858,6 @@ err: static int qcow2_get_info(BlockDriverState *bs, BlockDriverInfo *bdi) { BDRVQcow2State *s =3D bs->opaque; - bdi->unallocated_blocks_are_zero =3D true; bdi->cluster_size =3D s->cluster_size; bdi->vm_state_offset =3D qcow2_vm_state_offset(s); return 0; diff --git a/block/qed.c b/block/qed.c index b0fdb8f565..fb7833dc8b 100644 --- a/block/qed.c +++ b/block/qed.c @@ -1514,7 +1514,6 @@ static int bdrv_qed_get_info(BlockDriverState *bs, Bl= ockDriverInfo *bdi) memset(bdi, 0, sizeof(*bdi)); bdi->cluster_size =3D s->header.cluster_size; bdi->is_dirty =3D s->header.features & QED_F_NEED_CHECK; - bdi->unallocated_blocks_are_zero =3D true; return 0; } =20 --=20 2.21.0 From nobody Sun Feb 8 14:26:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1588862793; cv=none; d=zohomail.com; s=zohoarc; b=mksTgTntScJT0i29z6LYFhA+cflqrUucbNTWqKnhe4KpydGmM1DLRG6g7MOENHGotT/TSuma4MpjAyoPjvB2PrYzUsiKqOGFl9fs/Msd/Xdxd6P+OXAkVN+wak8bjrQ968GXt2ovVoS97Z92J8LnC8Ci7R4MF1RGlMRWJKNrGtc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588862793; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2mD0J+BqA3hH5L2MGfLPWpRGM1gavaMsHDS4Z1HMFV8=; b=azkNirqBOe7DzXijrvOdVdvNt3ELLWNDgHVcV/JhBQrhrJAg8s8qWMbuKfVDDWef0kvEqWMUI+ZaHbrwLX44FZmCeZpwqDTc+WK8FLvsnMM6CEKBoBGktA5CqI+Jjfv88IS2jCUSjLZtx9bqYY9NMfAKr4mDJyOeScOGBZXajRY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588862793993699.4765003288215; Thu, 7 May 2020 07:46:33 -0700 (PDT) Received: from localhost ([::1]:40138 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jWhnE-0007uC-Dl for importer@patchew.org; Thu, 07 May 2020 10:46:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47486) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWhmJ-00072N-Mx for qemu-devel@nongnu.org; Thu, 07 May 2020 10:45:36 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:21580 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jWhmH-0003dR-Ty for qemu-devel@nongnu.org; Thu, 07 May 2020 10:45:35 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-434-O-Z3v2kDNKCZoshuF8wnRA-1; Thu, 07 May 2020 10:45:29 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2F867460; Thu, 7 May 2020 14:45:28 +0000 (UTC) Received: from blue.redhat.com (ovpn-114-73.phx2.redhat.com [10.3.114.73]) by smtp.corp.redhat.com (Postfix) with ESMTP id A86C15C1B0; Thu, 7 May 2020 14:45:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588862732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2mD0J+BqA3hH5L2MGfLPWpRGM1gavaMsHDS4Z1HMFV8=; b=dIImAfmVm4Hq5ztONVKR2f+yph+yoA7ayEsTEOfugcDgByZqRZ2+7j++x71qEPlyBj59dr IcU6dBYsrboTX1f1FYioYXVVNWSOCziFilNbfoY+qWR3x5cy0bWX05wSjhiqaC2XsS/ORM nydYzIkxqeY3BELUGdj55rxJBUeZP1s= X-MC-Unique: O-Z3v2kDNKCZoshuF8wnRA-1 From: Eric Blake To: qemu-devel@nongnu.org Subject: [PATCH v2 10/9] qed: Simplify backing reads Date: Thu, 7 May 2020 09:45:13 -0500 Message-Id: <20200507144513.348470-1-eblake@redhat.com> In-Reply-To: <20200507084800.20596-1-vsementsov@virtuozzo.com> References: <20200507084800.20596-1-vsementsov@virtuozzo.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=eblake@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/07 03:15:48 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, "open list:qed" , stefanha@redhat.com, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The other four drivers that support backing files (qcow, qcow2, parallels, vmdk) all rely on the block layer to populate zeroes when reading beyond EOF of a short backing file. We can simplify the qed code by doing likewise. Signed-off-by: Eric Blake Reviewed-by: Vladimir Sementsov-Ogievskiy --- I noticed this during my audit that v1 of Vladimir's series was correct. No change in iotests results (test 274 is currently failing for qed, but for other reasons: +Traceback (most recent call last): + File "274", line 24, in + iotests.verify_image_format(supported_fmts=3D['qcow2']) +AttributeError: module 'iotests' has no attribute 'verify_image_format' ) block/qed.h | 1 - block/qed.c | 64 +++++------------------------------------------------ 2 files changed, 6 insertions(+), 59 deletions(-) diff --git a/block/qed.h b/block/qed.h index 42c115d8220c..3d12bf78d412 100644 --- a/block/qed.h +++ b/block/qed.h @@ -140,7 +140,6 @@ typedef struct QEDAIOCB { /* Current cluster scatter-gather list */ QEMUIOVector cur_qiov; - QEMUIOVector *backing_qiov; uint64_t cur_pos; /* position on block device, in bytes = */ uint64_t cur_cluster; /* cluster offset in image file */ unsigned int cur_nclusters; /* number of clusters being accessed */ diff --git a/block/qed.c b/block/qed.c index 927382995a0c..bea4b9f6cc97 100644 --- a/block/qed.c +++ b/block/qed.c @@ -849,56 +849,18 @@ static BDRVQEDState *acb_to_s(QEDAIOCB *acb) * @s: QED state * @pos: Byte position in device * @qiov: Destination I/O vector - * @backing_qiov: Possibly shortened copy of qiov, to be allocated here - * @cb: Completion function - * @opaque: User data for completion function * * This function reads qiov->size bytes starting at pos from the backing f= ile. * If there is no backing file then zeroes are read. */ static int coroutine_fn qed_read_backing_file(BDRVQEDState *s, uint64_t po= s, - QEMUIOVector *qiov, - QEMUIOVector **backing_qiov) + QEMUIOVector *qiov) { - uint64_t backing_length =3D 0; - size_t size; - int ret; - - /* If there is a backing file, get its length. Treat the absence of a - * backing file like a zero length backing file. - */ if (s->bs->backing) { - int64_t l =3D bdrv_getlength(s->bs->backing->bs); - if (l < 0) { - return l; - } - backing_length =3D l; - } - - /* Zero all sectors if reading beyond the end of the backing file */ - if (pos >=3D backing_length || - pos + qiov->size > backing_length) { - qemu_iovec_memset(qiov, 0, 0, qiov->size); - } - - /* Complete now if there are no backing file sectors to read */ - if (pos >=3D backing_length) { - return 0; - } - - /* If the read straddles the end of the backing file, shorten it */ - size =3D MIN((uint64_t)backing_length - pos, qiov->size); - - assert(*backing_qiov =3D=3D NULL); - *backing_qiov =3D g_new(QEMUIOVector, 1); - qemu_iovec_init(*backing_qiov, qiov->niov); - qemu_iovec_concat(*backing_qiov, qiov, 0, size); - - BLKDBG_EVENT(s->bs->file, BLKDBG_READ_BACKING_AIO); - ret =3D bdrv_co_preadv(s->bs->backing, pos, size, *backing_qiov, 0); - if (ret < 0) { - return ret; + BLKDBG_EVENT(s->bs->file, BLKDBG_READ_BACKING_AIO); + return bdrv_co_preadv(s->bs->backing, pos, qiov->size, qiov, 0); } + qemu_iovec_memset(qiov, 0, 0, qiov->size); return 0; } @@ -915,7 +877,6 @@ static int coroutine_fn qed_copy_from_backing_file(BDRV= QEDState *s, uint64_t offset) { QEMUIOVector qiov; - QEMUIOVector *backing_qiov =3D NULL; int ret; /* Skip copy entirely if there is no work to do */ @@ -925,13 +886,7 @@ static int coroutine_fn qed_copy_from_backing_file(BDR= VQEDState *s, qemu_iovec_init_buf(&qiov, qemu_blockalign(s->bs, len), len); - ret =3D qed_read_backing_file(s, pos, &qiov, &backing_qiov); - - if (backing_qiov) { - qemu_iovec_destroy(backing_qiov); - g_free(backing_qiov); - backing_qiov =3D NULL; - } + ret =3D qed_read_backing_file(s, pos, &qiov); if (ret) { goto out; @@ -1339,8 +1294,7 @@ static int coroutine_fn qed_aio_read_data(void *opaqu= e, int ret, qemu_iovec_memset(&acb->cur_qiov, 0, 0, acb->cur_qiov.size); r =3D 0; } else if (ret !=3D QED_CLUSTER_FOUND) { - r =3D qed_read_backing_file(s, acb->cur_pos, &acb->cur_qiov, - &acb->backing_qiov); + r =3D qed_read_backing_file(s, acb->cur_pos, &acb->cur_qiov); } else { BLKDBG_EVENT(bs->file, BLKDBG_READ_AIO); r =3D bdrv_co_preadv(bs->file, offset, acb->cur_qiov.size, @@ -1365,12 +1319,6 @@ static int coroutine_fn qed_aio_next_io(QEDAIOCB *ac= b) while (1) { trace_qed_aio_next_io(s, acb, 0, acb->cur_pos + acb->cur_qiov.size= ); - if (acb->backing_qiov) { - qemu_iovec_destroy(acb->backing_qiov); - g_free(acb->backing_qiov); - acb->backing_qiov =3D NULL; - } - acb->qiov_offset +=3D acb->cur_qiov.size; acb->cur_pos +=3D acb->cur_qiov.size; qemu_iovec_reset(&acb->cur_qiov); --=20 2.26.2