[Qemu-devel] [PATCH 17/20] add hook to cpu_register_physical_memory

[Glauber Costa]

kqemu has a hook in it, so add an accel wrapper.
However, we still provide a double underlined version
which does not call the wrapper. That's basically because kqemu
call cpu_register_physical_memory itself during its initialization.

Signed-off-by: Glauber Costa <address@hidden>
---
 accel.h |   11 +++++++++++
 exec.c  |   22 ++++++++++++----------
 kqemu.c |    1 +
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/accel.h b/accel.h
index 9755a9b..a9eee65 100644
--- a/accel.h
+++ b/accel.h
@@ -10,6 +10,9 @@ typedef struct QEMUAccel {
     void (*set_notdirty)(ram_addr_t addr);
     void (*modify_page)(ram_addr_t addr, int dirty_flags);
     uint64_t (*get_real_ticks)(void);
+    void (*register_physical_memory)(uint64_t start_addr,
+                                     ram_addr_t size, ram_addr_t phys_offset);
+
 } QEMUAccel;
 
 typedef struct QEMUCont {
@@ -124,3 +127,11 @@ static inline uint64_t accel_get_real_ticks(void)
        return current_accel->get_real_ticks();
     return cpu_get_ticks();
 }
+
+static inline void accel_register_phys_mem(uint64_t start_addr,
+                                           ram_addr_t size,
+                                           ram_addr_t phys_offset)
+{
+    if (current_accel && current_accel->register_physical_memory)
+        current_accel->register_physical_memory(start_addr, size, phys_offset);
+}
diff --git a/exec.c b/exec.c
index e5d3fea..d6490ba 100644
--- a/exec.c
+++ b/exec.c
@@ -2064,9 +2064,9 @@ static void *subpage_init (target_phys_addr_t base, 
ram_addr_t *phys,
 /* register physical memory. 'size' must be a multiple of the target
    page size. If (phys_offset & ~TARGET_PAGE_MASK) != 0, then it is an
    io memory page */
-void cpu_register_physical_memory(target_phys_addr_t start_addr,
-                                  ram_addr_t size,
-                                  ram_addr_t phys_offset)
+void __cpu_register_physical_memory(target_phys_addr_t start_addr,
+                                    ram_addr_t size,
+                                    ram_addr_t phys_offset)
 {
     target_phys_addr_t addr, end_addr;
     PhysPageDesc *p;
@@ -2074,13 +2074,6 @@ void cpu_register_physical_memory(target_phys_addr_t 
start_addr,
     ram_addr_t orig_size = size;
     void *subpage;
 
-#ifdef USE_KQEMU
-    /* XXX: should not depend on cpu context */
-    env = first_cpu;
-    if (env && env->kqemu_enabled) {
-        kqemu_set_phys_mem(start_addr, size, phys_offset);
-    }
-#endif
     size = (size + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK;
     end_addr = start_addr + (target_phys_addr_t)size;
     for(addr = start_addr; addr != end_addr; addr += TARGET_PAGE_SIZE) {
@@ -2138,6 +2131,15 @@ void cpu_register_physical_memory(target_phys_addr_t 
start_addr,
     }
 }
 
+void cpu_register_physical_memory(target_phys_addr_t start_addr,
+                                  ram_addr_t size,
+                                  ram_addr_t phys_offset)
+{
+    accel_register_phys_mem(start_addr, size, phys_offset);
+
+    __cpu_register_physical_memory(start_addr, size, phys_offset);
+}
+
 /* XXX: temporary until new memory mapping API */
 ram_addr_t cpu_get_physical_page_desc(target_phys_addr_t addr)
 {
diff --git a/kqemu.c b/kqemu.c
index 783b036..e8ce6cf 100644
--- a/kqemu.c
+++ b/kqemu.c
@@ -448,6 +448,7 @@ QEMUAccel kqemu_accel = {
        because kqemu does not trap the RDTSC instruction for
        performance reasons */
     .get_real_ticks = cpu_get_real_ticks,
+    .register_physical_memory = kqemu_set_phys_mem,
 };
 
 static void __attribute__((constructor)) register_kqemu(void)
-- 
1.5.5.1