From nobody Tue May 13 15:38:26 2025 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675265336; cv=none; d=zohomail.com; s=zohoarc; b=btkxreEIJoIdEahfBWkTST5Azek0rbZ7w3OSIbU8v5RiXmGvcGqwo4ob0zBG5g+oUrczRtXD5KM4nf3CH6+N4D6H0b6vl/W9OsYgKbaeogRiCq8MQYzAub5TrH79GneTlROjBpFT2t7fUQI8P8i5crTPF3f7yIxdQ1aeMtOUkh8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675265336; 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; bh=jspWCkLgEFUCGt5BhuCne7rHezJEGJlqhz9McuYKrI8=; b=jgZON4hSCC4HBfZXL86CYqlh2oOaeCi6BKBDWKa27l/LsLaeraIdF7XxxzR+Co3r70ASkkMOMkeMqdaj4MGbpq/nvldeozU4FOHhjgDfKBqRatpv/GwbXYOVbZJd/PDOpzvh9Iklb5abxTUEuSFuWqURBdTfrJAjC1e79iwmi4Y= ARC-Authentication-Results: i=1; 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+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675265336235361.9242575202712; Wed, 1 Feb 2023 07:28:56 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNF1p-0001XQ-L4; Wed, 01 Feb 2023 10:28:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNF1o-0001Wu-Lo for qemu-devel@nongnu.org; Wed, 01 Feb 2023 10:28:04 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNF1n-000716-4Y for qemu-devel@nongnu.org; Wed, 01 Feb 2023 10:28:04 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-331-hZRtH3xqPJiWpzyfne1yUw-1; Wed, 01 Feb 2023 10:27:59 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E62A218A6465; Wed, 1 Feb 2023 15:27:58 +0000 (UTC) Received: from localhost (unknown [10.39.195.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id 653B2404CD80; Wed, 1 Feb 2023 15:27:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675265282; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jspWCkLgEFUCGt5BhuCne7rHezJEGJlqhz9McuYKrI8=; b=D4SIxbt2RePcOZ67xn3QW3WN3d8j2aOk0sJWRsEAxpwdING3SvwkvA4FDOcewoLebCBCzS 7Et8gZa2dvSrlxvnm68aSnc3osAjU5X2lMUpr7lOQvJEkGKUsi6lAHdOwjD1pWe/N36wtF vWSyzpxhLH4yYRNkKAS4tTQv3IsWfzE= X-MC-Unique: hZRtH3xqPJiWpzyfne1yUw-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Kevin Wolf , Stefan Hajnoczi , qemu-block@nongnu.org, Hanna Reitz , Fam Zheng , Fiona Ebner , Eric Blake Subject: [PATCH v3 2/4] qemu-io: use BdrvRequestFlags instead of int Date: Wed, 1 Feb 2023 10:27:49 -0500 Message-Id: <20230201152751.270508-3-stefanha@redhat.com> In-Reply-To: <20230201152751.270508-1-stefanha@redhat.com> References: <20230201152751.270508-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675265337353100003 Content-Type: text/plain; charset="utf-8" The block layer APIs use BdrvRequestFlags while qemu-io code uses int. Although the code compiles and runs fine, BdrvRequestFlags is clearer because it differentiates between other types of flags like bdrv_open() flags. This is purely refactoring. Reviewed-by: Eric Blake Signed-off-by: Stefan Hajnoczi Reviewed-by: Hanna Czenczek --- qemu-io-cmds.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c index 952dc940f1..c0125d14c0 100644 --- a/qemu-io-cmds.c +++ b/qemu-io-cmds.c @@ -556,7 +556,7 @@ static int do_pread(BlockBackend *blk, char *buf, int64= _t offset, } =20 static int do_pwrite(BlockBackend *blk, char *buf, int64_t offset, - int64_t bytes, int flags, int64_t *total) + int64_t bytes, BdrvRequestFlags flags, int64_t *total) { int ret; =20 @@ -577,7 +577,7 @@ typedef struct { int64_t offset; int64_t bytes; int64_t *total; - int flags; + BdrvRequestFlags flags; int ret; bool done; } CoWriteZeroes; @@ -598,7 +598,8 @@ static void coroutine_fn co_pwrite_zeroes_entry(void *o= paque) } =20 static int do_co_pwrite_zeroes(BlockBackend *blk, int64_t offset, - int64_t bytes, int flags, int64_t *total) + int64_t bytes, BdrvRequestFlags flags, + int64_t *total) { Coroutine *co; CoWriteZeroes data =3D { @@ -688,7 +689,7 @@ static int do_aio_readv(BlockBackend *blk, QEMUIOVector= *qiov, } =20 static int do_aio_writev(BlockBackend *blk, QEMUIOVector *qiov, - int64_t offset, int flags, int *total) + int64_t offset, BdrvRequestFlags flags, int *tota= l) { int async_ret =3D NOT_DONE; =20 @@ -1065,7 +1066,7 @@ static int write_f(BlockBackend *blk, int argc, char = **argv) struct timespec t1, t2; bool Cflag =3D false, qflag =3D false, bflag =3D false; bool Pflag =3D false, zflag =3D false, cflag =3D false, sflag =3D fals= e; - int flags =3D 0; + BdrvRequestFlags flags =3D 0; int c, cnt, ret; char *buf =3D NULL; int64_t offset; @@ -1266,7 +1267,7 @@ static int writev_f(BlockBackend *blk, int argc, char= **argv) { struct timespec t1, t2; bool Cflag =3D false, qflag =3D false; - int flags =3D 0; + BdrvRequestFlags flags =3D 0; int c, cnt, ret; char *buf; int64_t offset; @@ -1581,7 +1582,7 @@ static int aio_write_f(BlockBackend *blk, int argc, c= har **argv) int nr_iov, c; int pattern =3D 0xcd; struct aio_ctx *ctx =3D g_new0(struct aio_ctx, 1); - int flags =3D 0; + BdrvRequestFlags flags =3D 0; =20 ctx->blk =3D blk; while ((c =3D getopt(argc, argv, "CfiqP:uz")) !=3D -1) { --=20 2.39.1