From patchwork Mon Mar 10 15:14:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 872212 Delivered-To: patch@linaro.org Received: by 2002:a05:6504:4124:b0:290:25b2:841c with SMTP id u36csp1344398ltt; Mon, 10 Mar 2025 08:21:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUC92ioQlxbHPvxl6hrWP8mxCpQwXFrsl8MGa+S9QLjEiL/ne3+QWbT0hrpxCRjq3PUVFUiLA==@linaro.org X-Google-Smtp-Source: AGHT+IHgq8pec+RTfo7hMaMGJEtT6PQ21QA89MPptXVkZiwP44PiM1zgfRUabN+HYpv2YGpTjT8o X-Received: by 2002:a05:620a:268d:b0:7c5:5000:480c with SMTP id af79cd13be357-7c550004be5mr682915385a.28.1741620117675; Mon, 10 Mar 2025 08:21:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1741620117; cv=none; d=google.com; s=arc-20240605; b=berarcd1FgwdET9QrYf3CAMiIGlY9+2i7t/dUeuAzlFF9F+5AWhY6oLeAlZQ4ZCfkM vwn21Wt+MoubVHLE9+AEcknw+vNaKBEoS4Smy9aHecBOoHBJxVE1zqRNx5gukVyjbrry 7VaUoGywKzPwW/bioQqDk87Zmr50HmyNTawEArXokutJnymYmkcCt6IM3K2YkICnYntZ ZSbOsrFrMf8Ew69MzIYUucyX3IrsWVM4NMo2XJgiA7a+qO/1YBQ+U0nk3pu2a5gSyjUH 1Zmu4AD4sEBF8GmS3ZWs2ct8+VqpEwigyTHG0vIpK82eL1FuIxD5vkAhOS6UA5Z+50Ri Q6qw== 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=sImUXKvBXnYM+CsDBIniM9RjnRK8G5r/o0WxM6GDvAY=; fh=FrXspGF9dqFxfqr7h/opREu8X39lKPmpirjz+1d7KSk=; b=X5t+Msow47Vcu840OpKaoSaiFPo4agbAWCePfMSMZYYYncC4uQSR773NZ+Bin/UdBT flQUOoUit67ZWjqI+3TqICx+R0HN+XbZDRKfB5YvHZtg4TTQX+LkypX0uxWBwZmtME9L H/+/5lRxmy1U0Jve8IEzYn3y1c0NSHpqFzwokICt/iZ9dKWOZ1OWe4hZ9QMyiYmIdMk3 fBMBHGIOUvtfx7mja+tWavhxjijJlmDO9JOc9H+xhrKHAonJYOPQRJIg13FO+XwYRIYz hHDlwbcYnyXofmcEQcW0fknHbfDsbpfV48V+ZqJQgRpB/4/rP0rYu/iQLnpAKhEgV5jj xxXg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XCzhktQ2; 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=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c5406352dbsi487393085a.503.2025.03.10.08.21.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Mar 2025 08:21:57 -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=@linaro.org header.s=google header.b=XCzhktQ2; 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=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1treqN-0007Ym-1F; Mon, 10 Mar 2025 11:15:03 -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 1treq4-0007Dy-CW for qemu-devel@nongnu.org; Mon, 10 Mar 2025 11:14:46 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1trepr-00083n-TJ for qemu-devel@nongnu.org; Mon, 10 Mar 2025 11:14:40 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-39149bccb69so1023888f8f.2 for ; Mon, 10 Mar 2025 08:14:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741619663; x=1742224463; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sImUXKvBXnYM+CsDBIniM9RjnRK8G5r/o0WxM6GDvAY=; b=XCzhktQ2SbHDdZVmDjOaldo9atLl0GXTI/GXK0LRNYV76aHjRRW5NyKJCySGHHexdh 9AWsRWTfaMydZsdpSnFdkrmUKYZGmdfL/BpYbKcP25rD+o+K6iEArkGEzzsPAY9r0qIE nvGBwvhsfeYzaBpZ3SHe4SvCItVYmU8Ft7pFXOspGxnmN6OpwtEWdsCTg8VAkAxgjeek QsVvmJ+7Y0F8QJu1L64040qbhgI2c+Cw2NcNIJMneAc0q8L6DAudsTNDbNrtOl7BglM8 OxGltMwgonzkBUskr/fAdeSOpLpFpVnjZCm5wVhjGwlbMh4xX2lt7yWQ44o5Z5Q8CFr7 YLew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741619663; x=1742224463; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sImUXKvBXnYM+CsDBIniM9RjnRK8G5r/o0WxM6GDvAY=; b=d/9RJJKa9DukBLKmEgmjWnsnCMNivc6Qi8fAjPJsusml9kyf+0Iq1DGdPgrr1RZN7B s4vyvmhE1X62wmwnn5I/ogdrMbKTW6N/yIyirl0u+XhU8QPS73Gc647MUBINRL7DpXrI vuCfXdIXSn22J5eT8nKJ6QkeJWlEZru+IcwsBrEJaRJUhziDlUpkBSiKijbcvW0HvxVd 4fET5mhmQQrg096WU5ZOSLa0L96aMGdM7gyraoibZoJBPVaJMaRIHVYtBtTWB4TnJWre KE2Jtc2jeo+In99XUkjUGSrtg5ioeKa2uGahdsPaTzfL+anwLn3OOUGPcOY/2bUfLLfj USqA== X-Gm-Message-State: AOJu0YxpUqI2aFiUkTf5YzHkP0rywIYHdJfDlq2jkZqshrD1GE8bmBJp vUrgRhM6aChUC6J3CBmhWWq2SyaMR8McvLH3ukqyRDF5EI9ULYW6Wd+w/Rgt9D2kalWbnTU758z lwNE= X-Gm-Gg: ASbGnctY5txC34mG8Ec/ihZGHAeUOCL6i8b+swN6rtvVdEnXvPqhBUgI47kQwjI/ep7 L/ssxW/IlhfWyyMUmIGoe0kJ8PXT98Vhvv6BUv7/MdpzEr10OPW+jzMtoNQIN3LxVDj+GOn8mlB x4yjfnS7fqxdtLSB/Hh0W//aBdOclui/Iijoqa4TR4o2HpiDgTLzLxRiySR5MW/R3wdw+IQJtsQ 4b5TmZOyXPxTqeMJ3MWZ2L7+IpRE0PfY/ZF9RKm/kYAHos8Ma/XK3NlWPusC5pe8aZg1ZEPO46q vnlUc4eYTn7k3Nb7/jsxgLtozKDVSfGT4cWq4dJ82T6sJie8dh6Tqpx0mu+iCXn4xiXc8oFRXXB jVQkDfQxkLQI/WBsT/mc= X-Received: by 2002:a5d:5f8f:0:b0:38d:d0ca:fbad with SMTP id ffacd0b85a97d-39132d1f8b7mr9176876f8f.14.1741619663264; Mon, 10 Mar 2025 08:14:23 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43cfd5082ccsm19268625e9.32.2025.03.10.08.14.21 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 10 Mar 2025 08:14:22 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, Richard Henderson , Thomas Huth , David Hildenbrand , Anton Johansson , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Marcel Apfelbaum , Zhao Liu , Christian Borntraeger , Ilya Leoshkevich , Eduardo Habkost , Yanan Wang , Pierrick Bouvier , =?utf-8?q?Alex_Benn=C3=A9e?= , Eric Blake , "Dr. David Alan Gilbert" , Halil Pasic , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Markus Armbruster , Eric Farman Subject: [PATCH v3 1/4] hw/s390x/skeys: Declare QOM types using DEFINE_TYPES() macro Date: Mon, 10 Mar 2025 16:14:11 +0100 Message-ID: <20250310151414.11550-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250310151414.11550-1-philmd@linaro.org> References: <20250310151414.11550-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=philmd@linaro.org; helo=mail-wr1-x435.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.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 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é --- 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)