Rename target_phys_addr_t to hwaddr

[mirror_qemu.git] / xen-mapcache.h

diff --git a/xen-mapcache.h b/xen-mapcache.h
index b89b8f9653a5f58e0ea710ae0db095a7355c9eb6..c59804060b9a2e1fdab9b68ce9174fb343410501 100644 (file)
--- a/xen-mapcache.h
+++ b/xen-mapcache.h
@@ -9,28 +9,48 @@
 #ifndef XEN_MAPCACHE_H
 #define XEN_MAPCACHE_H
 
-#include <sys/mman.h>
-#include "trace.h"
+#include <stdlib.h>
 
-void     qemu_map_cache_init(void);
-uint8_t  *qemu_map_cache(target_phys_addr_t phys_addr, target_phys_addr_t size, uint8_t lock);
-ram_addr_t qemu_ram_addr_from_mapcache(void *ptr);
-void     qemu_invalidate_entry(uint8_t *buffer);
-void     qemu_invalidate_map_cache(void);
+typedef hwaddr (*phys_offset_to_gaddr_t)(hwaddr start_addr,
+                                                     ram_addr_t size,
+                                                     void *opaque);
+#ifdef CONFIG_XEN
 
-uint8_t *xen_map_block(target_phys_addr_t phys_addr, target_phys_addr_t size);
+void xen_map_cache_init(phys_offset_to_gaddr_t f,
+                        void *opaque);
+uint8_t *xen_map_cache(hwaddr phys_addr, hwaddr size,
+                       uint8_t lock);
+ram_addr_t xen_ram_addr_from_mapcache(void *ptr);
+void xen_invalidate_map_cache_entry(uint8_t *buffer);
+void xen_invalidate_map_cache(void);
 
-static inline void xen_unmap_block(void *addr, ram_addr_t size)
+#else
+
+static inline void xen_map_cache_init(phys_offset_to_gaddr_t f,
+                                      void *opaque)
+{
+}
+
+static inline uint8_t *xen_map_cache(hwaddr phys_addr,
+                                     hwaddr size,
+                                     uint8_t lock)
 {
-    trace_xen_unmap_block(addr, size);
+    abort();
+}
 
-    if (munmap(addr, size) != 0) {
-        hw_error("xen_unmap_block: %s", strerror(errno));
-    }
+static inline ram_addr_t xen_ram_addr_from_mapcache(void *ptr)
+{
+    abort();
 }
 
+static inline void xen_invalidate_map_cache_entry(uint8_t *buffer)
+{
+}
+
+static inline void xen_invalidate_map_cache(void)
+{
+}
 
-#define mapcache_lock()   ((void)0)
-#define mapcache_unlock() ((void)0)
+#endif
 
 #endif /* !XEN_MAPCACHE_H */