diff options
author | Avi Kivity <avi@redhat.com> | 2009-08-24 18:11:17 +0300 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2009-08-24 18:11:17 +0300 |
commit | 3836eba3231b6e4e33764c861d11fd757fdc26d9 (patch) | |
tree | 14d0d5e588138d4d811686589829d91450d22b01 /target-ppc/cpu.h | |
parent | Merge commit 'facd2857783d58387885ad7cb1e4a8386f241738' into upstream-merge (diff) | |
parent | Route PC irqs to ISA bus instead of i8259 directly (diff) | |
download | qemu-kvm-3836eba3231b6e4e33764c861d11fd757fdc26d9.tar.gz qemu-kvm-3836eba3231b6e4e33764c861d11fd757fdc26d9.tar.bz2 qemu-kvm-3836eba3231b6e4e33764c861d11fd757fdc26d9.zip |
Merge commit '1452411b25fb207e7f442e5a5128f34b4939d31c' into upstream-merge
* commit '1452411b25fb207e7f442e5a5128f34b4939d31c': (38 commits)
Route PC irqs to ISA bus instead of i8259 directly
Makefile: fixed rule TAGS
QEMU set irq0override in fw_cfg
SMART ATA Functionality
Add missing linefeed in error message
Clean up VGA type selection; far too many variables being used to track one state leads to confusion if new variables are added.
When using stdio monitor and VNC display, one can set or clear a VNC password; this should set or turn off VNC authentication as well.
Don't segfault when changing VNC password on an SDL display.
Fix detached migration with exec.
Do not disable autostart for live migration
make vga screen_dump use DisplayState properly
Restore consistent formatting
es1370: Remove unused indirection of PCIES1370State and ES1370State
Fix device name completion for 'eject'
Revert my commit c00a9de060124a988bd9847c095e5836488c6f01
Fix segfault of qemu-system-arm with PXA target
sdl.c: support 32 bpp cursors
Use corect depth from DisplaySurface in vmware_vga.c
Remove the unnecessary and only global in musicpal.c
Make musicpal.c use the I2C device and the Marvell 88w8618 audio device
...
Conflicts:
hw/pc.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'target-ppc/cpu.h')
-rw-r--r-- | target-ppc/cpu.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h index dc3580f3f..4f340f3b7 100644 --- a/target-ppc/cpu.h +++ b/target-ppc/cpu.h @@ -57,10 +57,6 @@ #include "cpu-defs.h" -#define REGX "%016" PRIx64 -#define ADDRX TARGET_FMT_lx -#define PADDRX TARGET_FMT_plx - #include <setjmp.h> #include "softfloat.h" @@ -782,7 +778,7 @@ int ppcemb_tlb_search (CPUPPCState *env, target_ulong address, uint32_t pid); #endif #endif -static always_inline uint64_t ppc_dump_gpr (CPUPPCState *env, int gprn) +static inline uint64_t ppc_dump_gpr(CPUPPCState *env, int gprn) { uint64_t gprv; |