diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-12-07 11:14:58 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-12-07 11:14:58 +0200 |
| commit | ab7748eba170816f20b22b1d3043968faad9e15c (patch) | |
| tree | a941fed8433f0c465dba8a50bd1cd8300ed339ae /cpu-exec.c | |
| parent | Merge commit 'd08d6f04d6eeedce5090ff66d0676162d7d8d788' into upstream-merge (diff) | |
| parent | S/390 CPU fake emulation (diff) | |
| download | qemu-kvm-ab7748eba170816f20b22b1d3043968faad9e15c.tar.gz qemu-kvm-ab7748eba170816f20b22b1d3043968faad9e15c.tar.bz2 qemu-kvm-ab7748eba170816f20b22b1d3043968faad9e15c.zip | |
Merge commit '10ec51174ca69a4c3c5149b0b3baaa6ccba66273' into upstream-merge
* commit '10ec51174ca69a4c3c5149b0b3baaa6ccba66273':
S/390 CPU fake emulation
Sparc64: handle MMU global bit and nucleus context
monitor: fix use of plain integer as NULL pointer, spotted by Sparse
Add "static" to please Sparse
scsi: fix incorrect ?: use
Conflicts:
cpu-exec.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'cpu-exec.c')
| -rw-r--r-- | cpu-exec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cpu-exec.c b/cpu-exec.c index b20ad60ce..0f085eab3 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -253,6 +253,7 @@ int cpu_exec(CPUState *env1) #elif defined(TARGET_MIPS) #elif defined(TARGET_SH4) #elif defined(TARGET_CRIS) +#elif defined(TARGET_S390X) #elif defined(TARGET_IA64) /* XXXXX */ #else @@ -681,6 +682,7 @@ int cpu_exec(CPUState *env1) #elif defined(TARGET_IA64) #elif defined(TARGET_ALPHA) #elif defined(TARGET_CRIS) +#elif defined(TARGET_S390X) /* XXXXX */ #else #error unsupported target CPU |