summaryrefslogtreecommitdiff
path: root/target-s390x
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-s390x
parentbe968c721ee9df49708691ab58f0e66b394dea82 (diff)
downloadqemu-8642c1b81e0418df066a7960a7426d85a923a253.tar.gz
qemu-8642c1b81e0418df066a7960a7426d85a923a253.tar.bz2
qemu-8642c1b81e0418df066a7960a7426d85a923a253.zip
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-s390x')
-rw-r--r--target-s390x/cpu.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h
index bd6b2e57ef..8bcb0f75f3 100644
--- a/target-s390x/cpu.h
+++ b/target-s390x/cpu.h
@@ -463,7 +463,6 @@ S390CPU *cpu_s390x_init(const char *cpu_model);
S390CPU *s390x_new_cpu(const char *cpu_model, int64_t id, Error **errp);
S390CPU *cpu_s390x_create(const char *cpu_model, Error **errp);
void s390x_translate_init(void);
-int cpu_s390x_exec(CPUState *cpu);
/* you can call this signal handler from your SIGBUS and SIGSEGV
signal handlers to inform the virtual CPU of exceptions. non zero
@@ -627,7 +626,6 @@ void cpu_unlock(void);
extern void subsystem_reset(void);
#define cpu_init(model) CPU(cpu_s390x_init(model))
-#define cpu_exec cpu_s390x_exec
#define cpu_signal_handler cpu_s390x_signal_handler
void s390_cpu_list(FILE *f, fprintf_function cpu_fprintf);