From: Alexander Graf <agraf@csgraf.de>
To: QEMU Developers <qemu-devel@nongnu.org>
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Cameron Esfahani" <dirty@apple.com>,
"Roman Bolshakov" <r.bolshakov@yadro.com>,
qemu-arm <qemu-arm@nongnu.org>, "Frank Yang" <lfy@google.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Peter Collingbourne" <pcc@google.com>
Subject: [PATCH v7 10/19] hvf: Remove hvf-accel-ops.h
Date: Sun, 16 May 2021 21:58:46 +0200 [thread overview]
Message-ID: <20210516195855.28869-11-agraf@csgraf.de> (raw)
In-Reply-To: <20210516195855.28869-1-agraf@csgraf.de>
We can move the definition of hvf_vcpu_exec() into our internal
hvf header, obsoleting the need for hvf-accel-ops.h.
Signed-off-by: Alexander Graf <agraf@csgraf.de>
---
accel/hvf/hvf-accel-ops.c | 2 --
accel/hvf/hvf-accel-ops.h | 17 -----------------
include/sysemu/hvf_int.h | 1 +
target/i386/hvf/hvf.c | 2 --
4 files changed, 1 insertion(+), 21 deletions(-)
delete mode 100644 accel/hvf/hvf-accel-ops.h
diff --git a/accel/hvf/hvf-accel-ops.c b/accel/hvf/hvf-accel-ops.c
index 69741ce708..14fc49791e 100644
--- a/accel/hvf/hvf-accel-ops.c
+++ b/accel/hvf/hvf-accel-ops.c
@@ -58,8 +58,6 @@
#include "sysemu/runstate.h"
#include "qemu/guest-random.h"
-#include "hvf-accel-ops.h"
-
HVFState *hvf_state;
/* Memory slots */
diff --git a/accel/hvf/hvf-accel-ops.h b/accel/hvf/hvf-accel-ops.h
deleted file mode 100644
index 018a4e22f6..0000000000
--- a/accel/hvf/hvf-accel-ops.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Accelerator CPUS Interface
- *
- * Copyright 2020 SUSE LLC
- *
- * This work is licensed under the terms of the GNU GPL, version 2 or later.
- * See the COPYING file in the top-level directory.
- */
-
-#ifndef HVF_CPUS_H
-#define HVF_CPUS_H
-
-#include "sysemu/cpus.h"
-
-int hvf_vcpu_exec(CPUState *);
-
-#endif /* HVF_CPUS_H */
diff --git a/include/sysemu/hvf_int.h b/include/sysemu/hvf_int.h
index 80c1a8f946..fd1dcaf26e 100644
--- a/include/sysemu/hvf_int.h
+++ b/include/sysemu/hvf_int.h
@@ -46,6 +46,7 @@ extern HVFState *hvf_state;
void assert_hvf_ok(hv_return_t ret);
int hvf_arch_init_vcpu(CPUState *cpu);
void hvf_arch_vcpu_destroy(CPUState *cpu);
+int hvf_vcpu_exec(CPUState *);
hvf_slot *hvf_find_overlap_slot(uint64_t, uint64_t);
int hvf_put_registers(CPUState *);
int hvf_get_registers(CPUState *);
diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c
index c7132ee370..02f7be6cfd 100644
--- a/target/i386/hvf/hvf.c
+++ b/target/i386/hvf/hvf.c
@@ -73,8 +73,6 @@
#include "qemu/accel.h"
#include "target/i386/cpu.h"
-#include "hvf-accel-ops.h"
-
void vmx_update_tpr(CPUState *cpu)
{
/* TODO: need integrate APIC handling */
--
2.30.1 (Apple Git-130)
next prev parent reply other threads:[~2021-05-16 20:06 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-16 19:58 [PATCH v7 00/19] hvf: Implement Apple Silicon Support Alexander Graf
2021-05-16 19:58 ` [PATCH v7 01/19] hvf: Move assert_hvf_ok() into common directory Alexander Graf
2021-05-16 19:58 ` [PATCH v7 02/19] hvf: Move vcpu thread functions " Alexander Graf
2021-05-16 19:58 ` [PATCH v7 03/19] hvf: Move cpu " Alexander Graf
2021-05-16 19:58 ` [PATCH v7 04/19] hvf: Move hvf internal definitions into common header Alexander Graf
2021-05-16 19:58 ` [PATCH v7 05/19] hvf: Make hvf_set_phys_mem() static Alexander Graf
2021-05-16 19:58 ` [PATCH v7 06/19] hvf: Remove use of hv_uvaddr_t and hv_gpaddr_t Alexander Graf
2021-05-16 19:58 ` [PATCH v7 07/19] hvf: Split out common code on vcpu init and destroy Alexander Graf
2021-05-16 19:58 ` [PATCH v7 08/19] hvf: Use cpu_synchronize_state() Alexander Graf
2021-05-16 19:58 ` [PATCH v7 09/19] hvf: Make synchronize functions static Alexander Graf
2021-05-16 19:58 ` Alexander Graf [this message]
2021-05-16 19:58 ` [PATCH v7 11/19] hvf: Introduce hvf vcpu struct Alexander Graf
2021-05-16 19:58 ` [PATCH v7 12/19] hvf: Simplify post reset/init/loadvm hooks Alexander Graf
2021-05-16 19:58 ` [PATCH v7 13/19] hvf: Add Apple Silicon support Alexander Graf
2021-05-16 19:58 ` [PATCH v7 14/19] arm/hvf: Add a WFI handler Alexander Graf
2021-05-16 19:58 ` [PATCH v7 15/19] hvf: arm: Implement -cpu host Alexander Graf
2021-05-16 19:58 ` [PATCH v7 16/19] hvf: arm: Implement PSCI handling Alexander Graf
2021-05-16 19:58 ` [PATCH v7 17/19] arm: Add Hypervisor.framework build target Alexander Graf
2021-05-16 19:58 ` [PATCH v7 18/19] arm: Enable Windows 10 trusted SMCCC boot call Alexander Graf
2021-05-16 19:58 ` [PATCH v7 19/19] hvf: arm: Handle Windows 10 SMC call Alexander Graf
2021-05-16 20:23 ` [PATCH v7 00/19] hvf: Implement Apple Silicon Support no-reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210516195855.28869-11-agraf@csgraf.de \
--to=agraf@csgraf.de \
--cc=dirty@apple.com \
--cc=ehabkost@redhat.com \
--cc=lfy@google.com \
--cc=pbonzini@redhat.com \
--cc=pcc@google.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=r.bolshakov@yadro.com \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).