From nobody Thu May 16 23:23:41 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1633956206825337.17177495819453; Mon, 11 Oct 2021 05:43:26 -0700 (PDT) Received: from localhost ([::1]:42256 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mZueL-0005gG-Qp for importer@patchew.org; Mon, 11 Oct 2021 08:43:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45970) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mZucX-0003Uj-0g for qemu-devel@nongnu.org; Mon, 11 Oct 2021 08:41:33 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:49531) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mZucU-0000oI-3J for qemu-devel@nongnu.org; Mon, 11 Oct 2021 08:41:32 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-390-vWkULsB7MmiDH2LAiBbJ0g-1; Mon, 11 Oct 2021 08:41:24 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5C49F5074C; Mon, 11 Oct 2021 12:41:23 +0000 (UTC) Received: from localhost (unknown [10.39.194.224]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6346F1017CE6; Mon, 11 Oct 2021 12:41:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633956087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Bx7lgE1P1diWvKqQiBVbK8hxlSldhM38QfXiDQauDaU=; b=AXQo99P+6tKDCrKuxmLj9c3jgcNLtRZYsuzX6ecf3fkNEIo9mvQm2qrTiXmSLukMJr2KR5 t+n28DZ0xhRaxMjH3gSm816O3YYB3podJ8TDqN3oVmGslfmmBvnHgxWIdT8UtwN3G6V4JJ UVpmdLQfAb1RKywlDvbFxlT4rPjIPT4= X-MC-Unique: vWkULsB7MmiDH2LAiBbJ0g-1 From: Stefan Hajnoczi To: Peter Maydell , qemu-devel@nongnu.org Subject: [PULL 1/2] iothread: rename PollParamInfo to IOThreadParamInfo Date: Mon, 11 Oct 2021 13:40:43 +0100 Message-Id: <20211011124044.9090-2-stefanha@redhat.com> In-Reply-To: <20211011124044.9090-1-stefanha@redhat.com> References: <20211011124044.9090-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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.133.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.049, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, Stefan Hajnoczi , Stefano Garzarella Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1633956207824100001 From: Stefano Garzarella Commit 1793ad0247 ("iothread: add aio-max-batch parameter") added a new parameter (aio-max-batch) to IOThread and used PollParamInfo structure to handle it. Since it is not a parameter of the polling mechanism, we rename the structure to a more generic IOThreadParamInfo. Suggested-by: Kevin Wolf Signed-off-by: Stefano Garzarella Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20210727145936.147032-2-sgarzare@redhat.com Signed-off-by: Stefan Hajnoczi --- iothread.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/iothread.c b/iothread.c index ddbbde61f7..a73e560ba0 100644 --- a/iothread.c +++ b/iothread.c @@ -215,18 +215,18 @@ static void iothread_complete(UserCreatable *obj, Err= or **errp) typedef struct { const char *name; ptrdiff_t offset; /* field's byte offset in IOThread struct */ -} PollParamInfo; +} IOThreadParamInfo; =20 -static PollParamInfo poll_max_ns_info =3D { +static IOThreadParamInfo poll_max_ns_info =3D { "poll-max-ns", offsetof(IOThread, poll_max_ns), }; -static PollParamInfo poll_grow_info =3D { +static IOThreadParamInfo poll_grow_info =3D { "poll-grow", offsetof(IOThread, poll_grow), }; -static PollParamInfo poll_shrink_info =3D { +static IOThreadParamInfo poll_shrink_info =3D { "poll-shrink", offsetof(IOThread, poll_shrink), }; -static PollParamInfo aio_max_batch_info =3D { +static IOThreadParamInfo aio_max_batch_info =3D { "aio-max-batch", offsetof(IOThread, aio_max_batch), }; =20 @@ -234,7 +234,7 @@ static void iothread_get_param(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { IOThread *iothread =3D IOTHREAD(obj); - PollParamInfo *info =3D opaque; + IOThreadParamInfo *info =3D opaque; int64_t *field =3D (void *)iothread + info->offset; =20 visit_type_int64(v, name, field, errp); @@ -244,7 +244,7 @@ static bool iothread_set_param(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { IOThread *iothread =3D IOTHREAD(obj); - PollParamInfo *info =3D opaque; + IOThreadParamInfo *info =3D opaque; int64_t *field =3D (void *)iothread + info->offset; int64_t value; =20 --=20 2.31.1 From nobody Thu May 16 23:23:41 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1633956360257549.185579185408; Mon, 11 Oct 2021 05:46:00 -0700 (PDT) Received: from localhost ([::1]:46744 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mZugp-0000L8-93 for importer@patchew.org; Mon, 11 Oct 2021 08:45:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45972) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mZucX-0003Up-2C for qemu-devel@nongnu.org; Mon, 11 Oct 2021 08:41:33 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:24803) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mZucU-0000pZ-7o for qemu-devel@nongnu.org; Mon, 11 Oct 2021 08:41:32 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-412-24yzk_uTPoWKECpEA31R6A-1; Mon, 11 Oct 2021 08:41:26 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 20421835DE1; Mon, 11 Oct 2021 12:41:25 +0000 (UTC) Received: from localhost (unknown [10.39.194.224]) by smtp.corp.redhat.com (Postfix) with ESMTP id AD4EB1017CE6; Mon, 11 Oct 2021 12:41:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633956089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=v1xyzUPEG8vSqLmUOyPL3uokJ1u4AmbpO6wxHCfrYqk=; b=TL4GmWdvbzswDk0C7/SY7/QaV3+3yBfsm0xWLxIOAkWg1lPNUu0Tjb9vPEnB/kExG9NNoB 9Aeq0rPtS6FJCFvj07Xeee4yBmlLB5SNAB5qKj7ikLFiewTpjR5FdbOTdVhvDYOLXeiHQ2 Bewjxfa/VefW7QxvbAffdaJJ+kVbzTI= X-MC-Unique: 24yzk_uTPoWKECpEA31R6A-1 From: Stefan Hajnoczi To: Peter Maydell , qemu-devel@nongnu.org Subject: [PULL 2/2] iothread: use IOThreadParamInfo in iothread_[set|get]_param() Date: Mon, 11 Oct 2021 13:40:44 +0100 Message-Id: <20211011124044.9090-3-stefanha@redhat.com> In-Reply-To: <20211011124044.9090-1-stefanha@redhat.com> References: <20211011124044.9090-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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.133.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.049, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, Stefan Hajnoczi , Stefano Garzarella Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1633956362174100001 From: Stefano Garzarella Commit 0445409d74 ("iothread: generalize iothread_set_param/iothread_get_param") moved common code to set and get IOThread parameters in two new functions. These functions are called inside callbacks, so we don't need to use an opaque pointer. Let's replace `void *opaque` parameter with `IOThreadParamInfo *info`. Suggested-by: Kevin Wolf Signed-off-by: Stefano Garzarella Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20210727145936.147032-3-sgarzare@redhat.com Signed-off-by: Stefan Hajnoczi --- iothread.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/iothread.c b/iothread.c index a73e560ba0..0f98af0f2a 100644 --- a/iothread.c +++ b/iothread.c @@ -231,20 +231,18 @@ static IOThreadParamInfo aio_max_batch_info =3D { }; =20 static void iothread_get_param(Object *obj, Visitor *v, - const char *name, void *opaque, Error **errp) + const char *name, IOThreadParamInfo *info, Error **errp) { IOThread *iothread =3D IOTHREAD(obj); - IOThreadParamInfo *info =3D opaque; int64_t *field =3D (void *)iothread + info->offset; =20 visit_type_int64(v, name, field, errp); } =20 static bool iothread_set_param(Object *obj, Visitor *v, - const char *name, void *opaque, Error **errp) + const char *name, IOThreadParamInfo *info, Error **errp) { IOThread *iothread =3D IOTHREAD(obj); - IOThreadParamInfo *info =3D opaque; int64_t *field =3D (void *)iothread + info->offset; int64_t value; =20 @@ -266,16 +264,18 @@ static bool iothread_set_param(Object *obj, Visitor *= v, static void iothread_get_poll_param(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { + IOThreadParamInfo *info =3D opaque; =20 - iothread_get_param(obj, v, name, opaque, errp); + iothread_get_param(obj, v, name, info, errp); } =20 static void iothread_set_poll_param(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { IOThread *iothread =3D IOTHREAD(obj); + IOThreadParamInfo *info =3D opaque; =20 - if (!iothread_set_param(obj, v, name, opaque, errp)) { + if (!iothread_set_param(obj, v, name, info, errp)) { return; } =20 @@ -291,16 +291,18 @@ static void iothread_set_poll_param(Object *obj, Visi= tor *v, static void iothread_get_aio_param(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { + IOThreadParamInfo *info =3D opaque; =20 - iothread_get_param(obj, v, name, opaque, errp); + iothread_get_param(obj, v, name, info, errp); } =20 static void iothread_set_aio_param(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { IOThread *iothread =3D IOTHREAD(obj); + IOThreadParamInfo *info =3D opaque; =20 - if (!iothread_set_param(obj, v, name, opaque, errp)) { + if (!iothread_set_param(obj, v, name, info, errp)) { return; } =20 --=20 2.31.1