From nobody Sun Oct 5 19:25:47 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1524750286012761.1306700948343; Thu, 26 Apr 2018 06:44:46 -0700 (PDT) Received: from localhost ([::1]:42397 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fBhCW-0006A9-3y for importer@patchew.org; Thu, 26 Apr 2018 09:44:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51010) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fBhBB-0005M4-QA for qemu-devel@nongnu.org; Thu, 26 Apr 2018 09:43:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fBhBB-0003mt-0Q for qemu-devel@nongnu.org; Thu, 26 Apr 2018 09:43:21 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:34182 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fBhB6-0003iD-I0; Thu, 26 Apr 2018 09:43:16 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8A6A8402333B; Thu, 26 Apr 2018 13:43:13 +0000 (UTC) Received: from red.redhat.com (ovpn-120-65.rdu2.redhat.com [10.10.120.65]) by smtp.corp.redhat.com (Postfix) with ESMTP id 92F2A2026E03; Thu, 26 Apr 2018 13:43:12 +0000 (UTC) From: Eric Blake To: qemu-devel@nongnu.org Date: Thu, 26 Apr 2018 08:43:03 -0500 Message-Id: <20180426134305.642080-2-eblake@redhat.com> In-Reply-To: <20180426134305.642080-1-eblake@redhat.com> References: <20180426134305.642080-1-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Thu, 26 Apr 2018 13:43:13 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Thu, 26 Apr 2018 13:43:13 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'eblake@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH 1/3] vdi: Switch to byte-based calls X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, Stefan Weil , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" We are gradually moving away from sector-based interfaces, towards byte-based. Make the change for the last few sector-based calls into the block layer from the vdi driver. Ideally, the vdi driver should switch to doing everything byte-based, but that's a more invasive change that requires a bit more auditing. Signed-off-by: Eric Blake Reviewed-by: Alberto Garcia --- block/vdi.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/block/vdi.c b/block/vdi.c index 4a2d1ff88d4..fd745982caf 100644 --- a/block/vdi.c +++ b/block/vdi.c @@ -379,7 +379,7 @@ static int vdi_open(BlockDriverState *bs, QDict *option= s, int flags, logout("\n"); - ret =3D bdrv_read(bs->file, 0, (uint8_t *)&header, 1); + ret =3D bdrv_pread(bs->file, 0, &header, sizeof(header)); if (ret < 0) { goto fail; } @@ -468,15 +468,14 @@ static int vdi_open(BlockDriverState *bs, QDict *opti= ons, int flags, s->header =3D header; bmap_size =3D header.blocks_in_image * sizeof(uint32_t); - bmap_size =3D DIV_ROUND_UP(bmap_size, SECTOR_SIZE); - s->bmap =3D qemu_try_blockalign(bs->file->bs, bmap_size * SECTOR_SIZE); + s->bmap =3D qemu_try_blockalign(bs->file->bs, bmap_size); if (s->bmap =3D=3D NULL) { ret =3D -ENOMEM; goto fail; } - ret =3D bdrv_read(bs->file, s->bmap_sector, (uint8_t *)s->bmap, - bmap_size); + ret =3D bdrv_pread(bs->file, s->bmap_sector * SECTOR_SIZE, s->bmap, + bmap_size); if (ret < 0) { goto fail_free_bmap; } @@ -695,7 +694,7 @@ nonallocating_write: assert(VDI_IS_ALLOCATED(bmap_first)); *header =3D s->header; vdi_header_to_le(header); - ret =3D bdrv_write(bs->file, 0, block, 1); + ret =3D bdrv_pwrite(bs->file, 0, block, SECTOR_SIZE); g_free(block); block =3D NULL; @@ -713,7 +712,8 @@ nonallocating_write: base =3D ((uint8_t *)&s->bmap[0]) + bmap_first * SECTOR_SIZE; logout("will write %u block map sectors starting from entry %u\n", n_sectors, bmap_first); - ret =3D bdrv_write(bs->file, offset, base, n_sectors); + ret =3D bdrv_pwrite(bs->file, offset * SECTOR_SIZE, base, + n_sectors * SECTOR_SIZE); } return ret; --=20 2.14.3