From patchwork Wed May 24 14:58:58 2023 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: 685361 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp297853wrt; Wed, 24 May 2023 08:00:45 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7ZXmd20HWEgDTybpQ24ZUnHH7zGJ4NvsENzrPVnMqbYlUJA5XF9/lgVwl3bicu8avzx/d2 X-Received: by 2002:a05:622a:1911:b0:3f3:96a3:c753 with SMTP id w17-20020a05622a191100b003f396a3c753mr25611113qtc.11.1684940444853; Wed, 24 May 2023 08:00:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684940444; cv=none; d=google.com; s=arc-20160816; b=NUU0brWxk0ph+uFBqNyClx8eoLtt4aN7DNWZpLzrGjh3ny4rLiZKYzzkTQ4aWknVSG KZXIwn5yyC4uJlg0u4PfCvCz/yhmnaa/jly5SRDv/Zvcf+WIOz5r16Q66TrGkDMHPbqm yvkntHZUlgOT/u9edvJPufrgZNY/RQzQnibqsMYSCDrg7y3sThjgJEgb2rAh1UANIP96 9DwZpNePkAf/fPHmydQUp/97fOFNI6cf2GWEmIfnOzgb2tzkix4GC3VDHeVtAFF9Fiuq /rF1DpYwShEwScxzHOiI7u+zfY+9efOmECTgO38ZL84ZAumWgd2Rypp7Ym/bWirp5dp4 B8Gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=Wrroi3k5iuAqhp3rZjOPVM512Ek393zKHUtZlhcG5AM=; b=RPjGGO0YVnCJmpsA7rAxUZjYsFp6fw7RC0LBwBueBTXXPSu5W3/ZiegNsGL2GBSAlT KFea75OJir9CK8jvuLlEElweQXX+4sIZQoKWAhabQpfFZB7J2RvsYEcw5Ad7Bzr9DFz9 LQDlc8PXyJsKRpP0P9gCGu4Rl1Qp6OydGoM8NA953L/TC8LtkqS8OTRjpyfUBSfNpSo2 7xRzwroCypABo2vE/eUzgV216jABynBt3WE88aasYaD2oqQ+khSjI9zq00pTTM43i9En e7xVHqW6slpDNX0jGtnXMyuyefJdUkq5boZiDBO1vo10c4gaffUIvlt/RHxQ9BZytWVD Hmcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FhIgSqyF; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id i4-20020ac85c04000000b003f5166f2ca1si6653223qti.675.2023.05.24.08.00.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 May 2023 08:00:44 -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=FhIgSqyF; 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 Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q1pxn-0006Mi-8w; Wed, 24 May 2023 10:59:44 -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 1q1pxc-0006Ha-Bk for qemu-devel@nongnu.org; Wed, 24 May 2023 10:59:32 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q1pxT-0006J3-G8 for qemu-devel@nongnu.org; Wed, 24 May 2023 10:59:30 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-3f6077660c6so9294215e9.0 for ; Wed, 24 May 2023 07:59:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684940360; x=1687532360; 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=Wrroi3k5iuAqhp3rZjOPVM512Ek393zKHUtZlhcG5AM=; b=FhIgSqyFLQVvdUM7l3cSO7l/VrYg8L70lkSforxW0whol7C2jzTrLB1QG30HayLf7o b/r8qXQpw8JRFDs1xYW+cTVGC41J9c91x90QYx5d1g/lp3nAVEQktdn7VHdeJFKluV6W hd15oxJpGV6Pb1NE/06IKrIOLrv0HybDMpE3C4M8qjBXAXZHIx/dMztjZ6l+ihoOZNHr P8OYPVig5Zntp6Hy5XQD1e48mR5sxc4ZAvownZw/JJXXXdPMs2bSr6fORqOMt+qp+NzP iBjYEOh6RIqwM9+qfuG3g3qbp+5Yg13kvQ+HEgpumKHJf1msZsWBXz9VKTzRWRqxqobu +nWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684940360; x=1687532360; 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=Wrroi3k5iuAqhp3rZjOPVM512Ek393zKHUtZlhcG5AM=; b=MibJ5dKx7BB+pUW72EoFTxOGLmRH3rrWU15A/M0pKWSpB4IDsCcv28ne+1AOHQ/yqe A34aM4SmTvnhxPQJXaY/yYrcuJAHhKJBOJOCRYPwYtumUe1DN6H7VkWSe31Zyg4xBOvO mpuR+KU+eWRn43tEmnxwP2z9uCIN0NCp3GN9p1aWU41Psk0KvlVCMU2+GYPxcVvgZDBK bG0LhCzpCORhVg9IJkb8e+ZqTNAkOhdt9tSgSyMFXMwb1WDr11JdKqeNpAeotcAuVCX+ CyG4yNvU9yazJ3iuhpbBA691wz6vs4YToM/+C8ULPOkVXlH90cTBCcGWRfe1XkMbBvYB JfPg== X-Gm-Message-State: AC+VfDxT9avJ/Tc6d0A0u0vMjaEnIRYFIXX87z/+nDH0Sun8Zb8cjnRA kGgH7jywRmDhQrVhoAn0HFRGSh3SslhaEjldnhCUFA== X-Received: by 2002:a05:600c:2244:b0:3f5:176:c398 with SMTP id a4-20020a05600c224400b003f50176c398mr5021wmm.31.1684940360379; Wed, 24 May 2023 07:59:20 -0700 (PDT) Received: from localhost.localdomain (fac34-h02-176-184-31-193.dsl.sta.abo.bbox.fr. [176.184.31.193]) by smtp.gmail.com with ESMTPSA id i1-20020a05600c354100b003f61177faffsm4636402wmq.0.2023.05.24.07.59.19 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 24 May 2023 07:59:19 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 02/10] hw/arm/realview: Declare QOM types using DEFINE_TYPES() macro Date: Wed, 24 May 2023 16:58:58 +0200 Message-Id: <20230524145906.33156-3-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230524145906.33156-1-philmd@linaro.org> References: <20230524145906.33156-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.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, T_SCC_BODY_TEXT_LINE=-0.01 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. Replace the type_init() / type_register_static() combination. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- hw/arm/realview.c | 50 ++++++++++++++++++----------------------------- 1 file changed, 19 insertions(+), 31 deletions(-) diff --git a/hw/arm/realview.c b/hw/arm/realview.c index a52ff35084..07a80d0de3 100644 --- a/hw/arm/realview.c +++ b/hw/arm/realview.c @@ -412,12 +412,6 @@ static void realview_eb_class_init(ObjectClass *oc, void *data) mc->default_cpu_type = ARM_CPU_TYPE_NAME("arm926"); } -static const TypeInfo realview_eb_type = { - .name = MACHINE_TYPE_NAME("realview-eb"), - .parent = TYPE_MACHINE, - .class_init = realview_eb_class_init, -}; - static void realview_eb_mpcore_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); @@ -430,12 +424,6 @@ static void realview_eb_mpcore_class_init(ObjectClass *oc, void *data) mc->default_cpu_type = ARM_CPU_TYPE_NAME("arm11mpcore"); } -static const TypeInfo realview_eb_mpcore_type = { - .name = MACHINE_TYPE_NAME("realview-eb-mpcore"), - .parent = TYPE_MACHINE, - .class_init = realview_eb_mpcore_class_init, -}; - static void realview_pb_a8_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); @@ -446,12 +434,6 @@ static void realview_pb_a8_class_init(ObjectClass *oc, void *data) mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a8"); } -static const TypeInfo realview_pb_a8_type = { - .name = MACHINE_TYPE_NAME("realview-pb-a8"), - .parent = TYPE_MACHINE, - .class_init = realview_pb_a8_class_init, -}; - static void realview_pbx_a9_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); @@ -463,18 +445,24 @@ static void realview_pbx_a9_class_init(ObjectClass *oc, void *data) mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a9"); } -static const TypeInfo realview_pbx_a9_type = { - .name = MACHINE_TYPE_NAME("realview-pbx-a9"), - .parent = TYPE_MACHINE, - .class_init = realview_pbx_a9_class_init, +static const TypeInfo realview_machine_types[] = { + { + .name = MACHINE_TYPE_NAME("realview-eb"), + .parent = TYPE_MACHINE, + .class_init = realview_eb_class_init, + }, { + .name = MACHINE_TYPE_NAME("realview-eb-mpcore"), + .parent = TYPE_MACHINE, + .class_init = realview_eb_mpcore_class_init, + }, { + .name = MACHINE_TYPE_NAME("realview-pb-a8"), + .parent = TYPE_MACHINE, + .class_init = realview_pb_a8_class_init, + }, { + .name = MACHINE_TYPE_NAME("realview-pbx-a9"), + .parent = TYPE_MACHINE, + .class_init = realview_pbx_a9_class_init, + } }; -static void realview_machine_init(void) -{ - type_register_static(&realview_eb_type); - type_register_static(&realview_eb_mpcore_type); - type_register_static(&realview_pb_a8_type); - type_register_static(&realview_pbx_a9_type); -} - -type_init(realview_machine_init) +DEFINE_TYPES(realview_machine_types)