Merge commit '
9538749118d47dfcd3ed45804736027d87ec054e' into upstream-merge
* commit '
9538749118d47dfcd3ed45804736027d87ec054e': (24 commits)
Add boot menu control via command line switch
Add boot-once support
Add qemu_unregister_reset
Rework reset handler management
Move boot_set callback backend
Rework -boot option
Add a pc-0-10 machine type for compatibility with 0.10.x
Change default PCI class of virtio-console to PCI_CLASS_SERIAL_OTHER
Change default PCI class of virtio-blk to PCI_CLASS_STORAGE_SCSI
Sparc32: convert sparc32_dma to qdev
Avoid SIGSEGV when dumping cpu state without enabled logging
Convert fdc to qdev
Sparc32: convert slavio timers to qdev
Sparc32/PPC: convert escc to qdev
Sparc32: convert slavio_misc to qdev
Sparc32: convert idreg to qdev
target-ppc: enable PPC_MFTB for 44x
ppc tcg: fix wrong bit/mask of wrteei
gdb-xml: fix hacks in powerpc register numbering
target-ppc: fix evmergelo and evmergelohi
...
Conflicts:
sysemu.h
Signed-off-by: Avi Kivity <avi@redhat.com>