Merge commit '
666daa68234b5b1758652633cab07d5ca6046a5b' into upstream-merge
* commit '
666daa68234b5b1758652633cab07d5ca6046a5b':
blockdev: Collect block device code in new blockdev.c
qdev: Move declaration of qdev_init_bdrv() into qdev.h
blockdev: Hide QEMUMachine from drive_init()
block: call the snapshot handlers of the protocol drivers
close all the block drivers before the qemu process exits
block: Assume raw for drives without media
Fix error message in drive_init
scsi: Fix info qtree for scsi-disk.ver
scsi: Turn drive serial into a qdev property scsi-disk.serial
ide: Fix info qtree for ide-drive.ver
ide: Turn drive serial into a qdev property ide-drive.serial
qdev: Don't leak string property value on hot unplug
qdev: New qdev_prop_set_string()
ide: Split non-qdev code off ide_init2()
ide: Change ide_init_drive() to require valid dinfo argument
ide: Split ide_init1() off ide_init2()
ide: Remove redundant IDEState member conf
ide: Remove useless IDEDeviceInfo members unit, drive
usb: Remove unused usb_device_add() parameter is_hotplug
Conflicts:
hw/pc.c
sysemu.h
vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>