diff options
author | 2008-12-23 18:52:56 +0200 | |
---|---|---|
committer | 2008-12-23 18:52:56 +0200 | |
commit | 1f073a17638ec332c86f0d065caebf9c7555686d (patch) | |
tree | 6853b18e1c4df4ec851d606426b4b56cf78ffd88 /kvm.h | |
parent | Regenerate vgabios after update from upstream (diff) | |
parent | Implement tick interrupt disable bits (diff) | |
download | qemu-kvm-1f073a17638ec332c86f0d065caebf9c7555686d.tar.gz qemu-kvm-1f073a17638ec332c86f0d065caebf9c7555686d.tar.bz2 qemu-kvm-1f073a17638ec332c86f0d065caebf9c7555686d.zip |
Merge branch 'qemu-cvs'
Conflicts:
qemu/Makefile
qemu/Makefile.target
qemu/configure
qemu/hw/pc.c
qemu/hw/pc.h
qemu/hw/pci.c
qemu/hw/virtio-net.c
qemu/net.c
qemu/net.h
qemu/pc-bios/bios.bin
qemu/pc-bios/vgabios-cirrus.bin
qemu/pc-bios/vgabios.bin
qemu/target-ppc/helper.c
qemu/vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'kvm.h')
-rw-r--r-- | kvm.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -33,6 +33,7 @@ struct kvm_run; int kvm_init(int smp_cpus); int kvm_init_vcpu(CPUState *env); +int kvm_sync_vcpus(void); int kvm_cpu_exec(CPUState *env); |