[Qemu-devel] [PATCH for-3.0 0/4] block: revert removal of deprecated options

[Cornelia Huck <cohuck@redhat.com>]

Several -drive options had been marked as deprecated for two releases
and had therefore been removed; unfortunately, libvirt still used at
least two of them (serial number and disk geometry) and the patch
switching away from it is not yet in any released libvirt version.

As agreed, let's revert the removal patches for 3.0; with 3.1, the then
released libvirt versions will be fine. While nobody complained about
the 'addr' option, it is reinstated again as well, but purely to make
all the reverts apply cleanly.

Cornelia Huck (4):
  Revert "block: Remove dead deprecation warning code"
  Revert "block: Remove deprecated -drive option serial"
  Revert "block: Remove deprecated -drive option addr"
  Revert "block: Remove deprecated -drive geometry options"

 block/block-backend.c     |   1 +
 blockdev.c                | 110 ++++++++++++++++++++++++++++++++++++++++++++++
 device-hotplug.c          |   4 ++
 hmp-commands.hx           |   1 +
 hw/block/block.c          |  27 ++++++++++++
 hw/block/nvme.c           |   1 +
 hw/block/virtio-blk.c     |   1 +
 hw/ide/qdev.c             |   1 +
 hw/scsi/scsi-disk.c       |   1 +
 hw/usb/dev-storage.c      |   1 +
 include/hw/block/block.h  |   1 +
 include/sysemu/blockdev.h |   3 ++
 qemu-doc.texi             |  15 +++++++
 qemu-options.hx           |  14 +++++-
 tests/ahci-test.c         |   6 +--
 tests/hd-geo-test.c       |  37 +++++++++++++---
 tests/ide-test.c          |   8 ++--
 17 files changed, 217 insertions(+), 15 deletions(-)

-- 
2.14.4