aboutsummaryrefslogtreecommitdiff
path: root/target-i386
diff options
context:
space:
mode:
authorPeter Crosthwaite <crosthwaitepeter@gmail.com>2015-07-18 02:40:28 -0700
committerPaolo Bonzini <pbonzini@redhat.com>2016-06-29 14:03:47 +0200
commit8642c1b81e0418df066a7960a7426d85a923a253 (patch)
tree63214ef96fe4ddeea3eb453a62e1605b1b1ecc61 /target-i386
parentbe968c721ee9df49708691ab58f0e66b394dea82 (diff)
downloadqemu-8642c1b81e0418df066a7960a7426d85a923a253.zip
qemu-8642c1b81e0418df066a7960a7426d85a923a253.tar.gz
qemu-8642c1b81e0418df066a7960a7426d85a923a253.tar.bz2
target-*: Don't redefine cpu_exec()
This function needs to be converted to QOM hook and virtualised for multi-arch. This rename interferes, as cpu-qom will not have access to the renaming causing name divergence. This rename doesn't really do anything anyway so just delete it. Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com> Message-Id: <69bd25a8678b8b31b91cd9760c777bed1aafb44e.1437212383.git.crosthwaite.peter@gmail.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Peter Crosthwaite <crosthwaitepeter@gmail.com>
Diffstat (limited to 'target-i386')
-rw-r--r--target-i386/cpu.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index d9ab884..474b0b9 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -1235,7 +1235,6 @@ void x86_cpu_exec_exit(CPUState *cpu);
X86CPU *cpu_x86_init(const char *cpu_model);
X86CPU *cpu_x86_create(const char *cpu_model, Error **errp);
-int cpu_x86_exec(CPUState *cpu);
void x86_cpu_list(FILE *f, fprintf_function cpu_fprintf);
int cpu_x86_support_mca_broadcast(CPUX86State *env);
@@ -1411,7 +1410,6 @@ uint64_t cpu_get_tsc(CPUX86State *env);
#define cpu_init(cpu_model) CPU(cpu_x86_init(cpu_model))
-#define cpu_exec cpu_x86_exec
#define cpu_signal_handler cpu_x86_signal_handler
#define cpu_list x86_cpu_list