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 94A3CC624D3 for ; Fri, 4 Sep 2026 20:03:09 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x2a4I-0007vB-3I; Fri, 04 Sep 2026 15:59:22 -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 1x2a4F-0007nK-WA for qemu-devel@nongnu.org; Fri, 04 Sep 2026 15:59:20 -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 1x2a4D-0007vq-T1 for qemu-devel@nongnu.org; Fri, 04 Sep 2026 15:59:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1788551957; 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=VscR/iIW0mIAkyA8JHrPI5JG+q0xz3TzuUhYEBv6Obk=; b=ER//sehtocYJtbwoUNsTAUvN7goQBhVY1lLkeGMQf+zUL5Alffyorr5E6xaYWDHkM5Nt7X P5E8ncxjve828NOxkexH3IuFG2HBtl2As2RIPwMW2PUgqk4nX3tatLsocSQpDIY9z+n0Qz aLfE7PjfITXsNNgXXvk7iM1UyZlyDI4= Received: from mx-prod-mc-03.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-142-AvxiqYkIPvyQ8w-X5qv8dA-1; Fri, 04 Sep 2026 15:59:16 -0400 X-MC-Unique: AvxiqYkIPvyQ8w-X5qv8dA-1 X-Mimecast-MFC-AGG-ID: AvxiqYkIPvyQ8w-X5qv8dA_1788551954 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A06DC1944D40; Fri, 4 Sep 2026 19:59:14 +0000 (UTC) Received: from localhost (headnet05.pony-001.prod.iad2.dc.redhat.com [10.2.32.117]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 93FCB1800641; Fri, 4 Sep 2026 19:59:13 +0000 (UTC) From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Fri, 04 Sep 2026 23:58:01 +0400 Subject: [PATCH v4 18/75] x86: convert OnOffAuto properties to QAPI-aware registration MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20260904-qom-qapi-v4-18-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?= , Richard Henderson , "Michael S. Tsirkin" X-Developer-Signature: v=1; a=openpgp-sha256; l=6518; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=SgZyvSyb89GMp5FbVLfodHDTHOL+fqH6tT2LZO1GJws=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqmyLJwX/Hj9f6oi/9Dto/0NkPn1XbJQZWZHzK4 nbq+Jp8m7WJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCapsiyQAKCRDa6OEJdZac 5ef0D/9+yYMattyUmdoVTpQH+EQeUzRqdQ9HNa97gjOWWkIaKyY/5C47TzVrcVDbJQk69vxY6K7 umVy5uxdIxeHYOKmyvRmESnMkVvKiaSiTtBfjnl9HFLpdmDzmbOVofvCQazXjRaSkn2D4JaUrCL 9Jqna+ipP+3HdZ5T/t1IkBDgnvdWSMx9NG8oKoIHhUYd8lecg/Kh0m6/i046SjV5Y7vBRya7IGc CkqAKB38R/2kxctDZwq+OJpB/rLNMKs/bLNk3eo1/SVazfmTSldHiaVc9wj4NjFTVXUXPS3Mz1p qLB7JHZwn6B2YSRGpGxdJXoxhfdmeRFkCKOv7ncPsRCJgYW8mTd/NNoSiIPaQhzbCKxFNUPVvDN H0q1uQWk0X/w2Q0Xk3yiQiJUEGxVgGYr2vA+vy0WVLI5YakQNOb1j/jkk4YyqcuNbgGpYy+3xlT iIG8q7s3uFEG51wJNk3V939lKQfTE2hQzIV4Pm5OV5RE/SXvTPrghQrz2nnj4qds7mUIwjFQ69B Sl6Mo0GJ/Eff/Drnj2oZ5H2MRj83ehueI2djYBlfW77C1HPN1dsPqQ+pKksUTNoDeb8P0/tKdgQ p2wb5HQgwS1n7DyuPVByJZFbxMfl0r+EDsQvPi5NEHv5L2OXJtmbDFXWLLTuBSvCTRroyt7tUok K6ExtMpWOLCC4Hw== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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 Convert the smm, acpi, pit, and pic OnOffAuto properties from manual visitor-based callbacks to property_add_qapi_enum(). Signed-off-by: Marc-André Lureau --- hw/i386/x86.c | 104 +++++++++++++++++++++++++--------------------------------- 1 file changed, 45 insertions(+), 59 deletions(-) diff --git a/hw/i386/x86.c b/hw/i386/x86.c index f8ba3244e221..63f297a10532 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -24,7 +24,7 @@ #include "qemu/error-report.h" #include "qemu/units.h" #include "qapi/error.h" -#include "qapi/qapi-visit-common.h" +#include "qapi/qapi-type-infos-common.h" #include "qapi/qapi-visit-machine.h" #include "qapi/visitor.h" #include "system/qtest.h" @@ -188,21 +188,16 @@ bool x86_machine_is_smm_enabled(const X86MachineState *x86ms) return false; } -static void x86_machine_get_smm(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) +static int x86_machine_get_smm(Object *obj, Error **errp) { X86MachineState *x86ms = X86_MACHINE(obj); - OnOffAuto smm = x86ms->smm; - - visit_type_OnOffAuto(v, name, &smm, errp); + return x86ms->smm; } -static void x86_machine_set_smm(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) +static void x86_machine_set_smm(Object *obj, int value, Error **errp) { X86MachineState *x86ms = X86_MACHINE(obj); - - visit_type_OnOffAuto(v, name, &x86ms->smm, errp); + x86ms->smm = value; } bool x86_machine_is_acpi_enabled(const X86MachineState *x86ms) @@ -213,55 +208,40 @@ bool x86_machine_is_acpi_enabled(const X86MachineState *x86ms) return true; } -static void x86_machine_get_acpi(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) +static int x86_machine_get_acpi(Object *obj, Error **errp) { X86MachineState *x86ms = X86_MACHINE(obj); - OnOffAuto acpi = x86ms->acpi; - - visit_type_OnOffAuto(v, name, &acpi, errp); + return x86ms->acpi; } -static void x86_machine_set_acpi(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) +static void x86_machine_set_acpi(Object *obj, int value, Error **errp) { X86MachineState *x86ms = X86_MACHINE(obj); - - visit_type_OnOffAuto(v, name, &x86ms->acpi, errp); + x86ms->acpi = value; } -static void x86_machine_get_pit(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) +static int x86_machine_get_pit(Object *obj, Error **errp) { X86MachineState *x86ms = X86_MACHINE(obj); - OnOffAuto pit = x86ms->pit; - - visit_type_OnOffAuto(v, name, &pit, errp); + return x86ms->pit; } -static void x86_machine_set_pit(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) +static void x86_machine_set_pit(Object *obj, int value, Error **errp) { X86MachineState *x86ms = X86_MACHINE(obj); - - visit_type_OnOffAuto(v, name, &x86ms->pit, errp); + x86ms->pit = value; } -static void x86_machine_get_pic(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) +static int x86_machine_get_pic(Object *obj, Error **errp) { X86MachineState *x86ms = X86_MACHINE(obj); - OnOffAuto pic = x86ms->pic; - - visit_type_OnOffAuto(v, name, &pic, errp); + return x86ms->pic; } -static void x86_machine_set_pic(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) +static void x86_machine_set_pic(Object *obj, int value, Error **errp) { X86MachineState *x86ms = X86_MACHINE(obj); - - visit_type_OnOffAuto(v, name, &x86ms->pic, errp); + x86ms->pic = value; } static char *x86_machine_get_oem_id(Object *obj, Error **errp) @@ -391,31 +371,37 @@ static void x86_machine_class_init(ObjectClass *oc, const void *data) mc->kvm_type = x86_kvm_type; nc->raise_nmi = x86_nmi; - object_class_property_add(oc, X86_MACHINE_SMM, "OnOffAuto", - x86_machine_get_smm, x86_machine_set_smm, - NULL, NULL); - object_class_property_set_description(oc, X86_MACHINE_SMM, - "Enable SMM"); + object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP( + .name = X86_MACHINE_SMM, + .description = "Enable SMM", + .qapi_type = &OnOffAuto_type_info, + .get = x86_machine_get_smm, + .set = x86_machine_set_smm, + )); - object_class_property_add(oc, X86_MACHINE_ACPI, "OnOffAuto", - x86_machine_get_acpi, x86_machine_set_acpi, - NULL, NULL); - object_class_property_set_description(oc, X86_MACHINE_ACPI, - "Enable ACPI"); + object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP( + .name = X86_MACHINE_ACPI, + .description = "Enable ACPI", + .qapi_type = &OnOffAuto_type_info, + .get = x86_machine_get_acpi, + .set = x86_machine_set_acpi, + )); - object_class_property_add(oc, X86_MACHINE_PIT, "OnOffAuto", - x86_machine_get_pit, - x86_machine_set_pit, - NULL, NULL); - object_class_property_set_description(oc, X86_MACHINE_PIT, - "Enable i8254 PIT"); + object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP( + .name = X86_MACHINE_PIT, + .description = "Enable i8254 PIT", + .qapi_type = &OnOffAuto_type_info, + .get = x86_machine_get_pit, + .set = x86_machine_set_pit, + )); - object_class_property_add(oc, X86_MACHINE_PIC, "OnOffAuto", - x86_machine_get_pic, - x86_machine_set_pic, - NULL, NULL); - object_class_property_set_description(oc, X86_MACHINE_PIC, - "Enable i8259 PIC"); + object_class_property_add_qapi_enum(oc, QAPI_ENUM_PROP( + .name = X86_MACHINE_PIC, + .description = "Enable i8259 PIC", + .qapi_type = &OnOffAuto_type_info, + .get = x86_machine_get_pic, + .set = x86_machine_set_pic, + )); object_class_property_add_str(oc, X86_MACHINE_OEM_ID, x86_machine_get_oem_id, -- 2.55.0.543.g5ebe2ebe4ea8