From nobody Mon Nov 10 11:18:03 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1556734669; cv=none; d=zoho.com; s=zohoarc; b=UceNb3xbwdC//GR6LIwWpiVZjXPko1ocANrrbwBta8nFk3z23RjGuxE9+S7YR9Bu2YC+AEpOW78RTrekH8qkf2r303/efKvgO7Z29GxfjETzL03PqCrE8QU6pEjAbQU6BEjh7SoQTMM/k8EotZ6J3ez2dQbL6TLHg5EP1v5EtrY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556734669; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=ewSLV48hoUTk5bwPLhqgyOC8xegkUkvaV7q8eMrrfkw=; b=EeKejkbSLW5ltPnGNVGTHFEPhB2knhohLhe0LKJOLhceNjsAAJn0VDRT6kncQNIWZw6olRjvSc+g/mYuI+T90+/IJGqxNahA1eNlwAK8sAxNtIsgjgOuvxL1BQpC59c+1Fbo2J9jFU+BmbdkZXHZ4zmxFCxNMJOJpeAz/wfvo9I= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556734669502802.9563526971591; Wed, 1 May 2019 11:17:49 -0700 (PDT) Received: from localhost ([127.0.0.1]:38031 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLtnb-0000kn-Gv for importer@patchew.org; Wed, 01 May 2019 14:17:43 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45584) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLtkb-0007Ml-AW for qemu-devel@nongnu.org; Wed, 01 May 2019 14:14:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLtka-0002bh-Ck for qemu-devel@nongnu.org; Wed, 01 May 2019 14:14:37 -0400 Received: from fanzine.igalia.com ([91.117.99.155]:38852) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hLtka-0002RE-4C; Wed, 01 May 2019 14:14:36 -0400 Received: from 87-92-6-174.bb.dnainternet.fi ([87.92.6.174] helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1hLtkH-0002EC-7J; Wed, 01 May 2019 20:14:17 +0200 Received: from berto by perseus.local with local (Exim 4.89) (envelope-from ) id 1hLtk2-0002yJ-IP; Wed, 01 May 2019 21:14:02 +0300 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=References:In-Reply-To:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=ewSLV48hoUTk5bwPLhqgyOC8xegkUkvaV7q8eMrrfkw=; b=jDMNJsKfyYI6pJtOR6g8pKqw5XSuI0UCjNmoWzOwHXrG+PO1BziowF3lgR+bsbCNL7+ZSmaZ1i/6+wSqco8Vy+4g81+RLrE2M2rOI2Fn1oAEK+oxF89VCfOPteoMcZ970M1TnFGcRxamSvIDRkI+n+WqUSY/G8KhvO3PgoRSaUwK43WO9hZLq5ZZzwzKQj4byxlAbx59DEst/TnFAnb68Gepkd+6I3eGkA8YSOU0uHXeSBPjw0lh0fOyfDz1Yn5OdDQ+cE/bPlQxnbhpB2US9c1EA8XNyE6HhR55hvMoplpMWFPbwQF07zg5okHpUW7SydIYWLDh5C50D4ocw/Vofw==; From: Alberto Garcia To: qemu-devel@nongnu.org Date: Wed, 1 May 2019 21:13:55 +0300 Message-Id: <09c6ad4af497136c11291257ee8bf10608e2b86e.1556732434.git.berto@igalia.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 91.117.99.155 Subject: [Qemu-devel] [PATCH v2 1/5] qcow2: Replace bdrv_write() with bdrv_pwrite() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Alberto Garcia , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" There's only one bdrv_write() call left in the qcow2 code, and it can be trivially replaced with the byte-based bdrv_pwrite(). Signed-off-by: Alberto Garcia Reviewed-by: Vladimir Sementsov-Ogievskiy --- block/qcow2-refcount.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index e0fe322500..83f66eed7a 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -2409,8 +2409,8 @@ write_refblocks: on_disk_refblock =3D (void *)((char *) *refcount_table + refblock_index * s->cluster_size); =20 - ret =3D bdrv_write(bs->file, refblock_offset / BDRV_SECTOR_SIZE, - on_disk_refblock, s->cluster_sectors); + ret =3D bdrv_pwrite(bs->file, refblock_offset, on_disk_refblock, + s->cluster_size); if (ret < 0) { fprintf(stderr, "ERROR writing refblock: %s\n", strerror(-ret)= ); goto fail; --=20 2.11.0 From nobody Mon Nov 10 11:18:03 2025 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1556734878; cv=none; d=zoho.com; s=zohoarc; b=QtHmvcIRiQVV3CovxCTWbWNf/J9ipxG2WykrIzRbWpPua+7LwJgMY6N8Okz+M3fje681wBAoBasD5tTc02y04QHB1g8rPdisJIt2z1bM0U6mCpl7kZzpn8C+leWsrDFa7EI+NwEg6m+tHNKD0lgw/4MzN7YCGFffPiKwe/Es6tA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556734878; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=yAyTw3ZPSaXiSS8D4mL6VTPvWr3OtM2rqBBfpDKFyPM=; b=mGHv9AadNUUDDYtjuwV1m2l8TISBZu6k7vecEAMRCyepd9q3vrJO8MzfUGGhcoSIA87GpZzX2bV5bR6bMjxboqnwU0w4rfrf6aQlAVkmDUJv2IPrqxXx9T6kC0O3sZNrJzdHZJBBaA66dhAuevFCZCG31WQAIJl6qSPuw219iW0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556734878333719.5516918638601; Wed, 1 May 2019 11:21:18 -0700 (PDT) Received: from localhost ([127.0.0.1]:38090 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLtqp-0002wh-8g for importer@patchew.org; Wed, 01 May 2019 14:21:03 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45611) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLtkc-0007NH-4u for qemu-devel@nongnu.org; Wed, 01 May 2019 14:14:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLtkb-0002cK-4k for qemu-devel@nongnu.org; Wed, 01 May 2019 14:14:38 -0400 Received: from fanzine.igalia.com ([91.117.99.155]:38860) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hLtka-0002RH-RF; Wed, 01 May 2019 14:14:37 -0400 Received: from 87-92-6-174.bb.dnainternet.fi ([87.92.6.174] helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1hLtkH-0002EB-7K; Wed, 01 May 2019 20:14:17 +0200 Received: from berto by perseus.local with local (Exim 4.89) (envelope-from ) id 1hLtk2-0002yL-Jb; Wed, 01 May 2019 21:14:02 +0300 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=References:In-Reply-To:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=yAyTw3ZPSaXiSS8D4mL6VTPvWr3OtM2rqBBfpDKFyPM=; b=hXKrXsIdfYrQBxqOgTI4YwNzufWvVfWaiyOGUlefjkWG2awV7iFaQD+5wuRtiZT6r/LjjoMU4xrmZ2xXEDLxFLLNelZg18YR9CRS7YuSv7CyNIo5JJITvS4jLcHOcrLOfI7waTgif+hEBeG5F1DXRktpHGiATq4OZMeUhpNYS8WDSynb0GnyYE8YPZ++zv/f9tETnpFKkVqT/Ylbov0XbzjCJVwSCsxDV8wCyI5qizDFOSymBNV0L6StpoUM6CVWoO+LHYmMScf2ZIAAAm8F11KpBhZ5OaS542eKmDT0MQg2etU7uwsK9myOAQUjktxgmjEgWgjZSfW4foijHVzYnQ==; From: Alberto Garcia To: qemu-devel@nongnu.org Date: Wed, 1 May 2019 21:13:56 +0300 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 91.117.99.155 Subject: [Qemu-devel] [PATCH v2 2/5] vdi: Replace bdrv_{read, write}() with bdrv_{pread, pwrite}() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Alberto Garcia , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" There's only a couple of bdrv_read() and bdrv_write() calls left in the vdi code, and they can be trivially replaced with the byte-based bdrv_pread() and bdrv_pwrite(). Signed-off-by: Alberto Garcia Reviewed-by: Vladimir Sementsov-Ogievskiy --- block/vdi.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/block/vdi.c b/block/vdi.c index e1c42ad732..9caeb50dd1 100644 --- a/block/vdi.c +++ b/block/vdi.c @@ -171,6 +171,8 @@ typedef struct { uint64_t unused2[7]; } QEMU_PACKED VdiHeader; =20 +QEMU_BUILD_BUG_ON(sizeof(VdiHeader) !=3D 512); + typedef struct { /* The block map entries are little endian (even in memory). */ uint32_t *bmap; @@ -384,7 +386,7 @@ static int vdi_open(BlockDriverState *bs, QDict *option= s, int flags, =20 logout("\n"); =20 - ret =3D bdrv_read(bs->file, 0, (uint8_t *)&header, 1); + ret =3D bdrv_pread(bs->file, 0, (uint8_t *)&header, sizeof(header)); if (ret < 0) { goto fail; } @@ -484,8 +486,8 @@ static int vdi_open(BlockDriverState *bs, QDict *option= s, int flags, goto fail; } =20 - ret =3D bdrv_read(bs->file, s->bmap_sector, (uint8_t *)s->bmap, - bmap_size); + ret =3D bdrv_pread(bs->file, header.offset_bmap, (uint8_t *)s->bmap, + bmap_size * SECTOR_SIZE); if (ret < 0) { goto fail_free_bmap; } @@ -704,7 +706,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, sizeof(VdiHeader)); g_free(block); block =3D NULL; =20 @@ -722,10 +724,11 @@ 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); } =20 - return ret; + return ret < 0 ? ret : 0; } =20 static int coroutine_fn vdi_co_do_create(BlockdevCreateOptions *create_opt= ions, --=20 2.11.0 From nobody Mon Nov 10 11:18:03 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1556734944; cv=none; d=zoho.com; s=zohoarc; b=Wth4W1kuCqJQvwpeytw28/mPcnwCl9AS4S0sAheJnoi4k3Hnje6kKri2GSZ3XIFTe6dZwvtXUkoqCPj9NQspDEiHP2rcVY+RXFcG0aKjxsHNWW44CsoCZy77FJua1JeTSo2au1CeC4mtNuguEu1GEYm+2xqUpl+7DjuO0LmMDA0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556734944; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=gu6vZ9BZd32QJ/IQ0z70dkM0F4vMe4X00civB0gcGbI=; b=oeAVwGH9d4u8ordwrCKMl2M6CJycdYgwjdbTuMa43P0wy6HnQCzZH4L92SB6KSufxnZpEtL4MMPI/oPLBd9u4QAjrOO2X2m/JzgqYmz89+0Jtyl8wfeEIZmnRjHVamDgDP8Z0AikGwVY+VIpy8RQD4pd8faMc3fug/seWFdm2bQ= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556734944125697.7180747432149; Wed, 1 May 2019 11:22:24 -0700 (PDT) Received: from localhost ([127.0.0.1]:38099 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLtrz-0003da-2W for importer@patchew.org; Wed, 01 May 2019 14:22:15 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45620) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLtkc-0007NY-Hj for qemu-devel@nongnu.org; Wed, 01 May 2019 14:14:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLtkb-0002cF-4S for qemu-devel@nongnu.org; Wed, 01 May 2019 14:14:38 -0400 Received: from fanzine.igalia.com ([91.117.99.155]:38856) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hLtka-0002RI-RG; Wed, 01 May 2019 14:14:37 -0400 Received: from 87-92-6-174.bb.dnainternet.fi ([87.92.6.174] helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1hLtkH-0002E8-5H; Wed, 01 May 2019 20:14:17 +0200 Received: from berto by perseus.local with local (Exim 4.89) (envelope-from ) id 1hLtk2-0002yN-Ke; Wed, 01 May 2019 21:14:02 +0300 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=References:In-Reply-To:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=gu6vZ9BZd32QJ/IQ0z70dkM0F4vMe4X00civB0gcGbI=; b=FPMOeqWjBEHefkfrav8r2YRsWmiqQoEpYuxJx1DG87ZPsjH1bqTd9IhanlPvk6FfspAGosvc8oMh1Nt6k78wkJkBiBxj90Ly/1pw+7AkFQi/VjF0lh5rcH2sGHOiyH4SQhXqsnIro5Bfkj90LIn7UQXNxYyg6I3NZu7F2PHsKFclyVmjPr5vyKwAdPalg+BzCzf7nV3szX19OzxtGXIAkp1z34VFvsHA9irZtJ7AZtH1LwBGAlC3kCXnBbdoHN3D3xndT+fhlbRvJXumkFM8IKZ62QOhG3U2CxxX3kNq8//OvorO6vbbYsztbVpe1uz1mwLZgblumSEgNBLb7BMFrw==; From: Alberto Garcia To: qemu-devel@nongnu.org Date: Wed, 1 May 2019 21:13:57 +0300 Message-Id: <524e211cb818a20f521d6e271e782ab62b8e5e80.1556732434.git.berto@igalia.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 91.117.99.155 Subject: [Qemu-devel] [PATCH v2 3/5] vvfat: Replace bdrv_{read, write}() with bdrv_{pread, pwrite}() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Alberto Garcia , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" There's only a couple of bdrv_read() and bdrv_write() calls left in the vvfat code, and they can be trivially replaced with the byte-based bdrv_pread() and bdrv_pwrite(). Signed-off-by: Alberto Garcia --- block/vvfat.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/block/vvfat.c b/block/vvfat.c index 5f66787890..253cc716dd 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -1494,8 +1494,8 @@ static int vvfat_read(BlockDriverState *bs, int64_t s= ector_num, DLOG(fprintf(stderr, "sectors %" PRId64 "+%" PRId64 " allocated\n", sector_num, n >> BDRV_SECTOR_BITS)); - if (bdrv_read(s->qcow, sector_num, buf + i * 0x200, - n >> BDRV_SECTOR_BITS)) { + if (bdrv_pread(s->qcow, sector_num * BDRV_SECTOR_SIZE, + buf + i * 0x200, n) < 0) { return -1; } i +=3D (n >> BDRV_SECTOR_BITS) - 1; @@ -1983,8 +1983,9 @@ static uint32_t get_cluster_count_for_direntry(BDRVVV= FATState* s, if (res) { return -1; } - res =3D bdrv_write(s->qcow, offset, s->cluster_buf= fer, 1); - if (res) { + res =3D bdrv_pwrite(s->qcow, offset * BDRV_SECTOR_= SIZE, + s->cluster_buffer, BDRV_SECTOR_S= IZE); + if (res < 0) { return -2; } } @@ -3050,7 +3051,8 @@ DLOG(checkpoint()); * Use qcow backend. Commit later. */ DLOG(fprintf(stderr, "Write to qcow backend: %d + %d\n", (int)sector_num, = nb_sectors)); - ret =3D bdrv_write(s->qcow, sector_num, buf, nb_sectors); + ret =3D bdrv_pwrite(s->qcow, sector_num * BDRV_SECTOR_SIZE, buf, + nb_sectors * BDRV_SECTOR_SIZE); if (ret < 0) { fprintf(stderr, "Error writing to qcow backend\n"); return ret; --=20 2.11.0 From nobody Mon Nov 10 11:18:03 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1556734577; cv=none; d=zoho.com; s=zohoarc; b=NVGHD9ZjlvWBG2kVSRq7RB7mUjCaV8Pbqi2AFGM+yxsrf2s+JiDwR9hW/x4kaVqi5uvIZ46on0QZklvJolFowRPKN+mz3Kt4bansBjYIgtCzAV2MdpG4XG6lKywjHQXTnmfey9lSo/kJ/dIT0ghhyp8y+wFaenUtmTtwRQ6i5Pk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556734577; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=1zie0qObAwQaeCCFa1ZBm67hgRpmFwHFYllCubHlZac=; b=oHrCNN6KsvYtBrVT6K8Enq1yEvfgw5PoUcI5RDTKs8Iv814X3mW6j3ESGQ/fzW2h8DnlcNOeA0aYl3f8LHVk0Oe2RK2rpicrUaLCJO3zqO0QdWfhGhyr9hR5vK3LLdxLw/m6UU3jVP1oP7JBPWcPWE/4XKAs2PJKAnOIbxlThXI= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556734575923926.7911075378987; Wed, 1 May 2019 11:16:15 -0700 (PDT) Received: from localhost ([127.0.0.1]:38018 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLtm5-0008AC-2G for importer@patchew.org; Wed, 01 May 2019 14:16:09 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45575) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLtka-0007MY-Vy for qemu-devel@nongnu.org; Wed, 01 May 2019 14:14:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLtkZ-0002bD-WA for qemu-devel@nongnu.org; Wed, 01 May 2019 14:14:36 -0400 Received: from fanzine.igalia.com ([91.117.99.155]:38864) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hLtkZ-0002RG-F0; Wed, 01 May 2019 14:14:35 -0400 Received: from 87-92-6-174.bb.dnainternet.fi ([87.92.6.174] helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1hLtkH-0002ED-6P; Wed, 01 May 2019 20:14:17 +0200 Received: from berto by perseus.local with local (Exim 4.89) (envelope-from ) id 1hLtk2-0002yP-M0; Wed, 01 May 2019 21:14:02 +0300 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=References:In-Reply-To:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=1zie0qObAwQaeCCFa1ZBm67hgRpmFwHFYllCubHlZac=; b=CJcgxZA6UOEyGNLxLjXa2psIp3iTBr95rSrvr3zEx1oN9FifEBN3zb3b4XevihbdxL/FY4MNhGIDRX/8FrDX2oasInyLKKpWEETxCvUWMMISjq0ginJI8O39HHcI5WLop7hbyEk2TAyHxCOiRQ+vh0UiFRH0U3WjtEB8XRDju2DLrBogAuYEEo2IHLN/2BsIXtxnwC+7+gq2RIhyYk3hJ6r1LLN8V9c8aaxkCKPuVh442DVszGdeHTcBXfm95oHFfP4F/DBDQCEGPo9Jg7PuoK60G0+FTHmQK6g6nG0dw/kWPuEUOeJej0rLnTABaYBghaloMJCMVvYPMMKmf+gVuA==; From: Alberto Garcia To: qemu-devel@nongnu.org Date: Wed, 1 May 2019 21:13:58 +0300 Message-Id: <39b2f01f936e47e24a28657c00a1110b5df6111e.1556732434.git.berto@igalia.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 91.117.99.155 Subject: [Qemu-devel] [PATCH v2 4/5] block: Remove bdrv_read() and bdrv_write() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Alberto Garcia , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" No one is using these functions anymore, all callers have switched to the byte-based bdrv_pread() and bdrv_pwrite() Signed-off-by: Alberto Garcia Reviewed-by: Vladimir Sementsov-Ogievskiy --- block/io.c | 43 +++++++------------------------------------ include/block/block.h | 4 ---- 2 files changed, 7 insertions(+), 40 deletions(-) diff --git a/block/io.c b/block/io.c index dfc153b8d8..396d5364ba 100644 --- a/block/io.c +++ b/block/io.c @@ -837,42 +837,6 @@ static int bdrv_prwv_co(BdrvChild *child, int64_t offs= et, return rwco.ret; } =20 -/* - * Process a synchronous request using coroutines - */ -static int bdrv_rw_co(BdrvChild *child, int64_t sector_num, uint8_t *buf, - int nb_sectors, bool is_write, BdrvRequestFlags flag= s) -{ - QEMUIOVector qiov =3D QEMU_IOVEC_INIT_BUF(qiov, buf, - nb_sectors * BDRV_SECTOR_SIZE); - - if (nb_sectors < 0 || nb_sectors > BDRV_REQUEST_MAX_SECTORS) { - return -EINVAL; - } - - return bdrv_prwv_co(child, sector_num << BDRV_SECTOR_BITS, - &qiov, is_write, flags); -} - -/* return < 0 if error. See bdrv_write() for the return codes */ -int bdrv_read(BdrvChild *child, int64_t sector_num, - uint8_t *buf, int nb_sectors) -{ - return bdrv_rw_co(child, sector_num, buf, nb_sectors, false, 0); -} - -/* Return < 0 if error. Important errors are: - -EIO generic I/O error (may happen for all errors) - -ENOMEDIUM No media inserted. - -EINVAL Invalid sector number or nb_sectors - -EACCES Trying to write a read-only device -*/ -int bdrv_write(BdrvChild *child, int64_t sector_num, - const uint8_t *buf, int nb_sectors) -{ - return bdrv_rw_co(child, sector_num, (uint8_t *)buf, nb_sectors, true,= 0); -} - int bdrv_pwrite_zeroes(BdrvChild *child, int64_t offset, int bytes, BdrvRequestFlags flags) { @@ -935,6 +899,7 @@ int bdrv_preadv(BdrvChild *child, int64_t offset, QEMUI= OVector *qiov) return qiov->size; } =20 +/* See bdrv_pwrite() for the return codes */ int bdrv_pread(BdrvChild *child, int64_t offset, void *buf, int bytes) { QEMUIOVector qiov =3D QEMU_IOVEC_INIT_BUF(qiov, buf, bytes); @@ -958,6 +923,12 @@ int bdrv_pwritev(BdrvChild *child, int64_t offset, QEM= UIOVector *qiov) return qiov->size; } =20 +/* Return no. of bytes on success or < 0 on error. Important errors are: + -EIO generic I/O error (may happen for all errors) + -ENOMEDIUM No media inserted. + -EINVAL Invalid offset or number of bytes + -EACCES Trying to write a read-only device +*/ int bdrv_pwrite(BdrvChild *child, int64_t offset, const void *buf, int byt= es) { QEMUIOVector qiov =3D QEMU_IOVEC_INIT_BUF(qiov, buf, bytes); diff --git a/include/block/block.h b/include/block/block.h index c7a26199aa..5e2b98b0ee 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -316,10 +316,6 @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue, Error **errp); void bdrv_reopen_commit(BDRVReopenState *reopen_state); void bdrv_reopen_abort(BDRVReopenState *reopen_state); -int bdrv_read(BdrvChild *child, int64_t sector_num, - uint8_t *buf, int nb_sectors); -int bdrv_write(BdrvChild *child, int64_t sector_num, - const uint8_t *buf, int nb_sectors); int bdrv_pwrite_zeroes(BdrvChild *child, int64_t offset, int bytes, BdrvRequestFlags flags); int bdrv_make_zero(BdrvChild *child, BdrvRequestFlags flags); --=20 2.11.0 From nobody Mon Nov 10 11:18:03 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1556734694; cv=none; d=zoho.com; s=zohoarc; b=MPfF9pav8xW/JsiHJy9tNOfisAMMmlAarxXG5NY4BwSyR2YpOYdSswwr6ybed+WwbetcSpUgtEmBbV3kX0HVncDdcp7A4b3UMTGk3zd/QKj2k99g2WNcvsspqDB7YWLZU4PMhGtCcCCvmXm9U7y4lgy50HCjWmHWzPKWGzmvvVY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556734694; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=KkctMI72rLkwiXwR9ML3+BCZSH3Ea3Z75mAt/xOnaeM=; b=S38lvS85Evx4eI0KN9U6LCbZeI9fMyv7Gezaihy6vvl9tTU4e5hAQ+H2durAppEFKw37ZvTwhitV4YOQuDkJ3kOZWztCq/VmFF0dTbw2XYl4uyTm++XhhCXjENEHMGyUVNgvRhyahFMdzyJ1s+g+CSI8Kx7WcYgHN61RBLOQDj4= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556734694590197.69420262966844; Wed, 1 May 2019 11:18:14 -0700 (PDT) Received: from localhost ([127.0.0.1]:38033 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLto2-00011R-JG for importer@patchew.org; Wed, 01 May 2019 14:18:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45624) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLtkc-0007Nb-Jg for qemu-devel@nongnu.org; Wed, 01 May 2019 14:14:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLtka-0002bI-0L for qemu-devel@nongnu.org; Wed, 01 May 2019 14:14:38 -0400 Received: from fanzine.igalia.com ([91.117.99.155]:38862) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hLtkZ-0002RJ-F1; Wed, 01 May 2019 14:14:35 -0400 Received: from 87-92-6-174.bb.dnainternet.fi ([87.92.6.174] helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1hLtkH-0002EA-53; Wed, 01 May 2019 20:14:17 +0200 Received: from berto by perseus.local with local (Exim 4.89) (envelope-from ) id 1hLtk2-0002yR-NK; Wed, 01 May 2019 21:14:02 +0300 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=References:In-Reply-To:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=KkctMI72rLkwiXwR9ML3+BCZSH3Ea3Z75mAt/xOnaeM=; b=dJx+M+fcDDAF5opcX6cWe+0xUJNZEk2K0jn9/zVepN30Fi5mMbhK+qIXU70PeiiOt6s+G6CwMK3C21fIneiiQPWXn/PyykC1sQ90XfIJKQgYncR/HOwrUoRNIx5ch9auNbSJglyFwwp3LuFYYtMy2Uw5gpPsCmjKVRWiGvqqw02KZyeC2cBjyE93ExpHD+b1zk0KKLRp3tGaYBCDWsjLIMvvssRZo+cK1EgSXfjD9zWPQLdip2BXDPwt41LXsqkN1XHIw58l5sDNldcxruizqJgDVgRRRUiihKZuqXpyqNHe4ji8ZJvYjDSNFPEMFL9vrLYuYEBzJWJTgTwNKETnbQ==; From: Alberto Garcia To: qemu-devel@nongnu.org Date: Wed, 1 May 2019 21:13:59 +0300 Message-Id: <6026d9eb2851d22f6ff031e208120735361ea606.1556732434.git.berto@igalia.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 91.117.99.155 Subject: [Qemu-devel] [PATCH v2 5/5] qcow2: Remove BDRVQcow2State.cluster_sectors X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Alberto Garcia , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The last user of this field disappeared when we replace the sector-based bdrv_write() with the byte-based bdrv_pwrite(). Signed-off-by: Alberto Garcia Reviewed-by: Vladimir Sementsov-Ogievskiy --- block/qcow2.c | 1 - block/qcow2.h | 1 - 2 files changed, 2 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index a520d116ef..8e024007db 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1259,7 +1259,6 @@ static int coroutine_fn qcow2_do_open(BlockDriverStat= e *bs, QDict *options, =20 s->cluster_bits =3D header.cluster_bits; s->cluster_size =3D 1 << s->cluster_bits; - s->cluster_sectors =3D 1 << (s->cluster_bits - BDRV_SECTOR_BITS); =20 /* Initialise version 3 header fields */ if (header.version =3D=3D 2) { diff --git a/block/qcow2.h b/block/qcow2.h index fdee297f33..e62508d1ce 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -266,7 +266,6 @@ typedef struct Qcow2BitmapHeaderExt { typedef struct BDRVQcow2State { int cluster_bits; int cluster_size; - int cluster_sectors; int l2_slice_size; int l2_bits; int l2_size; --=20 2.11.0