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>
15 files changed: