Am 28.01.2011 11:21, schrieb Markus Armbruster: > Kevin found a bug in my recent "[PATCH 3+5/5] -drive/drive_add fixes". > This is a rework of those two patches, plus a fix for the -drive > if=scsi,index=N regression, plus the odd bonus fix found on the way. > > v2: fix for the -drive if=scsi,index=N regression. PATCH 4 fixed up > slightly, PATCH 5 inserted, rest trivially rediffed. > > Markus Armbruster (11): > scsi hotplug: Set DriveInfo member bus correctly > blockdev: New drive_get_next(), replacing qdev_init_bdrv() > blockdev: Move BlockInterfaceType from qemu-common.h to blockdev.h > blockdev: Put BlockInterfaceType names and max_devs in tables > blockdev: Fix regression in -drive if=scsi,index=N > blockdev: Make drive_add() take explicit type, index parameters > blockdev: Replace drive_add()'s fmt, ... by optstr parameter > blockdev: Factor drive_index_to_{bus,unit}_id out of drive_init() > blockdev: New drive_get_by_index() > blockdev: Reject multiple definitions for the same drive > blockdev: Fix drive_add for drives without media > > blockdev.c | 143 > +++++++++++++++++++++++++++++++-------------------- > blockdev.h | 18 +++++-- > hw/device-hotplug.c | 5 +- > hw/ide.h | 2 + > hw/ide/ahci.c | 1 - > hw/pci-hotplug.c | 1 + > hw/pl181.c | 7 ++- > hw/qdev.c | 15 ----- > hw/qdev.h | 2 - > hw/scsi.h | 3 +- > hw/ssi-sd.c | 7 ++- > hw/usb-msd.c | 3 +- > qemu-common.h | 6 -- > savevm.c | 1 - > vl.c | 94 +++++++++++++++++++-------------- > 15 files changed, 171 insertions(+), 137 deletions(-)
Thanks, applied all to the block branch. Kevin