[Xen-changelog] [xen-unstable] [qemu] Fix ia64 after removal of ia64_intrinsic.h.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Christian Limpach <Christian.Limpach@xxxxxxxxxxxxx>
# Date 1178874379 -3600
# Node ID 090ca10cb5438ae5d7292b462a48ac755b450647
# Parent  60240a72e2b2676a6af652a869746dd6552eed2a
[qemu] Fix ia64 after removal of ia64_intrinsic.h.

From: Alex Williamson <alex.williamson@xxxxxx>
Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxxx>
---
 tools/ioemu/exec-all.h               |    2 --
 tools/ioemu/target-i386-dm/exec-dm.c |    5 +++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff -r 60240a72e2b2 -r 090ca10cb543 tools/ioemu/exec-all.h
--- a/tools/ioemu/exec-all.h    Thu May 10 23:49:04 2007 +0100
+++ b/tools/ioemu/exec-all.h    Fri May 11 10:06:19 2007 +0100
@@ -357,7 +357,6 @@ extern CPUReadMemoryFunc *io_mem_read[IO
 extern CPUReadMemoryFunc *io_mem_read[IO_MEM_NB_ENTRIES][4];
 extern void *io_mem_opaque[IO_MEM_NB_ENTRIES];
 
-#ifndef CONFIG_DM
 #ifdef __powerpc__
 static inline int testandset (int *p)
 {
@@ -481,7 +480,6 @@ static inline int testandset (int *p)
     return __sync_lock_test_and_set (p, 1);
 }
 #endif
-#endif /* !CONFIG_DM */
 
 typedef int spinlock_t;
 
diff -r 60240a72e2b2 -r 090ca10cb543 tools/ioemu/target-i386-dm/exec-dm.c
--- a/tools/ioemu/target-i386-dm/exec-dm.c      Thu May 10 23:49:04 2007 +0100
+++ b/tools/ioemu/target-i386-dm/exec-dm.c      Fri May 11 10:06:19 2007 +0100
@@ -360,6 +360,11 @@ CPUReadMemoryFunc **cpu_get_io_memory_re
 }
 
 #ifdef __ia64__
+
+#define __ia64_fc(addr)        asm volatile ("fc %0" :: "r"(addr) : "memory")
+#define ia64_sync_i()  asm volatile (";; sync.i" ::: "memory")
+#define ia64_srlz_i()  asm volatile (";; srlz.i ;;" ::: "memory")
+
 /* IA64 has seperate I/D cache, with coherence maintained by DMA controller.
  * So to emulate right behavior that guest OS is assumed, we need to flush
  * I/D cache here.

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog