Merge branch 'master' of git://git.sv.gnu.org/qemu

* 'master' of git://git.sv.gnu.org/qemu: (116 commits)
  kvm: add error message for when SMP is requested
  Remove initrd warning message
  initialize struct sigevent before timer_create
  Fix NULL alarm_timer pointer at exit
  keep initrd in below 4g area.
  migrate.c: migrate_fd_put_buffer: Do not busyloop: stop writing if EWOULDBLOCK
  kvm: work around supported cpuid ioctl() brokenness
  remove gcc 3.x requirement from documentation
  Remove dead code
  Format per CODING_STYLE
  Abort on attempts to allocate zero bytes
  Unbreak out-of-tree builds
  Hardware convenience library
  Disable >4G ram support on 32-bit targets
  Only define __llseek if it is going to be used
  Avoid implicit truncation compiler warnings
  Remove obsolete BIOS_SIZE from sysemu.h
  cris: First shot at qdev for CRIS interrupts.
  etrax: Don't keep the passed irq pointer.
  etrax: Remove unused eth irq line.
  ...

Conflicts:
	Makefile
	Makefile.target
	block/raw-posix.c
	configure
	hw/boards.h
	hw/pc.h
	hw/pci.c
	hw/virtio-console.c
	target-ppc/cpu.h
	vl.c

Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 1 insertions, 24 deletions

diff --git a/cpu-defs.h b/cpu-defs.h
index 376861633..1e071e791 100644
--- a/cpu-defs.h
+++ b/cpu-defs.h
@@ -31,19 +31,12 @@
 #include <pthread.h>
 #include "osdep.h"
 #include "sys-queue.h"
+#include "targphys.h"
 
 #ifndef TARGET_LONG_BITS
 #error TARGET_LONG_BITS must be defined before including this header
 #endif
 
-#ifndef TARGET_PHYS_ADDR_BITS
-#if TARGET_LONG_BITS >= HOST_LONG_BITS
-#define TARGET_PHYS_ADDR_BITS TARGET_LONG_BITS
-#else
-#define TARGET_PHYS_ADDR_BITS HOST_LONG_BITS
-#endif
-#endif
-
 #define TARGET_LONG_SIZE (TARGET_LONG_BITS / 8)
 
 /* target_ulong is the type of a virtual address */
@@ -63,22 +56,6 @@ typedef uint64_t target_ulong;
 #error TARGET_LONG_SIZE undefined
 #endif
 
-/* target_phys_addr_t is the type of a physical address (its size can
-   be different from 'target_ulong'). We have sizeof(target_phys_addr)
-   = max(sizeof(unsigned long),
-   sizeof(size_of_target_physical_address)) because we must pass a
-   host pointer to memory operations in some cases */
-
-#if TARGET_PHYS_ADDR_BITS == 32
-typedef uint32_t target_phys_addr_t;
-#define TARGET_FMT_plx "%08x"
-#elif TARGET_PHYS_ADDR_BITS == 64
-typedef uint64_t target_phys_addr_t;
-#define TARGET_FMT_plx "%016" PRIx64
-#else
-#error TARGET_PHYS_ADDR_BITS undefined
-#endif
-
 #define HOST_LONG_SIZE (HOST_LONG_BITS / 8)
 
 #define EXCP_INTERRUPT 	0x10000 /* async interruption */