diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2012-11-03 12:55:05 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2012-11-03 12:55:05 +0000 |
| commit | ef84755ebb38b4f5629b24440bb00f1ef5287707 (patch) | |
| tree | c2d74584b5f8c85c4c61ae650e628e08403b69ec /cpu-common.h | |
| parent | b76f0d8c2e3eac94bc7fd90a510cb7426b2a2699 (diff) | |
| parent | 0d3cf3b6ff469bba95ae235021a3be232af4068d (diff) | |
Merge branch 'trivial-patches' of git://github.com/stefanha/qemu
* 'trivial-patches' of git://github.com/stefanha/qemu:
pc: Drop redundant test for ROM memory region
exec: make some functions static
target-ppc: make some functions static
ppc: add missing static
vnc: add missing static
vl.c: add missing static
target-sparc: make do_unaligned_access static
m68k: Return semihosting errno values correctly
cadence_uart: More debug information
Conflicts:
target-m68k/m68k-semi.c
Diffstat (limited to 'cpu-common.h')
| -rw-r--r-- | cpu-common.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/cpu-common.h b/cpu-common.h index 5f9308933c..d2fbafac9c 100644 --- a/cpu-common.h +++ b/cpu-common.h @@ -39,10 +39,6 @@ typedef uint32_t CPUReadMemoryFunc(void *opaque, hwaddr addr); void qemu_ram_remap(ram_addr_t addr, ram_addr_t length); /* This should only be used for ram local to a device. */ void *qemu_get_ram_ptr(ram_addr_t addr); -void *qemu_ram_ptr_length(ram_addr_t addr, ram_addr_t *size); -/* Same but slower, to use for migration, where the order of - * RAMBlocks must not change. */ -void *qemu_safe_ram_ptr(ram_addr_t addr); void qemu_put_ram_ptr(void *addr); /* This should not be used by devices. */ int qemu_ram_addr_from_host(void *ptr, ram_addr_t *ram_addr); @@ -67,7 +63,6 @@ void *cpu_physical_memory_map(hwaddr addr, void cpu_physical_memory_unmap(void *buffer, hwaddr len, int is_write, hwaddr access_len); void *cpu_register_map_client(void *opaque, void (*callback)(void *opaque)); -void cpu_unregister_map_client(void *cookie); bool cpu_physical_memory_is_io(hwaddr phys_addr); |