diff options
author | Avi Kivity <avi@redhat.com> | 2009-05-25 17:28:56 +0300 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2009-05-25 17:28:56 +0300 |
commit | 3db8b916e35608d97d53820b79a935dc48f51b4e (patch) | |
tree | 5143abf4b5fa50020fff86924611a64a7cb990dd /kvm.h | |
parent | Refactor how display drivers are selected (diff) | |
parent | Remove unused variable (diff) | |
download | qemu-kvm-3db8b916e35608d97d53820b79a935dc48f51b4e.tar.gz qemu-kvm-3db8b916e35608d97d53820b79a935dc48f51b4e.tar.bz2 qemu-kvm-3db8b916e35608d97d53820b79a935dc48f51b4e.zip |
Merge branch 'master' of git://git.sv.gnu.org/qemu
* 'master' of git://git.sv.gnu.org/qemu: (41 commits)
Remove unused variable
ETRAX: Removed unused struct entry and fixed Windows build.
Add common BusState
Fix lance segfaults
Avoid errors when curl-config does not exist
bios: Use the correct mask to size the PCI option ROM BAR
x86: Add support for resume flag
net: Fix dump time stamps
Add HTTP protocol using curl v6
USB serial device support
serial: fix lost character after sysrq
usb-serial: implement break event.
slirp: Reassign same address to same DHCP client
kvm: x86: Save/restore KVM-specific CPU states
kvm: Rework VCPU reset
Introduce reset notifier order
kvm: Fix framebuffer dirty log sync
kvm: Add missing bits to support live migration
kvm: Rework dirty bitmap synchronization
kvm: Fix dirty log temporary buffer size
...
Conflicts:
Makefile
configure
exec.c
hw/ioapic.c
hw/pc.c
pc-bios/bios.bin
target-i386/machine.c
vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'kvm.h')
-rw-r--r-- | kvm.h | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -42,11 +42,12 @@ 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); +int 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, ram_addr_t size); int kvm_log_stop(target_phys_addr_t phys_addr, ram_addr_t size); +int kvm_set_migration_log(int enable); int kvm_has_sync_mmu(void); @@ -73,6 +74,9 @@ int kvm_vm_ioctl(KVMState *s, int type, ...); int kvm_vcpu_ioctl(CPUState *env, int type, ...); +int kvm_get_mp_state(CPUState *env); +int kvm_put_mp_state(CPUState *env); + /* Arch specific hooks */ int kvm_arch_post_run(CPUState *env, struct kvm_run *run); |