diff options
| author |   Avi Kivity <avi@redhat.com> | 2008-12-15 18:14:37 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2008-12-15 18:17:52 +0200 |
| commit | 0fe025d5acad3313d8ba8ce267e6dbf995226de2 (patch) | |
| tree | cda8e541cfc754ff323ccae2447da126ac729ef0 /kvm.h | |
| parent | kvm: external module: add msr-index.h, now needed by kvm_host.h (diff) | |
| parent | target-ppc: add signed fields to ppc_avr_t. (diff) | |
| download | qemu-kvm-0fe025d5acad3313d8ba8ce267e6dbf995226de2.tar.gz qemu-kvm-0fe025d5acad3313d8ba8ce267e6dbf995226de2.tar.bz2 qemu-kvm-0fe025d5acad3313d8ba8ce267e6dbf995226de2.zip | |
Merge branch 'qemu-cvs'
Conflicts:
qemu/Makefile
qemu/Makefile.target
qemu/block-raw-posix.c
qemu/configure
qemu/cutils.c
qemu/dyngen.c
qemu/hw/cirrus_vga.c
qemu/hw/e1000.c
qemu/hw/pci.c
qemu/hw/vga.c
qemu/osdep.c
qemu/pc-bios/Makefile
qemu/qemu-common.h
qemu/target-ppc/helper.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'kvm.h')
| -rw-r--r-- | kvm.h | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -47,6 +47,9 @@ int kvm_log_stop(target_phys_addr_t phys_addr, target_phys_addr_t len); int kvm_has_sync_mmu(void); +int kvm_coalesce_mmio_region(target_phys_addr_t start, ram_addr_t size); +int kvm_uncoalesce_mmio_region(target_phys_addr_t start, ram_addr_t size); + /* internal API */ struct KVMState; |