diff options
author | Avi Kivity <avi@redhat.com> | 2009-03-15 11:47:45 +0200 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2009-03-15 11:47:45 +0200 |
commit | 80384df5fdd744d94c3bd0d0a639a282315d3ddf (patch) | |
tree | 10ab961e243b94a6dbbc00fca605cb1784dbdd27 /target-ppc/cpu.h | |
parent | Merge branch 'qemu-cvs' (diff) | |
parent | Make the ELF loader aware of backwards compatibility (diff) | |
download | qemu-kvm-80384df5fdd744d94c3bd0d0a639a282315d3ddf.tar.gz qemu-kvm-80384df5fdd744d94c3bd0d0a639a282315d3ddf.tar.bz2 qemu-kvm-80384df5fdd744d94c3bd0d0a639a282315d3ddf.zip |
Merge branch 'qemu-cvs'
* qemu-cvs: (29 commits)
Make the ELF loader aware of backwards compatibility
temporarily disable logging around pci config writes (Avi Kivity)
stop dirty logging while updating cirrus bank memory (Glauber Costa)
Add missing file
Update changelog
qemu:virtio-net: Check return size on the correct sg list (Alex Williamson)
make qemu_announce_self handle non contiguous net tables (Marcelo Tosatti)
Replace asprintf() with snprintf() in vnc.c ("Daniel P. Berrange")
monitor: Provide empty command as final history entry (Jan Kiszka)
Add and use remaining #defines for PCI device IDs (Stuart Brady)
remove is_graphic_console from vga.c (Stefano Stabellini)
DisplayAllocator interface (Stefano Stabellini)
tcg/x86_64: add bswap16_i{32,64} and bswap32_i64 ops
tcg/x86: add bswap16_i32 ops
target-i386: use the new bswap* TCG ops
target-ppc: use the new bswap* TCG ops
tcg: update README wrt recent bswap changes
tcg: add _tl aliases to bswap16/32/64 TCG ops
tcg: add bswap16_i64 and bswap32_i64 TCG ops
tcg: optimize tcg_gen_bswap16_i32
...
Conflicts:
qemu/gdbstub.c
qemu/hw/apic.c
qemu/hw/vga.c
qemu/monitor.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'target-ppc/cpu.h')
-rw-r--r-- | target-ppc/cpu.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h index bad4b551d..82f66f8dd 100644 --- a/target-ppc/cpu.h +++ b/target-ppc/cpu.h @@ -69,8 +69,7 @@ #define TARGET_HAS_ICE 1 -/* Load a 32 bit BIOS also on 64 bit machines */ -#if defined (TARGET_PPC64) && defined(CONFIG_USER_ONLY) +#if defined (TARGET_PPC64) #define ELF_MACHINE EM_PPC64 #else #define ELF_MACHINE EM_PPC |