[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 19/32] add hook to cpu_register_physical_memory
From: |
Glauber Costa |
Subject: |
[Qemu-devel] [PATCH 19/32] add hook to cpu_register_physical_memory |
Date: |
Thu, 23 Oct 2008 12:19:03 -0200 |
From: Glauber Costa <address@hidden>
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.c | 1 +
accel.h | 9 +++++++++
cpu-all.h | 4 ++++
exec.c | 32 +++++++++++++++++++-------------
kqemu.c | 3 ++-
5 files changed, 35 insertions(+), 14 deletions(-)
diff --git a/accel.c b/accel.c
index 74f7c89..bf1194d 100644
--- a/accel.c
+++ b/accel.c
@@ -31,5 +31,6 @@ QEMUAccel noaccel = {
#ifndef CONFIG_USER_ONLY
.get_real_ticks = cpu_get_ticks,
#endif
+ .register_physical_memory = accel_nop,
};
diff --git a/accel.h b/accel.h
index 3e49a93..dbb6372 100644
--- a/accel.h
+++ b/accel.h
@@ -17,6 +17,9 @@ typedef struct QEMUAccel {
#ifndef CONFIG_USER_ONLY
uint64_t (*get_real_ticks)(void);
#endif
+ void (*register_physical_memory)(uint64_t start_addr,
+ ram_addr_t size, ram_addr_t phys_offset);
+
} QEMUAccel;
typedef struct QEMUCont {
@@ -133,4 +136,10 @@ static inline uint64_t accel_get_real_ticks(void)
}
#endif
+static inline void accel_register_phys_mem(uint64_t start_addr,
+ ram_addr_t size,
+ ram_addr_t phys_offset)
+{
+ current_accel->register_physical_memory(start_addr, size, phys_offset);
+}
#endif
diff --git a/cpu-all.h b/cpu-all.h
index 0150827..edefb45 100644
--- a/cpu-all.h
+++ b/cpu-all.h
@@ -863,6 +863,10 @@ extern ram_addr_t ram_size;
typedef void CPUWriteMemoryFunc(void *opaque, target_phys_addr_t addr,
uint32_t value);
typedef uint32_t CPUReadMemoryFunc(void *opaque, target_phys_addr_t addr);
+/* this is a private version, meant for internal use of accelerators */
+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);
diff --git a/exec.c b/exec.c
index 005785a..80b8a78 100644
--- a/exec.c
+++ b/exec.c
@@ -2183,12 +2183,13 @@ static void *subpage_init (target_phys_addr_t base,
ram_addr_t *phys,
} \
} while (0)
-/* 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)
+/* Use this version of cpu registering physical memory in accel-specific code.
It exists
+ * to avoid chicken and egg problems with code that might need to register
memory in qemu,
+ * but not with the underlying accelerator
+ */
+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;
@@ -2196,13 +2197,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) {
@@ -2260,6 +2254,18 @@ void cpu_register_physical_memory(target_phys_addr_t
start_addr,
}
}
+/* 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)
+{
+ 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 68ec917..f4d905a 100644
--- a/kqemu.c
+++ b/kqemu.c
@@ -1048,7 +1048,7 @@ static void qpi_init(void)
qpi_io_memory = cpu_register_io_memory(0,
qpi_mem_read,
qpi_mem_write, NULL);
- cpu_register_physical_memory(kqemu_comm_base & ~0xfff,
+ __cpu_register_physical_memory(kqemu_comm_base & ~0xfff,
0x1000, qpi_io_memory);
}
@@ -1124,6 +1124,7 @@ QEMUAccel kqemu_accel = {
performance reasons */
.get_real_ticks = cpu_get_real_ticks,
#endif
+ .register_physical_memory = kqemu_set_phys_mem,
};
#endif
--
1.5.5.1
- [Qemu-devel] [PATCH 27/32] arch-specific hooks for accelerator, (continued)
- [Qemu-devel] [PATCH 31/32] remove kqemu_is_ok tests., Glauber Costa, 2008/10/23
- [Qemu-devel] [PATCH 30/32] lcall/lret arch specific accel hooks, Glauber Costa, 2008/10/23
- [Qemu-devel] [PATCH 25/32] provide accel hook for cpu_exec, Glauber Costa, 2008/10/23
- [Qemu-devel] [PATCH 32/32] clean up kqemu code, Glauber Costa, 2008/10/23
- [Qemu-devel] [PATCH 29/32] sysret/sysexit arch specific accelerator, Glauber Costa, 2008/10/23
- [Qemu-devel] [PATCH 28/32] iret arch specific accelerator, Glauber Costa, 2008/10/23
- [Qemu-devel] [PATCH 19/32] add hook to cpu_register_physical_memory,
Glauber Costa <=
- [Qemu-devel] Re: [PATCH 0/32] New shot at accelerators, Jan Kiszka, 2008/10/23
- [Qemu-devel] Re: [PATCH 0/32] New shot at accelerators, Anthony Liguori, 2008/10/23