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>

1 files changed, 5 insertions, 0 deletions

diff --git a/kvm.h b/kvm.h
index 86d67bc94..e398d68cf 100644
--- a/kvm.h
+++ b/kvm.h
@@ -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)