From patchwork Tue Nov 24 16:22:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudio Fontana X-Patchwork-Id: 11929369 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7B414C63777 for ; Tue, 24 Nov 2020 16:36:10 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D600E206F9 for ; Tue, 24 Nov 2020 16:36:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D600E206F9 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:43162 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1khbIV-0003VD-N5 for qemu-devel@archiver.kernel.org; Tue, 24 Nov 2020 11:36:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46842) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1khb5R-0006ig-PV for qemu-devel@nongnu.org; Tue, 24 Nov 2020 11:22:37 -0500 Received: from mx2.suse.de ([195.135.220.15]:38354) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1khb5P-0001iq-TU for qemu-devel@nongnu.org; Tue, 24 Nov 2020 11:22:37 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id C464EAF48; Tue, 24 Nov 2020 16:22:21 +0000 (UTC) From: Claudio Fontana To: Paolo Bonzini , Thomas Huth , Richard Henderson , Stefano Stabellini , Wenchao Wang , Roman Bolshakov , Sunil Muthuswamy , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , "Emilio G . Cota" Subject: [RFC v5 11/12] i386: centralize initialization of cpu accel interfaces Date: Tue, 24 Nov 2020 17:22:09 +0100 Message-Id: <20201124162210.8796-12-cfontana@suse.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201124162210.8796-1-cfontana@suse.de> References: <20201124162210.8796-1-cfontana@suse.de> MIME-Version: 1.0 Received-SPF: pass client-ip=195.135.220.15; envelope-from=cfontana@suse.de; helo=mx2.suse.de X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Eduardo Habkost , Paul Durrant , Jason Wang , Marcelo Tosatti , qemu-devel@nongnu.org, Peter Xu , Dario Faggioli , Cameron Esfahani , haxm-team@intel.com, Claudio Fontana , Anthony Perard , Bruce Rogers , Olaf Hering , Colin Xu Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Claudio Fontana --- target/i386/cpu-qom.h | 2 -- target/i386/cpu.c | 27 ++++++++++++++++++++------- target/i386/hvf/cpu.c | 9 --------- target/i386/kvm/cpu.c | 8 -------- target/i386/tcg/cpu.c | 9 --------- 5 files changed, 20 insertions(+), 35 deletions(-) diff --git a/target/i386/cpu-qom.h b/target/i386/cpu-qom.h index 9316e78e71..2cea5394c6 100644 --- a/target/i386/cpu-qom.h +++ b/target/i386/cpu-qom.h @@ -98,6 +98,4 @@ struct X86CPUAccelClass { void (*cpu_realizefn)(X86CPU *cpu, Error **errp); }; -void x86_cpu_accel_init(const char *accel_name); - #endif diff --git a/target/i386/cpu.c b/target/i386/cpu.c index b799723e53..f6fd055046 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -7066,18 +7066,31 @@ type_init(x86_cpu_register_types) static void x86_cpu_accel_init_aux(ObjectClass *klass, void *opaque) { X86CPUClass *xcc = X86_CPU_CLASS(klass); - const X86CPUAccelClass **accel = opaque; + X86CPUAccelClass *accel = opaque; - xcc->accel = *accel; + xcc->accel = accel; xcc->accel->cpu_common_class_init(xcc); } -void x86_cpu_accel_init(const char *accel_name) +static void x86_cpu_accel_init(void) { - X86CPUAccelClass *acc; + const char *ac_name; + ObjectClass *ac; + char *xac_name; + ObjectClass *xac; - acc = X86_CPU_ACCEL_CLASS(object_class_by_name(accel_name)); - g_assert(acc != NULL); + ac = object_get_class(OBJECT(current_accel())); + g_assert(ac != NULL); + ac_name = object_class_get_name(ac); + g_assert(ac_name != NULL); - object_class_foreach(x86_cpu_accel_init_aux, TYPE_X86_CPU, false, &acc); + xac_name = g_strdup_printf("%s-%s", ac_name, TYPE_X86_CPU); + xac = object_class_by_name(xac_name); + g_free(xac_name); + + if (xac) { + object_class_foreach(x86_cpu_accel_init_aux, TYPE_X86_CPU, false, xac); + } } + +accel_cpu_init(x86_cpu_accel_init); diff --git a/target/i386/hvf/cpu.c b/target/i386/hvf/cpu.c index 7e7dc044d3..70b6dbfc10 100644 --- a/target/i386/hvf/cpu.c +++ b/target/i386/hvf/cpu.c @@ -65,12 +65,3 @@ static void hvf_cpu_accel_register_types(void) type_register_static(&hvf_cpu_accel_type_info); } type_init(hvf_cpu_accel_register_types); - -static void hvf_cpu_accel_init(void) -{ - if (hvf_enabled()) { - x86_cpu_accel_init(X86_CPU_ACCEL_TYPE_NAME("hvf")); - } -} - -accel_cpu_init(hvf_cpu_accel_init); diff --git a/target/i386/kvm/cpu.c b/target/i386/kvm/cpu.c index bc5f519479..c17ed5a3f2 100644 --- a/target/i386/kvm/cpu.c +++ b/target/i386/kvm/cpu.c @@ -147,11 +147,3 @@ static void kvm_cpu_accel_register_types(void) type_register_static(&kvm_cpu_accel_type_info); } type_init(kvm_cpu_accel_register_types); - -static void kvm_cpu_accel_init(void) -{ - if (kvm_enabled()) { - x86_cpu_accel_init(X86_CPU_ACCEL_TYPE_NAME("kvm")); - } -} -accel_cpu_init(kvm_cpu_accel_init); diff --git a/target/i386/tcg/cpu.c b/target/i386/tcg/cpu.c index e7d4effdd0..00166c36e9 100644 --- a/target/i386/tcg/cpu.c +++ b/target/i386/tcg/cpu.c @@ -170,12 +170,3 @@ static void tcg_cpu_accel_register_types(void) type_register_static(&tcg_cpu_accel_type_info); } type_init(tcg_cpu_accel_register_types); - -static void tcg_cpu_accel_init(void) -{ - if (tcg_enabled()) { - x86_cpu_accel_init(X86_CPU_ACCEL_TYPE_NAME("tcg")); - } -} - -accel_cpu_init(tcg_cpu_accel_init);