[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/11] exec: move qemu_ram_addr_from_host_nofail to
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 09/11] exec: move qemu_ram_addr_from_host_nofail to cputlb.c |
Date: |
Tue, 25 Jun 2013 13:13:25 +0200 |
After the next patch it would not be used elsewhere anyway. Also,
the _nofail and the standard versions of this function return different
things, which is confusing. Removing the function from the public headers
limits the confusion.
Signed-off-by: Paolo Bonzini <address@hidden>
---
cputlb.c | 11 +++++++++++
exec.c | 18 ++++--------------
include/exec/cpu-common.h | 1 -
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/cputlb.c b/cputlb.c
index 947f17c..b716bbe 100644
--- a/cputlb.c
+++ b/cputlb.c
@@ -158,6 +158,17 @@ void tlb_reset_dirty_range(CPUTLBEntry *tlb_entry,
uintptr_t start,
}
}
+static inline ram_addr_t qemu_ram_addr_from_host_nofail(void *ptr)
+{
+ ram_addr_t ram_addr;
+
+ if (qemu_ram_addr_from_host(ptr, &ram_addr)) {
+ fprintf(stderr, "Bad ram pointer %p\n", ptr);
+ abort();
+ }
+ return ram_addr;
+}
+
static inline void tlb_update_dirty(CPUTLBEntry *tlb_entry)
{
ram_addr_t ram_addr;
diff --git a/exec.c b/exec.c
index fb12588..5c7106a 100644
--- a/exec.c
+++ b/exec.c
@@ -1399,6 +1399,8 @@ static void *qemu_ram_ptr_length(ram_addr_t addr,
ram_addr_t *size)
}
}
+/* Some of the softmmu routines need to translate from a host pointer
+ (typically a TLB entry) back to a ram offset. */
int qemu_ram_addr_from_host(void *ptr, ram_addr_t *ram_addr)
{
RAMBlock *block;
@@ -1431,19 +1433,6 @@ found:
return 0;
}
-/* Some of the softmmu routines need to translate from a host pointer
- (typically a TLB entry) back to a ram offset. */
-ram_addr_t qemu_ram_addr_from_host_nofail(void *ptr)
-{
- ram_addr_t ram_addr;
-
- if (qemu_ram_addr_from_host(ptr, &ram_addr)) {
- fprintf(stderr, "Bad ram pointer %p\n", ptr);
- abort();
- }
- return ram_addr;
-}
-
static void notdirty_mem_write(void *opaque, hwaddr ram_addr,
uint64_t val, unsigned size)
{
@@ -2160,7 +2149,8 @@ void address_space_unmap(AddressSpace *as, void *buffer,
hwaddr len,
{
if (buffer != bounce.buffer) {
if (is_write) {
- ram_addr_t addr1 = qemu_ram_addr_from_host_nofail(buffer);
+ ram_addr_t addr1;
+ qemu_ram_addr_from_host(buffer, &addr1);
while (access_len) {
unsigned l;
l = TARGET_PAGE_SIZE;
diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h
index e061e21..8063ba2 100644
--- a/include/exec/cpu-common.h
+++ b/include/exec/cpu-common.h
@@ -51,7 +51,6 @@ typedef uint32_t CPUReadMemoryFunc(void *opaque, hwaddr addr);
void qemu_ram_remap(ram_addr_t addr, ram_addr_t length);
/* This should not be used by devices. */
int qemu_ram_addr_from_host(void *ptr, ram_addr_t *ram_addr);
-ram_addr_t qemu_ram_addr_from_host_nofail(void *ptr);
void qemu_ram_set_idstr(ram_addr_t addr, const char *name, DeviceState *dev);
void cpu_physical_memory_rw(hwaddr addr, uint8_t *buf,
--
1.8.1.4
- [Qemu-devel] [PATCH 00/11] Memory patches, part 4: region ownership, Paolo Bonzini, 2013/06/25
- [Qemu-devel] [PATCH 02/11] memory: destroy phys_sections one by one, Paolo Bonzini, 2013/06/25
- [Qemu-devel] [PATCH 03/11] exec: simplify destruction of the phys map, Paolo Bonzini, 2013/06/25
- [Qemu-devel] [PATCH 05/11] memory: add ref/unref, Paolo Bonzini, 2013/06/25
- [Qemu-devel] [PATCH 04/11] memory: add getter for owner, Paolo Bonzini, 2013/06/25
- [Qemu-devel] [PATCH 06/11] memory: add ref/unref calls, Paolo Bonzini, 2013/06/25
- [Qemu-devel] [PATCH 07/11] exec: add a reference to the region returned by address_space_translate, Paolo Bonzini, 2013/06/25
- [Qemu-devel] [PATCH 08/11] exec: check MRU in qemu_ram_addr_from_host, Paolo Bonzini, 2013/06/25
- [Qemu-devel] [PATCH 09/11] exec: move qemu_ram_addr_from_host_nofail to cputlb.c,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 11/11] memory: ref/unref memory across address_space_map/unmap, Paolo Bonzini, 2013/06/25
- [Qemu-devel] [PATCH 10/11] memory: return MemoryRegion from qemu_ram_addr_from_host, Paolo Bonzini, 2013/06/25
- [Qemu-devel] [PATCH 01/11] memory: add owner argument to initialization functions, Paolo Bonzini, 2013/06/25
- Re: [Qemu-devel] [PATCH 00/11] Memory patches, part 4: region ownership, Jan Kiszka, 2013/06/28