[PATCH 00/20] qemu: Remove one of last two instances of -drive if=none usage

[Michal Privoznik]

On 5/6/20 2:08 PM, Peter Krempa wrote:
> QEMU want's to deprecate -drive if=none. Stop clearing
> QEMU_CAPS_BLOCKDEV when SD cards are used. Please see 17/20 and 20/20
> for more explanation.
> 
> Obviously few cleanups snuck in as well.
> 
> Peter Krempa (20):
>    qemuxml2(argv|xml): Modernize 'blkdeviotune' tests
>    qemuxml2(argv|xml): Modernize 'discard'/'detect-zero' tests
>    qemuValidateDomainDeviceDefDisk: Separate disk frontend config
>      validation
>    qemu: validate: Validate blkdeviotune settings in the validator
>    qemu: Move disk config validation to
>      qemuValidateDomainDeviceDefDiskFrontend
>    qemuCheckDiskConfig: Remove and untangle callers
>    qemu: Rename qemuDiskBusNeedsDriveArg to qemuDiskBusIsSD
>    qemuBuildDiskCommandLine: Clarify logic around building -device for
>      disks
>    qemuBuildDriveStr: Refactor formatting of command line for 'sd' cards
>    qemuBuildDiskDeviceStr: Use XML disk bus type names in error message
>    qemu: command: Remove 'virDomainDiskQEMUBus' enum converters
>    qemuDomainSetBlockThreshold: Call qemuBlockNodeNamesDetect only
>      without blockdev
>    qemuDomainValidateStorageSource: Extract check for BLOCKDEV capability
>    qemuDomainValidateStorageSource: Allow masking out blockdev support
>    tests: Add tests for a virtio and sd disk in a single machine
>    qemu: Forbid 'cdrom' on 'sd' bus
>    qemu: Refuse blockjobs on disk bus='sd' with -blockdev
>    qemu: Handle cases when 'qomName' isn't present
>    qemu: Prepare for 'sd' card use together with blockdev
>    qemu: process: Don't clear QEMU_CAPS_BLOCKDEV when SD card is present
> 
>   src/qemu/qemu_backup.c                        |   3 +
>   src/qemu/qemu_checkpoint.c                    |   3 +
>   src/qemu/qemu_command.c                       | 404 ++----------------
>   src/qemu/qemu_command.h                       |   7 +-
>   src/qemu/qemu_domain.c                        |  65 ++-
>   src/qemu/qemu_domain.h                        |   7 +-
>   src/qemu/qemu_driver.c                        |  46 +-
>   src/qemu/qemu_hotplug.c                       |   7 +-
>   src/qemu/qemu_process.c                       |  17 +-
>   src/qemu/qemu_validate.c                      | 383 +++++++++++++++--
>   src/qemu/qemu_validate.h                      |   1 +
>   tests/qemublocktest.c                         |   7 +-
>   ... blkdeviotune-group-num.x86_64-4.1.0.args} |  26 +-
>   .../blkdeviotune-group-num.x86_64-latest.args |  50 +++
>   .../blkdeviotune-group-num.xml                |   5 +-
>   ...blkdeviotune-max-length.x86_64-4.1.0.args} |  26 +-
>   ...blkdeviotune-max-length.x86_64-latest.args |  50 +++
>   .../blkdeviotune-max-length.xml               |   5 +-
>   ...rgs => blkdeviotune-max.x86_64-4.1.0.args} |  26 +-
>   .../blkdeviotune-max.x86_64-latest.args       |  50 +++
>   tests/qemuxml2argvdata/blkdeviotune-max.xml   |   5 +-
>   .../disk-arm-virtio-sd.aarch64-4.0.0.args     |  39 ++
>   .../disk-arm-virtio-sd.aarch64-latest.args    |  43 ++
>   tests/qemuxml2argvdata/disk-arm-virtio-sd.xml |  36 ++
>   .../disk-cdrom-bus-other.x86_64-latest.args   |  13 +-
>   .../qemuxml2argvdata/disk-cdrom-bus-other.xml |  11 -
>   .../disk-detect-zeroes.x86_64-2.12.0.args     |   1 +
>   tests/qemuxml2argvdata/disk-detect-zeroes.xml |   5 +-
>   ...rd.args => disk-discard.x86_64-4.1.0.args} |  22 +-
>   .../disk-discard.x86_64-latest.args           |  46 ++
>   tests/qemuxml2argvtest.c                      |  26 +-
>   ... blkdeviotune-group-num.x86_64-latest.xml} |   0
>   ...blkdeviotune-max-length.x86_64-latest.xml} |   0
>   ...xml => blkdeviotune-max.x86_64-latest.xml} |   0
>   ...une.xml => blkdeviotune.x86_64-latest.xml} |   7 +-
>   .../disk-arm-virtio-sd.aarch64-latest.xml     |  41 ++
>   .../disk-cdrom-bus-other.xml                  |  11 -
>   ...l => disk-detect-zeroes.x86_64-latest.xml} |   0
>   ...ard.xml => disk-discard.x86_64-latest.xml} |   7 +-
>   tests/qemuxml2xmltest.c                       |  14 +-
>   40 files changed, 958 insertions(+), 557 deletions(-)
>   rename tests/qemuxml2argvdata/{blkdeviotune-group-num.args => blkdeviotune-group-num.x86_64-4.1.0.args} (69%)
>   create mode 100644 tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.args
>   rename tests/qemuxml2argvdata/{blkdeviotune-max-length.args => blkdeviotune-max-length.x86_64-4.1.0.args} (71%)
>   create mode 100644 tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.args
>   rename tests/qemuxml2argvdata/{blkdeviotune-max.args => blkdeviotune-max.x86_64-4.1.0.args} (67%)
>   create mode 100644 tests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args
>   create mode 100644 tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-4.0.0.args
>   create mode 100644 tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args
>   create mode 100644 tests/qemuxml2argvdata/disk-arm-virtio-sd.xml
>   rename tests/qemuxml2argvdata/{disk-discard.args => disk-discard.x86_64-4.1.0.args} (59%)
>   create mode 100644 tests/qemuxml2argvdata/disk-discard.x86_64-latest.args
>   rename tests/qemuxml2xmloutdata/{blkdeviotune-group-num.xml => blkdeviotune-group-num.x86_64-latest.xml} (100%)
>   rename tests/qemuxml2xmloutdata/{blkdeviotune-max-length.xml => blkdeviotune-max-length.x86_64-latest.xml} (100%)
>   rename tests/qemuxml2xmloutdata/{blkdeviotune-max.xml => blkdeviotune-max.x86_64-latest.xml} (100%)
>   rename tests/qemuxml2xmloutdata/{blkdeviotune.xml => blkdeviotune.x86_64-latest.xml} (88%)
>   create mode 100644 tests/qemuxml2xmloutdata/disk-arm-virtio-sd.aarch64-latest.xml
>   rename tests/qemuxml2xmloutdata/{disk-detect-zeroes.xml => disk-detect-zeroes.x86_64-latest.xml} (100%)
>   rename tests/qemuxml2xmloutdata/{disk-discard.xml => disk-discard.x86_64-latest.xml} (87%)
> 

Reviewed-by: Michal Privoznik <mprivozn at redhat.com>

Michal