summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2009-04-23 15:13:48 +0300
committerAvi Kivity <avi@redhat.com>2009-04-23 15:16:08 +0300
commit02d4417f7518ba3ab1b1f1cd456a9986c227dd00 (patch)
tree675831620cf9520f231ea4eb5c6b3ae1189106fa /cpu-all.h
parentkvm: libkvm: Compile with correct kernel include directory (diff)
parentxen: add -vga xenfb option, configure xenfb (Gerd Hoffmann) (diff)
downloadqemu-kvm-02d4417f7518ba3ab1b1f1cd456a9986c227dd00.tar.gz
qemu-kvm-02d4417f7518ba3ab1b1f1cd456a9986c227dd00.tar.bz2
qemu-kvm-02d4417f7518ba3ab1b1f1cd456a9986c227dd00.zip
Merge branch 'master' of git://git.sv.gnu.org/qemu into master
* commit 'master': (180 commits) xen: add -vga xenfb option, configure xenfb (Gerd Hoffmann) simplify vga selection (Gerd Hoffmann) xen: pv domain builder. (Gerd Hoffmann) xen: blk & nic configuration via cmd line. (Gerd Hoffmann) xen: add net backend driver. (Gerd Hoffmann) xen: add block device backend driver. (Gerd Hoffmann) xen: add framebuffer backend driver (Gerd Hoffmann) xen: add console backend driver. (Gerd Hoffmann) xen: backend driver core (Gerd Hoffmann) xen: groundwork for xen support (Gerd Hoffmann) update .gitignore: add qemu-io (Gerd Hoffmann) qcow2: Add plausibility check for L1/L2 entries (Kevin Wolf) qcow2: Refcount checking code cleanup (Kevin Wolf) Introduce qemu-img check subcommand (Kevin Wolf) Introduce bdrv_check (Kevin Wolf) qcow2: Fix warnings in check_refcount() (Kevin Wolf) sending NUMA topology to BIOS (Andre Przywara) add info numa command to monitor (Andre Przywara) added -numa cmdline parameter parser (Andre Przywara) Safety net for the cases where disassembler/translator disagree over instruction decoding ... Conflicts: Makefile Makefile.target configure cpu-all.h gdbstub.c hw/apic.c hw/cirrus_vga.c hw/eepro100.c hw/pc.c hw/pcnet.c hw/rtl8139.c hw/vga.c net.c pc-bios/bios.bin sysemu.h vl.c Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'cpu-all.h')
-rw-r--r--cpu-all.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/cpu-all.h b/cpu-all.h
index 3c91d07a6..e570e03b9 100644
--- a/cpu-all.h
+++ b/cpu-all.h
@@ -846,7 +846,7 @@ int cpu_inl(CPUState *env, int addr);
#endif
/* address in the RAM (different from a physical address) */
-#ifdef USE_KQEMU
+#ifdef CONFIG_KQEMU
typedef uint32_t ram_addr_t;
#else
typedef unsigned long ram_addr_t;
@@ -854,11 +854,10 @@ typedef unsigned long ram_addr_t;
/* memory API */
-extern ram_addr_t phys_ram_size;
extern int phys_ram_fd;
-extern uint8_t *phys_ram_base;
extern uint8_t *phys_ram_dirty;
extern ram_addr_t ram_size;
+extern ram_addr_t last_ram_offset;
extern uint8_t *bios_mem;
/* physical memory access */
@@ -907,6 +906,11 @@ static inline void cpu_register_physical_memory(target_phys_addr_t start_addr,
ram_addr_t cpu_get_physical_page_desc(target_phys_addr_t addr);
ram_addr_t qemu_ram_alloc(ram_addr_t);
void qemu_ram_free(ram_addr_t addr);
+/* This should only be used for ram local to a device. */
+void *qemu_get_ram_ptr(ram_addr_t addr);
+/* This should not be used by devices. */
+ram_addr_t qemu_ram_addr_from_host(void *ptr);
+
int cpu_register_io_memory(int io_index,
CPUReadMemoryFunc **mem_read,
CPUWriteMemoryFunc **mem_write,