From nobody Sun Oct 5 21:14:38 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1542247576352258.5736787708578; Wed, 14 Nov 2018 18:06:16 -0800 (PST) Received: from localhost ([::1]:35611 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gN72i-0003Uw-4c for importer@patchew.org; Wed, 14 Nov 2018 21:06:04 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53505) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gN70e-0002CR-AV for qemu-devel@nongnu.org; Wed, 14 Nov 2018 21:03:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gN70c-0005d5-7J for qemu-devel@nongnu.org; Wed, 14 Nov 2018 21:03:56 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55708) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gN70S-0005Zv-Ff; Wed, 14 Nov 2018 21:03:46 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9D11A80462; Thu, 15 Nov 2018 02:03:43 +0000 (UTC) Received: from red.redhat.com (ovpn-123-32.rdu2.redhat.com [10.10.123.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6418260BF6; Thu, 15 Nov 2018 02:03:42 +0000 (UTC) From: Eric Blake To: qemu-devel@nongnu.org Date: Wed, 14 Nov 2018 20:03:23 -0600 Message-Id: <20181115020334.1189829-3-eblake@redhat.com> In-Reply-To: <20181115020334.1189829-1-eblake@redhat.com> References: <20181115020334.1189829-1-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 15 Nov 2018 02:03:43 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 02/13] 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" 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 2380daa583e..b5d699f62c2 100644 --- a/block/vdi.c +++ b/block/vdi.c @@ -377,7 +377,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; } @@ -467,15 +467,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; } @@ -694,7 +693,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; @@ -712,7 +711,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.17.2