From: Avi Kivity <[email protected]>
* 'master' of git://git.sv.gnu.org/qemu:
Convert machine registration to use module init functions
Eliminate --disable-gfx-check and make VNC default when SDL not available
Do not attempt to allocate sn_tab when there are no snapshots
Cast pointer arguments of get/setsockopt, send to void * to keep GCC
Conflicts:
hw/boards.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