Received: by 2002:ac2:51c9:0:0:0:0:0 with SMTP id u9csp653048lfm; Sun, 16 May 2021 13:03:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxJpJ7uxXE0MijuFIz5Ys/gpgg4e1VE/t67eBVzO/Hu81W1fOGijyHBC9beqe3ojg1BDTWX X-Received: by 2002:a92:c26d:: with SMTP id h13mr21269928ild.131.1621195383140; Sun, 16 May 2021 13:03:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621195383; cv=none; d=google.com; s=arc-20160816; b=B0FVgcCAFrK+iIhge1igWDfr93YiMb0vtrByxTavZhHra62vBTcM9sU6f0fWvj0nT/ mPkF5A8PZjivDi48JtpN/BnPVJkD+B743uwh53pjblqrC9d4shqfTOsQUrEBAkW8ypJD 7/SaF7eoJjBwmMFqxyEdiuzcXmRT2WwaJELFyQ0iomdDiPBWYFmTWXL42BYLegCfThBH KabnwEnl5bQq7te0r7h81aLJANaz4GeP53YQCWT6GcGs4snq9vtaBUjautcD2RP9SLRl AAsNI24cDo524DwTPoX8TgNx/OV6dOYH3RfMCLVOQ7agDyGRNCuHigLLM0Bey5SOJAcu Mevw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from; bh=EaMmx7rp/BWbW4Znlj1znbU+0Yb1VSLcW3PGVjAQl0s=; b=aouZN0CVaz/6qC4+2biumgOd9/FbkVzaswK7nlAMd04XFhXODDNB8JwWMG0WMWsPVB P4iVmsUlP9LUz38xttbsR4T5hFcXeyHiPHICEO8R3knOr0qvq4oGzxb7lDW6iNAp7q3u Y0WGtyes0Nmuo5cLZQrUdiT2Vc78YstMpnD/Xhc0m5Lf8xHOxPo2CPXkN6aKb3adqai9 WhiWnECxVw5yMOouB7e/U9P+IploenAu/2GIvOcfOWgpLicasjOZmKkrYsO4GZwM6BCw elV6CkqrAbjxCShMPxBktUd5aYVhua8dV8NV5DXOvZvyeBnoelHNAcO1KlEYDLCPY+Cl MkaQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id b23si9991583jav.29.2021.05.16.13.03.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 16 May 2021 13:03:03 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org" Received: from localhost ([::1]:35522 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1liMyc-0000wu-Ex for alex.bennee@linaro.org; Sun, 16 May 2021 16:03:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44348) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1liMup-00021M-2q; Sun, 16 May 2021 15:59:07 -0400 Received: from mail.csgraf.de ([85.25.223.15]:45402 helo=zulu616.server4you.de) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1liMum-0008GC-58; Sun, 16 May 2021 15:59:06 -0400 Received: from localhost.localdomain (dynamic-095-118-089-019.95.118.pool.telefonica.de [95.118.89.19]) by csgraf.de (Postfix) with ESMTPSA id 8099360806B0; Sun, 16 May 2021 21:59:01 +0200 (CEST) From: Alexander Graf To: QEMU Developers Subject: [PATCH v7 08/19] hvf: Use cpu_synchronize_state() Date: Sun, 16 May 2021 21:58:44 +0200 Message-Id: <20210516195855.28869-9-agraf@csgraf.de> X-Mailer: git-send-email 2.30.1 (Apple Git-130) In-Reply-To: <20210516195855.28869-1-agraf@csgraf.de> References: <20210516195855.28869-1-agraf@csgraf.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=85.25.223.15; envelope-from=agraf@csgraf.de; helo=zulu616.server4you.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@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 , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Cameron Esfahani , Roman Bolshakov , qemu-arm , Marcel Apfelbaum , Frank Yang , Paolo Bonzini , Peter Collingbourne Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: ypMuuqPF7Uv3 There is no reason to call the hvf specific hvf_cpu_synchronize_state() when we can just use the generic cpu_synchronize_state() instead. This allows us to have less dependency on internal function definitions and allows us to make hvf_cpu_synchronize_state() static. Signed-off-by: Alexander Graf --- accel/hvf/hvf-accel-ops.c | 2 +- accel/hvf/hvf-accel-ops.h | 1 - target/i386/hvf/x86hvf.c | 9 ++++----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/accel/hvf/hvf-accel-ops.c b/accel/hvf/hvf-accel-ops.c index b262efd8b6..3b599ac57c 100644 --- a/accel/hvf/hvf-accel-ops.c +++ b/accel/hvf/hvf-accel-ops.c @@ -200,7 +200,7 @@ static void do_hvf_cpu_synchronize_state(CPUState *cpu, run_on_cpu_data arg) } } -void hvf_cpu_synchronize_state(CPUState *cpu) +static void hvf_cpu_synchronize_state(CPUState *cpu) { if (!cpu->vcpu_dirty) { run_on_cpu(cpu, do_hvf_cpu_synchronize_state, RUN_ON_CPU_NULL); diff --git a/accel/hvf/hvf-accel-ops.h b/accel/hvf/hvf-accel-ops.h index 09fcf22067..f6192b56f0 100644 --- a/accel/hvf/hvf-accel-ops.h +++ b/accel/hvf/hvf-accel-ops.h @@ -13,7 +13,6 @@ #include "sysemu/cpus.h" int hvf_vcpu_exec(CPUState *); -void hvf_cpu_synchronize_state(CPUState *); void hvf_cpu_synchronize_post_reset(CPUState *); void hvf_cpu_synchronize_post_init(CPUState *); void hvf_cpu_synchronize_pre_loadvm(CPUState *); diff --git a/target/i386/hvf/x86hvf.c b/target/i386/hvf/x86hvf.c index 2b99f3eaa2..cc381307ab 100644 --- a/target/i386/hvf/x86hvf.c +++ b/target/i386/hvf/x86hvf.c @@ -26,14 +26,13 @@ #include "cpu.h" #include "x86_descr.h" #include "x86_decode.h" +#include "sysemu/hw_accel.h" #include "hw/i386/apic_internal.h" #include #include -#include "accel/hvf/hvf-accel-ops.h" - void hvf_set_segment(struct CPUState *cpu, struct vmx_segment *vmx_seg, SegmentCache *qseg, bool is_tr) { @@ -437,7 +436,7 @@ int hvf_process_events(CPUState *cpu_state) env->eflags = rreg(cpu_state->hvf_fd, HV_X86_RFLAGS); if (cpu_state->interrupt_request & CPU_INTERRUPT_INIT) { - hvf_cpu_synchronize_state(cpu_state); + cpu_synchronize_state(cpu_state); do_cpu_init(cpu); } @@ -451,12 +450,12 @@ int hvf_process_events(CPUState *cpu_state) cpu_state->halted = 0; } if (cpu_state->interrupt_request & CPU_INTERRUPT_SIPI) { - hvf_cpu_synchronize_state(cpu_state); + cpu_synchronize_state(cpu_state); do_cpu_sipi(cpu); } if (cpu_state->interrupt_request & CPU_INTERRUPT_TPR) { cpu_state->interrupt_request &= ~CPU_INTERRUPT_TPR; - hvf_cpu_synchronize_state(cpu_state); + cpu_synchronize_state(cpu_state); apic_handle_tpr_access_report(cpu->apic_state, env->eip, env->tpr_access_type); } -- 2.30.1 (Apple Git-130)