diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-02-16 16:34:19 +0000 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-02-16 16:34:19 +0000 |
| commit | 1c68cbed4db8e3157e3266d9bca4491433acf680 (patch) | |
| tree | 6274fbc110bf53eaa393a7d8595336eb12bd26d0 /target-ppc/cpu.h | |
| parent | Fix hardware accelerated video to video copy on Cirrus VGA (Brian Kress) (diff) | |
| parent | virtio: Remove malloc failure checks (Jan Kiszka) (diff) | |
| download | qemu-kvm-1c68cbed4db8e3157e3266d9bca4491433acf680.tar.gz qemu-kvm-1c68cbed4db8e3157e3266d9bca4491433acf680.tar.bz2 qemu-kvm-1c68cbed4db8e3157e3266d9bca4491433acf680.zip | |
Merge branch 'qemu-cvs'
Conflicts:
qemu/Makefile.target
qemu/hw/acpi.c
qemu/hw/device-hotplug.c
qemu/hw/ide.c
qemu/hw/lsi53c895a.c
qemu/hw/pc.c
qemu/hw/pc.h
qemu/hw/pci.c
qemu/hw/pci.h
qemu/hw/virtio-blk.c
qemu/hw/virtio-net.c
qemu/monitor.c
qemu/net.c
qemu/net.h
qemu/pc-bios/bios.bin
qemu/sysemu.h
qemu/vl.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, 2 insertions, 1 deletions
diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h index 5c8e7cc23..890c1926d 100644 --- a/target-ppc/cpu.h +++ b/target-ppc/cpu.h @@ -67,7 +67,8 @@ #define TARGET_HAS_ICE 1 -#if defined (TARGET_PPC64) +/* Load a 32 bit BIOS also on 64 bit machines */ +#if defined (TARGET_PPC64) && defined(CONFIG_USER_ONLY) #define ELF_MACHINE EM_PPC64 #else #define ELF_MACHINE EM_PPC |