From patchwork Wed Apr 23 07:35:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 883594 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp2790387wrs; Wed, 23 Apr 2025 00:38:10 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVZ6Yj2eB9qPCaynnBZvoUfmT3ZGbpksTun1TEfto7ukZgkgwxbXlmZlA4qZLVUubmrPvDPjQ==@linaro.org X-Google-Smtp-Source: AGHT+IEeSbvunZOm+2nGPLC3QCEgZzu+msqzt2EeVIQnAw7H4189rj06DAz1+9yPDFcV8M4+L4Bj X-Received: by 2002:ad4:5f07:0:b0:6e5:a0fc:f65c with SMTP id 6a1803df08f44-6f2c4384fe5mr285468046d6.0.1745393889812; Wed, 23 Apr 2025 00:38:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745393889; cv=none; d=google.com; s=arc-20240605; b=EKaQ2LiYwxG55M7BZNIvNLxl1nBcGPyO6nVmO0daZPGY3nvVrh/Q1pLNNEZOjeXe8O eF0sKdcxGBw8Jf/SBq4N8AMFEkiVsVpZGpJlkOz1pMn+LCTi+pcDYghnumA4GBsmeIKh pzWhhCXwntZgixxJbjXBGuEQ+DIwcySBkheepKOrnnHMqqyTjzLMCf5djjBTK86ifjC2 YhTk83MCJG1resM05FVq39YDLL8dEMLvdniGR5NtYFNeapF2EmrtUOHfu3oayawAlZxE d9Y7WxVriC73PkNyo0rQ3fLGQhkaNaqbH1BJy5uY8jFRIQk4W4XLNxDcKg6o7sNfBM7p 9Ekg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=6uodaUxX+9pfZchpCGRAUT/RxHshP2sI8myfmwd0ZYI=; fh=IZ2l8DLHLBNf1GWiSB9Jdu36OhlVFfVljxcBRywYfd0=; b=IXMvxYQsOJmSSLVbR9+zzdjYCw+YvFC4dAopJ7doMsCp38mOl1rYXO/+AsD7PvQVl7 XKV/7wR1iniGBkzODkiMsQiFDRTTzuVhBBarEeYPNpr69vzsSQRzLrVO/10piaJaTGox YVceqAqWXHwQ5k6DSpykOgXZwCcEjDxvmmNY4Af8+NkpkRePlr5XRsbBSbhy/tb8aoOo VnX4q4ENnZu2LdzafkNHr3gvS6+e822Rs1g3urhFaAAkVgCCRW4CZzmu7PCIrKJj4rjB wt0BtVvvQfKYwrR4ZNZnr6Nn1blVUysLAtDZ49geEkgzuExlyV0txonXCDToON2urkqG BJIw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=atS+sfFS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f2c2b02475si125835806d6.53.2025.04.23.00.38.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 Apr 2025 00:38:09 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=atS+sfFS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=redhat.com 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 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= 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 X-MC-Unique: LJ5eCiFOP6Kdnmaz8HaV9A-1 X-Mimecast-MFC-AGG-ID: LJ5eCiFOP6Kdnmaz8HaV9A_1745393785 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) From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Peter Maydell , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-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 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé 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é 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 = false; } -static const TypeInfo qemu_s390_skeys_info = { - .name = TYPE_QEMU_S390_SKEYS, - .parent = TYPE_S390_SKEYS, - .instance_size = sizeof(QEMUS390SKeysState), - .class_init = qemu_s390_skeys_class_init, - .class_size = sizeof(S390SKeysClass), -}; - static void s390_storage_keys_save(QEMUFile *f, void *opaque) { S390SKeysState *ss = S390_SKEYS(opaque); @@ -481,19 +473,22 @@ static void s390_skeys_class_init(ObjectClass *oc, void *data) set_bit(DEVICE_CATEGORY_MISC, dc->categories); } -static const TypeInfo s390_skeys_info = { - .name = TYPE_S390_SKEYS, - .parent = TYPE_DEVICE, - .instance_size = sizeof(S390SKeysState), - .class_init = s390_skeys_class_init, - .class_size = sizeof(S390SKeysClass), - .abstract = true, +static const TypeInfo s390_skeys_types[] = { + { + .name = TYPE_S390_SKEYS, + .parent = TYPE_DEVICE, + .instance_size = sizeof(S390SKeysState), + .class_init = s390_skeys_class_init, + .class_size = sizeof(S390SKeysClass), + .abstract = true, + }, + { + .name = TYPE_QEMU_S390_SKEYS, + .parent = TYPE_S390_SKEYS, + .instance_size = sizeof(QEMUS390SKeysState), + .class_init = qemu_s390_skeys_class_init, + .class_size = sizeof(S390SKeysClass), + }, }; -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)