Rename CPUState to CPUOldState.
Upstream qemu has split the cpu state into two new data structures:
CPUState -> is used to model the CPU state through the QEMU
object model.
CPUArchState -> actually a macro that aliases CPUArmState,
CPUX86State or CPUMIPSState.
Both were part of the "CPUState" in the current emulator sources.
Previous patches introduced CPUArchState, as a simple alias to the
machine-specific state. This patch renames any use of CPUState in
the current code to CPUOldState, except within target-*/ directories
where it is replaced by CPU${ARCH}State instead.
This will allow bringing the upstream CPUState definition in the
source tree, and slowly migrate everything to the right location.
Change-Id: I88b79e6e89f1f36084dc2642e1cf415135e4da09
diff --git a/cpu-exec.c b/cpu-exec.c
index 79172a2..f7a1b09 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -51,7 +51,7 @@
//#define CONFIG_DEBUG_EXEC
//#define DEBUG_SIGNAL
-int qemu_cpu_has_work(CPUState *env)
+int qemu_cpu_has_work(CPUOldState *env)
{
return cpu_has_work(env);
}
@@ -65,7 +65,7 @@
/* exit the current TB from a signal handler. The host registers are
restored in a state compatible with the CPU emulator
*/
-void cpu_resume_from_signal(CPUState *env1, void *puc)
+void cpu_resume_from_signal(CPUOldState *env1, void *puc)
{
#if !defined(CONFIG_SOFTMMU)
#ifdef __linux__
@@ -206,7 +206,7 @@
return old_handler;
}
-static void cpu_handle_debug_exception(CPUState *env)
+static void cpu_handle_debug_exception(CPUOldState *env)
{
CPUWatchpoint *wp;
@@ -230,7 +230,7 @@
* be emulated in qemu because MMIO is emulated for only one
* instruction now and then back to the HAX kernel module.
*/
-int need_handle_intr_request(CPUState *env)
+int need_handle_intr_request(CPUOldState *env)
{
#ifdef CONFIG_HAX
if (!hax_enabled() || hax_vcpu_emulation_mode(env))
@@ -241,7 +241,7 @@
#endif
}
-int cpu_exec(CPUState *env1)
+int cpu_exec(CPUOldState *env1)
{
volatile host_reg_t saved_env_reg;
int ret, interrupt_request;