diff options
author | 2009-05-09 12:18:03 +0300 | |
---|---|---|
committer | 2009-05-09 12:24:23 +0300 | |
commit | 1b571cb79d51523af3c74b990de28eb892106f16 (patch) | |
tree | dca628067cc57ac79995c0f8af7ad169bf1bdecb /kvm.h | |
parent | virtio-net: Refuse loading if the source requires vnet header and the host do... (diff) | |
parent | Fix in file qemu-sockets.c (diff) | |
download | qemu-kvm-1b571cb79d51523af3c74b990de28eb892106f16.tar.gz qemu-kvm-1b571cb79d51523af3c74b990de28eb892106f16.tar.bz2 qemu-kvm-1b571cb79d51523af3c74b990de28eb892106f16.zip |
Merge branch 'master' of git://git.sv.gnu.org/qemu into master
* 'master' of git://git.sv.gnu.org/qemu: (23 commits)
Fix in file qemu-sockets.c
vga: Replace VGA_COMMON with a structure
Improve block range checks
Remove noisy printf when KVM masks CPU features
fix asynchronous ioctls
kvm: Trim cpu features not supported by kvm
Fix x86 feature modifications for features that set multiple bits
Make x86 cpuid feature names available in file scope
kvm: Add support for querying supported cpu features
Introduce kvm_check_extension to check if KVM extensions are supported
e1000: Do not reinit pci config space to 0
AIO deletion race fix
reset state for load_linux
register reset handler for option_roms
Fix cluster freeing in qcow2
Enable power button even generation.
Drop CONFIG_GDBSTUB
Remove superfluous #includes.
Use target_phys_addr_t, not target_ulong.
Replace cpu_abort with hw_error
...
Conflicts:
hw/cirrus_vga.c
pc-bios/bios.bin
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'kvm.h')
-rw-r--r-- | kvm.h | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -120,6 +120,11 @@ void kvm_arch_remove_all_hw_breakpoints(void); void kvm_arch_update_guest_debug(CPUState *env, struct kvm_guest_debug *dbg); +int kvm_check_extension(KVMState *s, unsigned int extension); + +uint32_t kvm_arch_get_supported_cpuid(CPUState *env, uint32_t function, + int reg); + /* generic hooks - to be moved/refactored once there are more users */ static inline void cpu_synchronize_state(CPUState *env, int modified) |