From nobody Sun Feb 8 20:08:08 2026 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1745393890; cv=none; d=zohomail.com; s=zohoarc; b=dGpf1B9c9z/WNRUZne1D1FLLvce3Zg5hIaSKh8sD/i9hk+DhJzVQqW6drs2xDvlI1g+Gar0QR5bu7x/0Dp8GmU1fQjIS8YNes4QbUs3/LV+wN61IgTYYlY0mkfY6YZikCmR+QGWwlrZKCSCNPPQN7iYE4MEr3fPIaQlhyyMm5GU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745393890; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=6uodaUxX+9pfZchpCGRAUT/RxHshP2sI8myfmwd0ZYI=; b=J2sROprcq7NRQhrAmxJUiwyVomhM/Q0yrc2J3TICNE/KDtrkhSvoVvcuHifRtWLZwxzrGASCdQr+8u+2KdIrK8Ma2mvdMymZbV1gB+YfH1QTLvZPESNgqLY0Lx8VBX5dgKf+2TA+AbaIUCOqXJBkhIJZLFctHYF8QCcX7jeD6Gg= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1745393890424893.803717928862; Wed, 23 Apr 2025 00:38:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u7UfJ-0003EB-6Q; Wed, 23 Apr 2025 03:37:06 -0400 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 1u7Ueq-00035J-04 for qemu-devel@nongnu.org; Wed, 23 Apr 2025 03:36:41 -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 1u7Uel-0003Bm-2i for qemu-devel@nongnu.org; Wed, 23 Apr 2025 03:36:34 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-650-LJ5eCiFOP6Kdnmaz8HaV9A-1; Wed, 23 Apr 2025 03:36:26 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 345FD18001E0; Wed, 23 Apr 2025 07:36:25 +0000 (UTC) Received: from thuth-p1g4.str.redhat.com (dhcp-192-219.str.redhat.com [10.33.192.219]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 62D6D19560A3; Wed, 23 Apr 2025 07:36:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1745393790; 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=6uodaUxX+9pfZchpCGRAUT/RxHshP2sI8myfmwd0ZYI=; b=atS+sfFSGgWsCBCKqJFj8tvBys5/jyFCEwAj/j183l9AonkJqW2jO6fTQZIJDUiOUjl7O8 Ktn+/7MO3zU0lwk3pUMbnMQBO0RGUYTmws8lPCZAuJJs6fkeIb4aHMFmQnvzvVNrq28zvR DM6YPGXWTC0v8p+GSoRURYTZHxC8wl4= X-MC-Unique: LJ5eCiFOP6Kdnmaz8HaV9A-1 X-Mimecast-MFC-AGG-ID: LJ5eCiFOP6Kdnmaz8HaV9A_1745393785 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Peter Maydell , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eric Farman Subject: [PULL 05/29] hw/s390x/skeys: Declare QOM types using DEFINE_TYPES() macro Date: Wed, 23 Apr 2025 09:35:45 +0200 Message-ID: <20250423073610.271585-6-thuth@redhat.com> In-Reply-To: <20250423073610.271585-1-thuth@redhat.com> References: <20250423073610.271585-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.411, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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.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: 1745393892681019100 From: Philippe Mathieu-Daud=C3=A9 When multiple QOM types are registered in the same file, it is simpler to use the the DEFINE_TYPES() macro. In particular because type array declared with such macro are easier to review. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Eric Farman Reviewed-by: Thomas Huth Message-ID: <20250310151414.11550-2-philmd@linaro.org> Signed-off-by: Thomas Huth --- hw/s390x/s390-skeys.c | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c index 811d892122b..d50e71b927a 100644 --- a/hw/s390x/s390-skeys.c +++ b/hw/s390x/s390-skeys.c @@ -316,14 +316,6 @@ static void qemu_s390_skeys_class_init(ObjectClass *oc= , void *data) dc->user_creatable =3D false; } =20 -static const TypeInfo qemu_s390_skeys_info =3D { - .name =3D TYPE_QEMU_S390_SKEYS, - .parent =3D TYPE_S390_SKEYS, - .instance_size =3D sizeof(QEMUS390SKeysState), - .class_init =3D qemu_s390_skeys_class_init, - .class_size =3D sizeof(S390SKeysClass), -}; - static void s390_storage_keys_save(QEMUFile *f, void *opaque) { S390SKeysState *ss =3D S390_SKEYS(opaque); @@ -481,19 +473,22 @@ static void s390_skeys_class_init(ObjectClass *oc, vo= id *data) set_bit(DEVICE_CATEGORY_MISC, dc->categories); } =20 -static const TypeInfo s390_skeys_info =3D { - .name =3D TYPE_S390_SKEYS, - .parent =3D TYPE_DEVICE, - .instance_size =3D sizeof(S390SKeysState), - .class_init =3D s390_skeys_class_init, - .class_size =3D sizeof(S390SKeysClass), - .abstract =3D true, +static const TypeInfo s390_skeys_types[] =3D { + { + .name =3D TYPE_S390_SKEYS, + .parent =3D TYPE_DEVICE, + .instance_size =3D sizeof(S390SKeysState), + .class_init =3D s390_skeys_class_init, + .class_size =3D sizeof(S390SKeysClass), + .abstract =3D true, + }, + { + .name =3D TYPE_QEMU_S390_SKEYS, + .parent =3D TYPE_S390_SKEYS, + .instance_size =3D sizeof(QEMUS390SKeysState), + .class_init =3D qemu_s390_skeys_class_init, + .class_size =3D sizeof(S390SKeysClass), + }, }; =20 -static void qemu_s390_skeys_register_types(void) -{ - type_register_static(&s390_skeys_info); - type_register_static(&qemu_s390_skeys_info); -} - -type_init(qemu_s390_skeys_register_types) +DEFINE_TYPES(s390_skeys_types) --=20 2.49.0