summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2009-05-06 11:24:39 +0300
committerAvi Kivity <avi@redhat.com>2009-05-06 11:26:17 +0300
commit8f1c89f7f016e3d4d6a694978a047a06069230bb (patch)
treee7066eb1a2a40dfc1aaa9dd1ce0b6bf8893e1314 /cpu-all.h
parentvirtio-net: Make save/load format independent of build options (diff)
parentETRAX: Simplify serport control logic. (diff)
downloadqemu-kvm-8f1c89f7f016e3d4d6a694978a047a06069230bb.tar.gz
qemu-kvm-8f1c89f7f016e3d4d6a694978a047a06069230bb.tar.bz2
qemu-kvm-8f1c89f7f016e3d4d6a694978a047a06069230bb.zip
Merge branch 'master' of git://git.sv.gnu.org/qemu
* 'master' of git://git.sv.gnu.org/qemu: (84 commits) ETRAX: Simplify serport control logic. ETRAX: Drop _t for the serial type. ETRAX: Use NULL for subwidth serport reg accesses. ETRAX: Drop the _t for the internal PIC type. ETRAX: Simplify the interrupt controller model. ETRAX: Simplify interrupt signaling. Fix compiler warnings in nwfpe code. target-mips: proper sign extension for 'SUBU rd, zero, rt' target-mips: fix comments about SUB/DSUB qemu-options.hx: fix description of cache=none suboption Suppress type mismatch warnings in VDE code. minor fix of pci_register_bus() use PCI_HEADER_TYPE. Fix typos in comments in exec.c Optimize cmp x, 0 case Reindent Handle NULL bdrv. Improve instruction name comments for easier searching Clarify: dmmuregs[1] is not a typo Optimize operations with immediate parameters ... Conflicts: Makefile.target hw/vga.c qemu-common.h vl.c (iothread merge by Marcelo) Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'cpu-all.h')
-rw-r--r--cpu-all.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpu-all.h b/cpu-all.h
index e570e03b9..d39b90f84 100644
--- a/cpu-all.h
+++ b/cpu-all.h
@@ -775,6 +775,8 @@ void cpu_reset_interrupt(CPUState *env, int mask);
void cpu_exit(CPUState *s);
+int qemu_cpu_has_work(CPUState *env);
+
/* Breakpoint/watchpoint flags */
#define BP_MEM_READ 0x01
#define BP_MEM_WRITE 0x02
@@ -916,8 +918,6 @@ int cpu_register_io_memory(int io_index,
CPUWriteMemoryFunc **mem_write,
void *opaque);
void cpu_unregister_io_memory(int table_address);
-CPUWriteMemoryFunc **cpu_get_io_memory_write(int io_index);
-CPUReadMemoryFunc **cpu_get_io_memory_read(int io_index);
void cpu_physical_memory_rw(target_phys_addr_t addr, uint8_t *buf,
int len, int is_write);