From nobody Tue Apr 8 21:14:32 2025 Delivered-To: importer@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+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675956394; cv=none; d=zohomail.com; s=zohoarc; b=iUO7RJ0FYJS8fhSYxChqpm6GrSbL5bTuDUeIR1+UfT8m8i5aF9QsJshzwF9Qigs4LhYTx9PW5SBW11hdjLLxY4LG/JUiPISdRyHWRg26MBDoTy9pgMh1OrqrsJhfczYdfQCGyDXg4JZrO5LaiUAOKAbEkFC8GTqAB9fvbNDd4ls= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675956394; 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=Q3rZaYBjSPSrjjqfZw//BWKEdSxTMu92MIfjfxIjTyE=; b=EQqX7oFrbRjXsp2qspgZhf/0cbuZ0H8ETPq9SepxjPwoocys+ciZzVPv8tU5i1RI5CJR+xyjrldNTGSFQPfH5A2IbopHg5pFrKToRAkrsigfmXPpIIT1iGY/XexcW50Mz6ckeW+r4wgUV3pxD97xjOwSiZzmcZDYxC8IiLLgRv8= 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+importer=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 1675956394429847.487701408552; Thu, 9 Feb 2023 07:26:34 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQ8nq-0004Ul-RS; Thu, 09 Feb 2023 10:25:38 -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 1pQ8np-0004RP-P1 for qemu-devel@nongnu.org; Thu, 09 Feb 2023 10:25:37 -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 1pQ8no-0000ic-9L for qemu-devel@nongnu.org; Thu, 09 Feb 2023 10:25:37 -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-551-kwiJELr9Nmy0H0s1nYBmrA-1; Thu, 09 Feb 2023 10:25:30 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E1DBC101A521; Thu, 9 Feb 2023 15:25:29 +0000 (UTC) Received: from localhost (unknown [10.39.193.208]) by smtp.corp.redhat.com (Postfix) with ESMTP id 541BE1121314; Thu, 9 Feb 2023 15:25:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675956335; 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=Q3rZaYBjSPSrjjqfZw//BWKEdSxTMu92MIfjfxIjTyE=; b=LqgvS7XsED6wE9lxc06EoPO2vnpqFxA0UYu0ZslU2lHIdaFh8BE3d7WC0+T0ffe+WKNd/l sd79Ck5mTM0r6Go1I71sVfjuKxBBoGdFLl1Tu6wF1Oe0hD88nx1pHj5f3PsZtdzim/55Mc 3OAIAWgH516vrHuTsqAzXZzbfT8SOPI= X-MC-Unique: kwiJELr9Nmy0H0s1nYBmrA-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Kevin Wolf , Hanna Reitz , "Michael S. Tsirkin" , virtio-fs@redhat.com, qemu-block@nongnu.org, Stefan Hajnoczi , Peter Maydell , Fam Zheng , "Dr. David Alan Gilbert" , Eric Blake Subject: [PULL 4/6] qemu-io: use BdrvRequestFlags instead of int Date: Thu, 9 Feb 2023 10:25:18 -0500 Message-Id: <20230209152520.434183-5-stefanha@redhat.com> In-Reply-To: <20230209152520.434183-1-stefanha@redhat.com> References: <20230209152520.434183-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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+importer=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=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675956395380100001 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 Reviewed-by: Hanna Czenczek Signed-off-by: Stefan Hajnoczi Message-Id: <20230207203719.242926-3-stefanha@redhat.com> --- qemu-io-cmds.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c index a061031615..1f60c23ba4 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 @@ -573,7 +573,8 @@ static int do_pwrite(BlockBackend *blk, char *buf, int6= 4_t offset, } =20 static int do_pwrite_zeroes(BlockBackend *blk, int64_t offset, - int64_t bytes, int flags, int64_t *total) + int64_t bytes, BdrvRequestFlags flags, + int64_t *total) { int ret =3D blk_pwrite_zeroes(blk, offset, bytes, flags | BDRV_REQ_ZERO_WRITE); @@ -651,7 +652,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 @@ -1028,7 +1029,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; @@ -1229,7 +1230,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; @@ -1544,7 +1545,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