From patchwork Tue Jan 3 18:16:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 638763 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp1394704pvb; Tue, 3 Jan 2023 10:28:56 -0800 (PST) X-Google-Smtp-Source: AMrXdXskRYFSZ+SiRk8w+v6sM1WDU1CbHxCFlEk8b3fsh96HUDAKwshjVRUehDQATtsNR7BwQ5GU X-Received: by 2002:a05:622a:4d48:b0:3a6:258d:4387 with SMTP id fe8-20020a05622a4d4800b003a6258d4387mr74605726qtb.13.1672770536340; Tue, 03 Jan 2023 10:28:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672770536; cv=none; d=google.com; s=arc-20160816; b=SpcXkDkiUddVbTRHPZXuHLWGvRii/FwzlHYmqLvIPSaRHNLFxX1HkFGjCaYeHj8rgV Amrp1Qbu/QB7AHUhzOl7B+8vScZUP6GLwrNZe/+r4fhlerzNmoiPN9AwN0QuNyC6RH1P SLxUhzUC9jqZSpYUunHvLsMwTvLcYbqR2Pg5xJ2DSkF9nqI0xYORMyAup7KTcS+zhG+i Mlj36I72Q/uMBwepl2qIrcnq9eQrY/UDz22piAPfzIjPht5mqsUsulD/Zv3tgqWDrZI9 HKB8JXJ6tuz9FgLGWxG+/y4qnQ2DyVyPNpTptsrKz8ngk+drb8JXX8kDfBQbTcgRJaY/ Vd8w== 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=Q1oCoDY8fhpidPn09tNWnDVDs+nP6yjSMDN5nvvhyRs=; b=dRJpnsX98rMHVhdB8YzVwnyQZe0yqUT3l/7NopTMobJDPtSm9YmsZxZ7E3l7TH+TSz 1MPPcwqbybtz7OHR2GfkP+OPyaNYP+gNYIhIo/ZIqS8cbPFSXT2mmUqqJCrYsk27O4wC ytwKBrE6rSznvdjJHOBIo3kRVnrwOlEHxQUs48jxbgZ0auJC0A3o0+o9JylRiYzP6Yjj U9oveWWrYJNVx04LjyE/Lc83Sa7QiOQsGyvNHbZ3pfsiRJTtAIqdOfHtDIqLvo9Xo9m1 o18oNl6ldASWARNjHeVvcYSx63KgRdZoMqJ4LYCLMogtvSHy+JpfIvqgNOjd4tKYclJX hXnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SkvaT8l+; 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 s12-20020a05620a254c00b00704d8dcff6asi8627644qko.437.2023.01.03.10.28.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Jan 2023 10:28:56 -0800 (PST) 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=SkvaT8l+; 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 1pClrb-00009X-Go; Tue, 03 Jan 2023 13:18:15 -0500 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 1pClqj-0008IA-08 for qemu-devel@nongnu.org; Tue, 03 Jan 2023 13:17:24 -0500 Received: from mail-vk1-xa2f.google.com ([2607:f8b0:4864:20::a2f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pClqg-0005Ce-L8 for qemu-devel@nongnu.org; Tue, 03 Jan 2023 13:17:19 -0500 Received: by mail-vk1-xa2f.google.com with SMTP id g65so12258120vkh.8 for ; Tue, 03 Jan 2023 10:17:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=Q1oCoDY8fhpidPn09tNWnDVDs+nP6yjSMDN5nvvhyRs=; b=SkvaT8l++k2rTo+ucw3PdOj9N7qGbIGlgBdR8KQ1QRIzlXmYV8+1H4hdSMNWmq5SUc ILlEMJ1o8cSB/n9EaYHwU/dlajDWTnJoYTOyWd4/Dj/0xcjmnXXg9trHS8/4BoduShA3 m5PWANUFjb6E7Ru80MjWTIN0wvPuauRchE6GIERP5SE4oJGKMTFllutkGH5yd+ddjPxn 0V80OgwPhU92v6k7lY+fuHd8NhVit9NKzqYPuAC8PwnPG8DO22PSpPkiXJJLL5AQMyDW FsKpwciT57zio4bVvPXQtYXrjI7KY62ioJSejGl1mWaEY7a+axdIFJwFQZkugoy9JzAG wkHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=Q1oCoDY8fhpidPn09tNWnDVDs+nP6yjSMDN5nvvhyRs=; b=s+CWTDox+ZKJySLO5NwsSLEYn9Q9TK7ME6dg6Vs4uV47pJ33XYv3VOdzDnD/EnqKB4 r568jJyTYF4ECdjTqPRmycQGInZmNmj84HQNLd6Z6krSLcqBuZflLfRbLSdxRpoPO8h+ z6TTw4i4dARLQH/Rh8GQGvTl647htzuBpd4cfw3r/bfF4CxHcqCnV3seEpDhV4EbQGnf 58gdCwqBXBeBg+C6XaeTfF4QtQe3raW8xxSw8HrT7qGnNNq8zY3iXbq+tC/+68ps3Axa r0/Um32MVJhDc3RRXCkjDplh0k75NhG0/PCFX5dN3/tF5BakoANhV3Vu0XuzN1RBacPD e+Ig== X-Gm-Message-State: AFqh2kq/8dZAbHQFlZe4qPwMHfA1AY6JPZ58TldJ8Ng5op9PCcWPeICU R/mn2Sqpe+OmOBIPfc6jKsXPYt/xwOVEq8/4yyU= X-Received: by 2002:a1f:6012:0:b0:3d5:a227:6e46 with SMTP id u18-20020a1f6012000000b003d5a2276e46mr6572135vkb.5.1672769837686; Tue, 03 Jan 2023 10:17:17 -0800 (PST) Received: from stoup.. ([2607:fb90:8060:51a2:184b:6e49:c396:be2]) by smtp.gmail.com with ESMTPSA id v2-20020a05620a440200b006fed2788751sm23042354qkp.76.2023.01.03.10.17.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Jan 2023 10:17:17 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, berrange@redhat.com, eduardo@habkost.net, armbru@redhat.com, ajones@ventanamicro.com, alex.bennee@linaro.org Subject: [RFC PATCH 09/40] target/arm: Utilize arm-cpu instance_post_init hook Date: Tue, 3 Jan 2023 10:16:15 -0800 Message-Id: <20230103181646.55711-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230103181646.55711-1-richard.henderson@linaro.org> References: <20230103181646.55711-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::a2f; envelope-from=richard.henderson@linaro.org; helo=mail-vk1-xa2f.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=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 Rather than call arm_cpu_post_init ourselves from the object instance_init, let QOM handle this. Signed-off-by: Richard Henderson --- target/arm/cpu.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index b16d9bbe47..a6c6916f36 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -2245,14 +2245,6 @@ static void arm_cpu_class_init(ObjectClass *oc, void *data) #endif /* CONFIG_TCG */ } -static void arm_cpu_instance_init(Object *obj) -{ - ARMCPUClass *acc = ARM_CPU_GET_CLASS(obj); - - acc->info->initfn(obj); - arm_cpu_post_init(obj); -} - static void arm_cpu_leaf_class_init(ObjectClass *oc, void *data) { ARMCPUClass *acc = ARM_CPU_CLASS(oc); @@ -2270,7 +2262,7 @@ void arm_cpu_register_parent(const ARMCPUInfo *info, const char *parent) .parent = parent, .instance_size = sizeof(ARMCPU), .instance_align = __alignof__(ARMCPU), - .instance_init = arm_cpu_instance_init, + .instance_init = info->initfn, .class_size = sizeof(ARMCPUClass), .class_init = arm_cpu_leaf_class_init, .class_data = (void *)info, @@ -2287,6 +2279,7 @@ static const TypeInfo arm_cpu_type_info = { .instance_size = sizeof(ARMCPU), .instance_align = __alignof__(ARMCPU), .instance_init = arm_cpu_initfn, + .instance_post_init = arm_cpu_post_init, .instance_finalize = arm_cpu_finalizefn, .abstract = true, .class_size = sizeof(ARMCPUClass),