Based on Kevin's block branch[*], commit f4e0fa33. Code motion like this is a conflict magnet. Speedy merge would be nice.
[*] http://repo.or.cz/w/qemu/kevin.git/shortlog/refs/heads/block Markus Armbruster (3): blockdev: Hide QEMUMachine from drive_init() qdev: Move declaration of qdev_init_bdrv() into qdev.h blockdev: Collect block device code in new blockdev.c Makefile.objs | 2 +- blockdev.c | 591 ++++++++++++++++++++++++++++++++++++++++++++++++++ blockdev.h | 62 ++++++ hw/acpi_piix4.c | 1 + hw/apb_pci.c | 1 + hw/device-hotplug.c | 4 +- hw/fdc.c | 1 - hw/fdc.h | 2 +- hw/ide/core.c | 2 - hw/ide/qdev.c | 1 - hw/lan9118.c | 1 + hw/nand.c | 3 +- hw/omap2.c | 2 + hw/onenand.c | 3 +- hw/parallel.c | 1 + hw/pc.c | 1 + hw/pc_piix.c | 1 + hw/pci-hotplug.c | 2 - hw/pcmcia.h | 2 +- hw/pl181.c | 1 - hw/qdev-properties.c | 1 - hw/qdev.h | 4 +- hw/scsi-bus.c | 1 - hw/scsi-disk.c | 2 +- hw/scsi-generic.c | 1 - hw/serial.c | 1 + hw/ssi-sd.c | 1 - hw/usb-hid.c | 1 + hw/usb-msd.c | 4 +- hw/virtio-blk.c | 2 - hw/virtio-pci.c | 1 - monitor.c | 104 +--------- qemu-char.c | 1 - savevm.c | 2 +- sysemu.h | 50 ----- vl.c | 491 +----------------------------------------- 36 files changed, 681 insertions(+), 670 deletions(-) create mode 100644 blockdev.c create mode 100644 blockdev.h
