From nobody Wed Dec 17 05:46:17 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; 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1556640268; cv=none; d=zoho.com; s=zohoarc; b=i9G6sKs45TkfUgW+75h2OdK0dRBx2FT+Bi78beo800A+7/WZYqqGOGNbvlSwIFsDbi6DzoM+4kB4Xn2ug51WaIS1PsJtUm/Q9Yl+AvOWHAZkAtxtPEg5L5rhXNrHEoWp9FgOuPkcUnPzZRIv+TPPwyBzudjiJ7OlFa8qWrhGg6Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556640268; h=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:ARC-Authentication-Results; bh=YwifdZfpCzTxN2YVgxXsPe61f5k4fIJlUpi6OJ1YZL8=; b=i+SY3NGSfygZDfnN1/NUp6+z2RdboutRhULk14bm21GzSUJ7ry4hRuJf2HfMXtOtWdjr+cxc7Lmwj4fKyaLxrsTl9eevy667YERWJYxMREg8VJxI4upmY/tWvHWYpH6yhtwuN9J2vsiD8+tFb7Z0YOcVMmCqzJopu27HXo/GAR0= ARC-Authentication-Results: i=1; mx.zoho.com; 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; 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 1556640268674620.365850383317; Tue, 30 Apr 2019 09:04:28 -0700 (PDT) Received: from localhost ([127.0.0.1]:49114 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLVF3-0008GY-Jj for importer@patchew.org; Tue, 30 Apr 2019 12:04:25 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48905) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLUuu-00086l-E8 for qemu-devel@nongnu.org; Tue, 30 Apr 2019 11:43:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLUus-00029A-HP for qemu-devel@nongnu.org; Tue, 30 Apr 2019 11:43:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:17115) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLUun-00022M-8n; Tue, 30 Apr 2019 11:43: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 mx1.redhat.com (Postfix) with ESMTPS id 634028046F; Tue, 30 Apr 2019 15:43:28 +0000 (UTC) Received: from linux.fritz.box.com (unknown [10.36.118.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 91F884C7; Tue, 30 Apr 2019 15:43:25 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Tue, 30 Apr 2019 17:42:34 +0200 Message-Id: <20190430154244.30083-18-kwolf@redhat.com> In-Reply-To: <20190430154244.30083-1-kwolf@redhat.com> References: <20190430154244.30083-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 30 Apr 2019 15:43:28 +0000 (UTC) Content-Transfer-Encoding: quoted-printable 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] [PULL 17/27] block/qcow2: use buffer-based io 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, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Stefan Hajnoczi Reviewed-by: Stefano Garzarella Signed-off-by: Kevin Wolf --- block/qcow2.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index c5c17734d7..a520d116ef 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -4094,7 +4094,6 @@ qcow2_co_pwritev_compressed(BlockDriverState *bs, uin= t64_t offset, uint64_t bytes, QEMUIOVector *qiov) { BDRVQcow2State *s =3D bs->opaque; - QEMUIOVector hd_qiov; int ret; ssize_t out_len; uint8_t *buf, *out_buf; @@ -4161,10 +4160,8 @@ qcow2_co_pwritev_compressed(BlockDriverState *bs, ui= nt64_t offset, goto fail; } =20 - qemu_iovec_init_buf(&hd_qiov, out_buf, out_len); - BLKDBG_EVENT(s->data_file, BLKDBG_WRITE_COMPRESSED); - ret =3D bdrv_co_pwritev(s->data_file, cluster_offset, out_len, &hd_qio= v, 0); + ret =3D bdrv_co_pwrite(s->data_file, cluster_offset, out_len, out_buf,= 0); if (ret < 0) { goto fail; } @@ -4187,7 +4184,6 @@ qcow2_co_preadv_compressed(BlockDriverState *bs, int ret =3D 0, csize, nb_csectors; uint64_t coffset; uint8_t *buf, *out_buf; - QEMUIOVector local_qiov; int offset_in_cluster =3D offset_into_cluster(s, offset); =20 coffset =3D file_cluster_offset & s->cluster_offset_mask; @@ -4198,12 +4194,11 @@ qcow2_co_preadv_compressed(BlockDriverState *bs, if (!buf) { return -ENOMEM; } - qemu_iovec_init_buf(&local_qiov, buf, csize); =20 out_buf =3D qemu_blockalign(bs, s->cluster_size); =20 BLKDBG_EVENT(bs->file, BLKDBG_READ_COMPRESSED); - ret =3D bdrv_co_preadv(bs->file, coffset, csize, &local_qiov, 0); + ret =3D bdrv_co_pread(bs->file, coffset, csize, buf, 0); if (ret < 0) { goto fail; } --=20 2.20.1