From mboxrd@z Thu Jan 1 00:00:00 1970 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 lists1p.gnu.org (lists1p.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 52E5AC624D3 for ; Fri, 4 Sep 2026 20:01:30 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x2a4Y-0000S7-I4; Fri, 04 Sep 2026 15:59:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x2a4W-0000Jc-TE for qemu-riscv@nongnu.org; Fri, 04 Sep 2026 15:59:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x2a4V-0007y6-9G for qemu-riscv@nongnu.org; Fri, 04 Sep 2026 15:59:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1788551974; 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=6rGExF2XabFAuw/4IqtgyCyvZvIzs5mIGAX6kd03iq0=; b=L6dB4oOCuj9rIUr71oE3QLlvz/zkgwRDGMaQPkZzE4+ukX712JYthDHDO7rdRGopwP0z4+ q6FZr2W9Q1UzY/ilutzevcsLobAZ5/J63k+a0bOAYXdZ25qy1p1hzV3qwbPpVaQHdorHDL NuD2BSZqvD0WzDVSm9ZpAIFbyrqHxYQ= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-684-AwuMA9-nMpGfg50kwl1gcA-1; Fri, 04 Sep 2026 15:59:31 -0400 X-MC-Unique: AwuMA9-nMpGfg50kwl1gcA-1 X-Mimecast-MFC-AGG-ID: AwuMA9-nMpGfg50kwl1gcA_1788551969 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5395919B9A86; Fri, 4 Sep 2026 19:59:29 +0000 (UTC) Received: from localhost (headnet05.pony-001.prod.iad2.dc.redhat.com [10.2.32.117]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 500AE423; Fri, 4 Sep 2026 19:59:27 +0000 (UTC) From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Fri, 04 Sep 2026 23:58:05 +0400 Subject: [PATCH v4 22/75] riscv/virt: convert OnOffAuto properties to QAPI-aware registration MIME-Version: 1.0 Message-Id: <20260904-qom-qapi-v4-22-a985f168e938@redhat.com> References: <20260904-qom-qapi-v4-0-a985f168e938@redhat.com> In-Reply-To: <20260904-qom-qapi-v4-0-a985f168e938@redhat.com> To: qemu-devel@nongnu.org Cc: Markus Armbruster , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Michael Roth , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Alistair Francis , Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Chao Liu , qemu-riscv@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=3984; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=uF9a97y3JMzxdw44lh7+z7RmOm/yX9vHLtEpeXSxK64=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqmyLJcCiOt2ExPe7LJphyJhMVlRzMLhB/7hK3I WJulNUqfDyJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCapsiyQAKCRDa6OEJdZac 5UH8D/9++YsWKrvJiPWSRA+zOQf3uBPzlChqUPin4HDRFd1Zi5QwVT88OoDJrSDONMDyZ01261C vMmWZaG40YuLxswPcic41oP2r4mm8j+8ftTwhaZ1gzxEuQmsLlgi4sHbzHi8FtjQ/46dms5AfgG 6lGYnXiWqe30FasT+tHZM2Uu3T0dRCNEJXK5DXWSLCxfptvbLGnkB2WUVkXJfiBXaUTnHjlsWpE iQelfiAZO7TeCD6Zh/TJm7FQjNl0XiFbkFtWSJ62CNoXaa6ua4NXsBiC8JTpG7TRrBPmgulv4r8 fcJXzLxdkWy4wDOnQHEzsfxowDrHAiIB01W7rkNA6drwbA7rv3alrEymAzHEoVUs3tZhxwRWagh 3Rej6k/KZCKuI3EdAIpj5sUl5YXCxUJo5ruI34btOpcLtF6tnFztZiCUUBotEb20Oo38rP8fp3v AnKl83vHAmm3kCJ06h7Jhe2i3dV+nF6iQgLrVwglL5+ttzZo2YvU58EuUuYo6Xm0Kli/iAYxxmM Mh9tT+e+XEzsd4pK6aMdw+pCWz0pBkEIKWk4Fl7Qc4yXY/jNsZK41qkj0EuofMgigW1B7EkVrYS wEGAKCXDdtGEvTPqK/ZH72kWHVhcNDv4atSeGaXypQs5ZBwrnfa1T0KX39e4CjX6rBpLl/EOpwX RF4Ud5HzTtYDibw== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 X-Mimecast-MFC-PROC-ID: 8tmh09cYD8F2Mvj4rLMtnjaN2Cc96uXJoRJoIywVi9k_1788551969 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-riscv@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-riscv-bounces+qemu-riscv=archiver.kernel.org@nongnu.org Sender: qemu-riscv-bounces+qemu-riscv=archiver.kernel.org@nongnu.org Convert the acpi and iommu-sys OnOffAuto properties from manual visitor-based callbacks to property_add_qapi_enum(). Acked-by: Alistair Francis Signed-off-by: Marc-André Lureau --- hw/riscv/virt.c | 52 +++++++++++++++++++++++----------------------------- 1 file changed, 23 insertions(+), 29 deletions(-) diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index dd3964101780..a83dec3d626e 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -55,7 +55,7 @@ #include "hw/pci-host/gpex.h" #include "hw/display/ramfb.h" #include "hw/acpi/aml-build.h" -#include "qapi/qapi-visit-common.h" +#include "qapi/qapi-type-infos-common.h" #include "hw/virtio/virtio-iommu.h" #include "hw/uefi/var-service-api.h" @@ -1654,21 +1654,16 @@ bool virt_is_iommu_sys_enabled(RISCVVirtState *s) return s->iommu_sys == ON_OFF_AUTO_ON; } -static void virt_get_iommu_sys(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) +static int virt_get_iommu_sys(Object *obj, Error **errp) { RISCVVirtState *s = RISCV_VIRT_MACHINE(obj); - OnOffAuto iommu_sys = s->iommu_sys; - - visit_type_OnOffAuto(v, name, &iommu_sys, errp); + return s->iommu_sys; } -static void virt_set_iommu_sys(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) +static void virt_set_iommu_sys(Object *obj, int value, Error **errp) { RISCVVirtState *s = RISCV_VIRT_MACHINE(obj); - - visit_type_OnOffAuto(v, name, &s->iommu_sys, errp); + s->iommu_sys = value; } bool virt_is_acpi_enabled(RISCVVirtState *s) @@ -1676,21 +1671,16 @@ bool virt_is_acpi_enabled(RISCVVirtState *s) return s->acpi != ON_OFF_AUTO_OFF; } -static void virt_get_acpi(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) +static int virt_get_acpi(Object *obj, Error **errp) { RISCVVirtState *s = RISCV_VIRT_MACHINE(obj); - OnOffAuto acpi = s->acpi; - - visit_type_OnOffAuto(v, name, &acpi, errp); + return s->acpi; } -static void virt_set_acpi(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) +static void virt_set_acpi(Object *obj, int value, Error **errp) { RISCVVirtState *s = RISCV_VIRT_MACHINE(obj); - - visit_type_OnOffAuto(v, name, &s->acpi, errp); + s->acpi = value; } static HotplugHandler *virt_machine_get_hotplug_handler(MachineState *machine, @@ -1788,17 +1778,21 @@ static void virt_machine_class_init(ObjectClass *oc, const void *data) object_class_property_set_description(oc, "aia-guests", str); } - object_class_property_add(oc, "acpi", "OnOffAuto", - virt_get_acpi, virt_set_acpi, - NULL, NULL); - object_class_property_set_description(oc, "acpi", - "Enable ACPI"); + object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP( + .name = "acpi", + .description = "Enable ACPI", + .qapi_type = &OnOffAuto_type_info, + .get = virt_get_acpi, + .set = virt_set_acpi, + )); - object_class_property_add(oc, "iommu-sys", "OnOffAuto", - virt_get_iommu_sys, virt_set_iommu_sys, - NULL, NULL); - object_class_property_set_description(oc, "iommu-sys", - "Enable IOMMU platform device"); + object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP( + .name = "iommu-sys", + .description = "Enable IOMMU platform device", + .qapi_type = &OnOffAuto_type_info, + .get = virt_get_iommu_sys, + .set = virt_set_iommu_sys, + )); } static const TypeInfo virt_machine_typeinfo = { -- 2.55.0.543.g5ebe2ebe4ea8