diff options
author | Avi Kivity <avi@redhat.com> | 2009-04-23 15:13:48 +0300 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2009-04-23 15:16:08 +0300 |
commit | 02d4417f7518ba3ab1b1f1cd456a9986c227dd00 (patch) | |
tree | 675831620cf9520f231ea4eb5c6b3ae1189106fa /kvm.h | |
parent | kvm: libkvm: Compile with correct kernel include directory (diff) | |
parent | xen: add -vga xenfb option, configure xenfb (Gerd Hoffmann) (diff) | |
download | qemu-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 'kvm.h')
-rw-r--r-- | kvm.h | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -42,10 +42,11 @@ void kvm_set_phys_mem(target_phys_addr_t start_addr, ram_addr_t size, ram_addr_t phys_offset); -void kvm_physical_sync_dirty_bitmap(target_phys_addr_t start_addr, target_phys_addr_t end_addr); +void kvm_physical_sync_dirty_bitmap(target_phys_addr_t start_addr, + target_phys_addr_t end_addr); -int kvm_log_start(target_phys_addr_t phys_addr, target_phys_addr_t len); -int kvm_log_stop(target_phys_addr_t phys_addr, target_phys_addr_t len); +int kvm_log_start(target_phys_addr_t phys_addr, ram_addr_t size); +int kvm_log_stop(target_phys_addr_t phys_addr, ram_addr_t size); int kvm_has_sync_mmu(void); |