From patchwork Mon Jan 30 21:54:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 13121952 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0DC40C636CD for ; Mon, 30 Jan 2023 21:55:23 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pMc6h-0007r5-OS; Mon, 30 Jan 2023 16:54:31 -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 1pMc6g-0007qF-8F for qemu-devel@nongnu.org; Mon, 30 Jan 2023 16:54:30 -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 1pMc6e-0006jO-QO for qemu-devel@nongnu.org; Mon, 30 Jan 2023 16:54:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675115668; 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=YCHKifqrIb/XZfIwIC5GYGozBqJnrXfX/I2q5CGHqgRa2JCc6/dw73Sh0tG3rmE7HkU5nt 0PXRgoINqUWa9Uin7aLAVaOjx1C4Ot3cCvEEMSGFZ3Stut/jRdK+/OdM4qDR/FhSETmra+ 1CB1UNB3hSi8PDlZcsLGb0pkgVufjZA= 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-377-YCSVUD9hPmuyOGXFtwyFrg-1; Mon, 30 Jan 2023 16:54:23 -0500 X-MC-Unique: YCSVUD9hPmuyOGXFtwyFrg-1 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 5BCF2800DAA; Mon, 30 Jan 2023 21:54:23 +0000 (UTC) Received: from localhost (unknown [10.39.195.80]) by smtp.corp.redhat.com (Postfix) with ESMTP id B61441121314; Mon, 30 Jan 2023 21:54:22 +0000 (UTC) From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: , Fam Zheng , Fiona Ebner , Stefan Hajnoczi , Hanna Reitz , Kevin Wolf , Eric Blake Subject: [PATCH v2 2/4] qemu-io: use BdrvRequestFlags instead of int Date: Mon, 30 Jan 2023 16:54:13 -0500 Message-Id: <20230130215415.919494-3-stefanha@redhat.com> In-Reply-To: <20230130215415.919494-1-stefanha@redhat.com> References: <20230130215415.919494-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org 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 --- 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, } 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; @@ -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 *opaque) } 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 = { @@ -688,7 +689,7 @@ static int do_aio_readv(BlockBackend *blk, QEMUIOVector *qiov, } static int do_aio_writev(BlockBackend *blk, QEMUIOVector *qiov, - int64_t offset, int flags, int *total) + int64_t offset, BdrvRequestFlags flags, int *total) { int async_ret = NOT_DONE; @@ -1065,7 +1066,7 @@ static int write_f(BlockBackend *blk, int argc, char **argv) struct timespec t1, t2; bool Cflag = false, qflag = false, bflag = false; bool Pflag = false, zflag = false, cflag = false, sflag = false; - int flags = 0; + BdrvRequestFlags flags = 0; int c, cnt, ret; char *buf = NULL; int64_t offset; @@ -1266,7 +1267,7 @@ static int writev_f(BlockBackend *blk, int argc, char **argv) { struct timespec t1, t2; bool Cflag = false, qflag = false; - int flags = 0; + BdrvRequestFlags flags = 0; int c, cnt, ret; char *buf; int64_t offset; @@ -1581,7 +1582,7 @@ static int aio_write_f(BlockBackend *blk, int argc, char **argv) int nr_iov, c; int pattern = 0xcd; struct aio_ctx *ctx = g_new0(struct aio_ctx, 1); - int flags = 0; + BdrvRequestFlags flags = 0; ctx->blk = blk; while ((c = getopt(argc, argv, "CfiqP:uz")) != -1) {