From: Avi Kivity <[email protected]>
* 'master' of git://git.sv.gnu.org/qemu: (37 commits)
Incorporate changes from v2 of Gleb's RTC reset patch
etrax: Don't pass CPUState to peripherals.
Fix warning in qemu-nbd.c
raw-posix: cleanup ioctl methods
block: add bdrv_probe_device method
raw-posix: split hdev drivers
raw-posix: add a raw_open_common helper
raw-posix: always store open flags
fix qemu_aio_flush
Add rtc reset function.
migrate_fd_close: delete associated io-handler before closing the fd
exec-migration: handle EINTR in popen_get_buffer()
Fix prototype of function zfree.
Add static to local machine declaration.
Don't use cpu_index as apic_id.
Apic creation should not depend on pci
Add -no-virtio-balloon command-line option
Fix SDL include path.
Really enable -Werror
Avoid collision with system NGROUPS definition
...
Conflicts:
hw/apic.c
hw/pc.c
hw/pc.h
Signed-off-by: Avi Kivity <[email protected]>
--
To unsubscribe from this list: send the line "unsubscribe kvm-commits" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
