Applies on top of "[PATCH v3 00/29] Disk geometry cleanup". Markus Armbruster (4): hw/block-common: Move BlockConf & friends from block.h hw/block-common: Factor out fall back to legacy -drive serial=... blockdev: Don't limit DriveInfo serial to 20 characters hw/block-common: Factor out fall back to legacy -drive cyls=...
block.h | 45 ----------------------------------- blockdev.c | 4 +-- blockdev.h | 4 +-- hw/Makefile.objs | 2 +- hw/block-common.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++ hw/block-common.h | 50 +++++++++++++++++++++++++++++++++++++++ hw/ide/core.c | 30 +++++++++++----------- hw/ide/internal.h | 1 + hw/ide/qdev.c | 31 +++--------------------- hw/scsi-disk.c | 37 ++-------------------------- hw/scsi.h | 1 + hw/usb.h | 1 - hw/usb/dev-storage.c | 10 +------ hw/virtio-blk.c | 37 ++-------------------------- hw/virtio-blk.h | 2 +- hw/virtio.h | 1 - 16 files changed, 147 insertions(+), 173 deletions(-) create mode 100644 hw/block-common.c -- 1.7.6.5
