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/vl-android.c b/vl-android.c
index fdc2508..ff8ecb9 100644
--- a/vl-android.c
+++ b/vl-android.c
@@ -2556,7 +2556,7 @@
int tb_size;
const char *pid_file = NULL;
const char *incoming = NULL;
- CPUState *env;
+ CPUOldState *env;
int show_vnc_port = 0;
IniFile* hw_ini = NULL;
STRALLOC_DEFINE(kernel_params);
@@ -4352,7 +4352,7 @@
current_machine = machine;
- /* Set KVM's vcpu state to qemu's initial CPUState. */
+ /* Set KVM's vcpu state to qemu's initial CPUOldState. */
if (kvm_enabled()) {
int ret;