From mboxrd@z Thu Jan 1 00:00:00 1970 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=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 DEEDEC432BE for ; Tue, 31 Aug 2021 12:34:21 +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 6E6ED6103E for ; Tue, 31 Aug 2021 12:34:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 6E6ED6103E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:59820 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mL2y4-0006Wr-JM for qemu-devel@archiver.kernel.org; Tue, 31 Aug 2021 08:34:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60656) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mL2i1-0005k8-Sb for qemu-devel@nongnu.org; Tue, 31 Aug 2021 08:17:45 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:20321) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mL2hz-000632-6y for qemu-devel@nongnu.org; Tue, 31 Aug 2021 08:17:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630412262; 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=cCmd4O4HkpJQDqHqb3kEpsKWXrKqloX8kyxaEEA97UM=; b=LJlmvVsGaPJy8rRVlpzFPRD0z+tTkwleM+41CH1lc5WsPQM6q6kEenlwlRDvuXyJz2n0C2 FtiGcqiTMewUPcAONvpDbVx2F5UpIGkmEZpGwEMkDNcmc+x/S0rZvEmaYI/c8xc69DcYyM 2EIPRh2+iBTo797CVStPjXyqEZC5dog= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-199-e_b-rrf6PoCAL8m62aXggA-1; Tue, 31 Aug 2021 08:17:41 -0400 X-MC-Unique: e_b-rrf6PoCAL8m62aXggA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EE2BF8799E0; Tue, 31 Aug 2021 12:17:37 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.192.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6CDD91007611; Tue, 31 Aug 2021 12:17:37 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 0733718009CC; Tue, 31 Aug 2021 14:15:46 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 14/29] tcg_funcs:Add tcg_exec_{realizefn, unrealizefn} to TCGModuleOps Date: Tue, 31 Aug 2021 14:15:30 +0200 Message-Id: <20210831121545.2874233-15-kraxel@redhat.com> In-Reply-To: <20210831121545.2874233-1-kraxel@redhat.com> References: <20210831121545.2874233-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Received-SPF: pass client-ip=216.205.24.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.391, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , "Michael S. Tsirkin" , Bin Meng , David Hildenbrand , Aleksandar Rikalo , Peter Xu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Max Filippov , Alistair Francis , Gerd Hoffmann , "Edgar E. Iglesias" , Alexandre Iooss , Huacai Chen , Halil Pasic , Christian Borntraeger , Palmer Dabbelt , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Eduardo Habkost , Richard Henderson , Greg Kurz , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, Stafford Horne , =?UTF-8?q?Alex=20Benn=C3=A9e?= , David Gibson , qemu-riscv@nongnu.org, Bastian Koppelmann , Cornelia Huck , Laurent Vivier , qemu-ppc@nongnu.org, Paolo Bonzini , Mahmoud Mandour , Aurelien Jarno Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Gerd Hoffmann --- include/exec/cpu-all.h | 2 -- include/tcg/tcg-module.h | 2 ++ accel/tcg/cpu-exec.c | 12 ++++++++++-- accel/tcg/tcg-module.c | 6 ++++++ cpu.c | 4 ++-- 5 files changed, 20 insertions(+), 6 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 32cfb634c6a0..c2bfd0ea1de1 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -440,8 +440,6 @@ void dump_opcount_info(void); #ifdef CONFIG_TCG /* accel/tcg/cpu-exec.c */ int cpu_exec(CPUState *cpu); -void tcg_exec_realizefn(CPUState *cpu, Error **errp); -void tcg_exec_unrealizefn(CPUState *cpu); #endif /* CONFIG_TCG */ /* Returns: 0 on success, -1 on error */ diff --git a/include/tcg/tcg-module.h b/include/tcg/tcg-module.h index 159cbd3e7ce6..5dd4deb9ed57 100644 --- a/include/tcg/tcg-module.h +++ b/include/tcg/tcg-module.h @@ -11,6 +11,8 @@ struct TCGModuleOps { bool (*tlb_plugin_lookup)(CPUState *cpu, target_ulong addr, int mmu_idx, bool is_store, struct qemu_plugin_hwaddr *data); #endif + void (*tcg_exec_unrealizefn)(CPUState *cpu); + void (*tcg_exec_realizefn)(CPUState *cpu, Error **errp); }; extern struct TCGModuleOps tcg; diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index e5c0ccd1a2ab..d41d1d2bd24f 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -981,7 +981,7 @@ int cpu_exec(CPUState *cpu) return ret; } -void tcg_exec_realizefn(CPUState *cpu, Error **errp) +static void tcg_exec_realizefn(CPUState *cpu, Error **errp) { static bool tcg_target_initialized; CPUClass *cc = CPU_GET_CLASS(cpu); @@ -999,7 +999,7 @@ void tcg_exec_realizefn(CPUState *cpu, Error **errp) } /* undo the initializations in reverse order */ -void tcg_exec_unrealizefn(CPUState *cpu) +static void tcg_exec_unrealizefn(CPUState *cpu) { #ifndef CONFIG_USER_ONLY tcg_iommu_free_notifier_list(cpu); @@ -1031,3 +1031,11 @@ void dump_drift_info(void) } #endif /* !CONFIG_USER_ONLY */ + +static void tcg_module_ops_exec(void) +{ + tcg.tcg_exec_realizefn = tcg_exec_realizefn; + tcg.tcg_exec_unrealizefn = tcg_exec_unrealizefn; +} + +type_init(tcg_module_ops_exec); diff --git a/accel/tcg/tcg-module.c b/accel/tcg/tcg-module.c index db3d3e9e9318..36c1df564f31 100644 --- a/accel/tcg/tcg-module.c +++ b/accel/tcg/tcg-module.c @@ -21,6 +21,10 @@ static bool tlb_plugin_lookup_stub(CPUState *cpu, target_ulong addr, int mmu_idx } #endif +static void tcg_exec_realizefn_stub(CPUState *cpu, Error **errp) +{ +} + struct TCGModuleOps tcg = { .tlb_flush = update_cpu_stub, .tlb_flush_page = tlb_flush_page_stub, @@ -28,4 +32,6 @@ struct TCGModuleOps tcg = { .tlb_reset_dirty = tlb_reset_dirty_stub, .tlb_plugin_lookup = tlb_plugin_lookup_stub, #endif + .tcg_exec_realizefn = tcg_exec_realizefn_stub, + .tcg_exec_unrealizefn = update_cpu_stub, }; diff --git a/cpu.c b/cpu.c index 26277f387baf..d1c9f68a26e7 100644 --- a/cpu.c +++ b/cpu.c @@ -140,7 +140,7 @@ void cpu_exec_realizefn(CPUState *cpu, Error **errp) #ifdef CONFIG_TCG /* NB: errp parameter is unused currently */ if (tcg_enabled()) { - tcg_exec_realizefn(cpu, errp); + tcg.tcg_exec_realizefn(cpu, errp); } #endif /* CONFIG_TCG */ @@ -172,7 +172,7 @@ void cpu_exec_unrealizefn(CPUState *cpu) #ifdef CONFIG_TCG /* NB: errp parameter is unused currently */ if (tcg_enabled()) { - tcg_exec_unrealizefn(cpu); + tcg.tcg_exec_unrealizefn(cpu); } #endif /* CONFIG_TCG */ -- 2.31.1