[libvirt] [PATCH v2 22/32] qemu: caps: Always assume presence of 'scsi-hd' and 'scsi-cd' device

The split of scsi-disk into the two separate devices was introduced by qemu commit b443ae67 released in qemu v0.15. All changes to test files are not really related to disk testing thanks to previous refactors. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 19 ++++++------------- .../caps_1.5.3.x86_64.xml | 1 - .../caps_1.6.0.x86_64.xml | 1 - .../caps_1.7.0.x86_64.xml | 1 - .../caps_2.1.1.x86_64.xml | 1 - .../caps_2.10.0.aarch64.xml | 1 - .../caps_2.10.0.ppc64.xml | 1 - .../caps_2.10.0.s390x.xml | 1 - .../caps_2.10.0.x86_64.xml | 1 - .../caps_2.11.0.s390x.xml | 1 - .../caps_2.11.0.x86_64.xml | 1 - .../caps_2.12.0.aarch64.xml | 1 - .../caps_2.12.0.ppc64.xml | 1 - .../caps_2.12.0.s390x.xml | 1 - .../caps_2.12.0.x86_64.xml | 1 - .../caps_2.4.0.x86_64.xml | 1 - .../caps_2.5.0.x86_64.xml | 1 - .../caps_2.6.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 - .../caps_2.6.0.x86_64.xml | 1 - .../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 - .../caps_2.7.0.x86_64.xml | 1 - .../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 - .../caps_2.8.0.x86_64.xml | 1 - .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 - .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 - .../caps_2.9.0.x86_64.xml | 1 - .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 - .../caps_3.0.0.riscv32.xml | 1 - .../caps_3.0.0.riscv64.xml | 1 - .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 - .../caps_3.0.0.x86_64.xml | 1 - .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 - .../caps_3.1.0.x86_64.xml | 1 - .../caps_4.0.0.riscv32.xml | 1 - .../caps_4.0.0.riscv64.xml | 1 - .../caps_4.0.0.x86_64.xml | 1 - .../aarch64-virtio-pci-manual-addresses.args | 4 ++-- tests/qemuxml2argvdata/bios-nvram-secure.args | 4 ++-- tests/qemuxml2argvdata/machine-smm-opt.args | 4 ++-- .../multifunction-pci-device.args | 2 +- .../pseries-vio-user-assigned.args | 4 ++-- tests/qemuxml2argvdata/pseries-vio.args | 4 ++-- tests/qemuxml2argvtest.c | 11 ++++------- tests/qemuxml2xmltest.c | 6 ++---- 47 files changed, 24 insertions(+), 73 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 3d7d05cd99..7033615eb5 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1023,7 +1023,6 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "qxl", QEMU_CAPS_DEVICE_QXL }, { "sga", QEMU_CAPS_SGA }, { "scsi-block", QEMU_CAPS_SCSI_BLOCK }, - { "scsi-cd", QEMU_CAPS_SCSI_CD }, { "ide-cd", QEMU_CAPS_IDE_CD }, { "VGA", QEMU_CAPS_DEVICE_VGA }, { "cirrus-vga", QEMU_CAPS_DEVICE_CIRRUS_VGA }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 6d5ed8a3cc..f9810bee92 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -174,7 +174,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ /* 90 */ X_QEMU_CAPS_BLOCKJOB_SYNC, /* old block_job_cancel, block_stream */ QEMU_CAPS_BLOCKJOB_ASYNC, /* new block-job-cancel, block-stream */ - QEMU_CAPS_SCSI_CD, /* -device scsi-cd */ + X_QEMU_CAPS_SCSI_CD, /* -device scsi-cd */ QEMU_CAPS_IDE_CD, /* -device ide-cd */ X_QEMU_CAPS_NO_USER_CONFIG, /* -no-user-config */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 374836a35e..d9f64b8097 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1762,13 +1762,10 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, * legacy -drive is used. In modern qemu the 'ide-cd' or 'scsi-cd' are used. * virtio and other just ignore the attribute anyways */ if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) { - if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI) { - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_CD)) - virBufferAddLit(&opt, ",media=cdrom"); - } else if (disk->bus == VIR_DOMAIN_DISK_BUS_IDE) { + if (disk->bus == VIR_DOMAIN_DISK_BUS_IDE) { if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_IDE_CD)) virBufferAddLit(&opt, ",media=cdrom"); - } else { + } else if (disk->bus != VIR_DOMAIN_DISK_BUS_SCSI) { virBufferAddLit(&opt, ",media=cdrom"); } } @@ -1995,14 +1992,10 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) { virBufferAddLit(&opt, "scsi-block"); } else { - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_CD)) { - if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) - virBufferAddLit(&opt, "scsi-cd"); - else - virBufferAddLit(&opt, "scsi-hd"); - } else { - virBufferAddLit(&opt, "scsi-disk"); - } + if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) + virBufferAddLit(&opt, "scsi-cd"); + else + virBufferAddLit(&opt, "scsi-hd"); } if (!(contAlias = virDomainControllerAliasFind(def, VIR_DOMAIN_CONTROLLER_TYPE_SCSI, diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index 3c9a474b5b..848bc44625 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index 528af43a6d..7bc2e6a204 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index ddc06959ca..3fd785ca2e 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index 7c65353ba5..3a72b58427 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index 9f6676a2b8..a351802e27 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -23,7 +23,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index d4cc446d0b..b470336ac0 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -22,7 +22,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index 9c88b919a4..7347eff579 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -13,7 +13,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='dump-guest-memory'/> <flag name='balloon-event'/> <flag name='virtio-scsi-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 2941743f94..f92c84d5a8 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index 60d902f1ac..d26506bc62 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -13,7 +13,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='dump-guest-memory'/> <flag name='balloon-event'/> <flag name='virtio-scsi-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml index e1584f99d4..cb4d2381d0 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index f58979716d..16c4acfc45 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -23,7 +23,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index e58df048c4..575ed88371 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -22,7 +22,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index 60385cc505..154fb44532 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -13,7 +13,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='dump-guest-memory'/> <flag name='balloon-event'/> <flag name='virtio-scsi-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 3d12aba2e8..7e6a8ea264 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index c95f34559b..1f69d1ee71 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index 240abd299c..bb30aec3e6 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 801a2e62ad..6f2b8e9a91 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -25,7 +25,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index 949f9305c3..2d9cd34e9f 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -22,7 +22,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index f5bca878be..43b9f022e4 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index a667aa7673..e50c83950f 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -13,7 +13,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='dump-guest-memory'/> <flag name='balloon-event'/> <flag name='virtio-scsi-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index 5d8ba4ee68..cf880a0a88 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index 00c3ff5133..6b975be02f 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -13,7 +13,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='dump-guest-memory'/> <flag name='balloon-event'/> <flag name='virtio-scsi-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 5a6e26cba1..acfcbd673e 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index 87f24e2e41..bdf69680ad 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -22,7 +22,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index e197848e4e..7101f155ff 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -13,7 +13,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='dump-guest-memory'/> <flag name='balloon-event'/> <flag name='virtio-scsi-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 871018364f..d2a0d1a8ff 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml index 971c0665be..1ef7a911fe 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -22,7 +22,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml index 1b5d8e6e12..3c2028323f 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml @@ -7,7 +7,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='dump-guest-memory'/> <flag name='balloon-event'/> <flag name='virtio-scsi-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml index 3c76f6355d..dc5a0fd42a 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml @@ -7,7 +7,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='dump-guest-memory'/> <flag name='balloon-event'/> <flag name='virtio-scsi-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml index bf889145a0..ecbdbdc716 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml @@ -14,7 +14,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='dump-guest-memory'/> <flag name='balloon-event'/> <flag name='virtio-scsi-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml index b787bd9acd..a8c17fd4b9 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml index d55eb5d981..37c7e3424f 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -22,7 +22,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml index db72e873c5..4f74ae70f4 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml index 15e447742d..dac5d9d07a 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml @@ -25,7 +25,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml index 066c892eaa..69f51f166a 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml @@ -25,7 +25,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml index b8da376b2c..205446ed0e 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> <flag name='ide-cd'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args index 3e7ab481af..c7218a50ed 100644 --- a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args +++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args @@ -30,8 +30,8 @@ path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ -device pci-bridge,chassis_nr=3,id=pci.3,bus=pci.1,addr=0x1 \ -device virtio-scsi-pci,id=scsi0,bus=pci.3,addr=0x1 \ -drive file=/aarch64.raw,format=raw,if=none,id=drive-scsi0-0-0-0 \ --device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,\ -drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,bootindex=1 \ +-device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\ +id=scsi0-0-0-0,bootindex=1 \ -netdev user,id=hostnet0 \ -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37,bus=pci.3,\ addr=0x2 \ diff --git a/tests/qemuxml2argvdata/bios-nvram-secure.args b/tests/qemuxml2argvdata/bios-nvram-secure.args index 9ae30a0708..6d1789aa05 100644 --- a/tests/qemuxml2argvdata/bios-nvram-secure.args +++ b/tests/qemuxml2argvdata/bios-nvram-secure.args @@ -29,6 +29,6 @@ server,nowait \ -device ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \ -device virtio-scsi-pci,id=scsi0,bus=pci.2,addr=0x1 \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-scsi0-0-0-0 \ --device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,\ -drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,bootindex=1 \ +-device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\ +id=scsi0-0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x2 diff --git a/tests/qemuxml2argvdata/machine-smm-opt.args b/tests/qemuxml2argvdata/machine-smm-opt.args index 25e7ab6372..e4dea21a7c 100644 --- a/tests/qemuxml2argvdata/machine-smm-opt.args +++ b/tests/qemuxml2argvdata/machine-smm-opt.args @@ -25,6 +25,6 @@ server,nowait \ -device ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \ -device virtio-scsi-pci,id=scsi0,bus=pci.2,addr=0x1 \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-scsi0-0-0-0 \ --device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,\ -drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,bootindex=1 \ +-device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\ +id=scsi0-0-0-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x2 diff --git a/tests/qemuxml2argvdata/multifunction-pci-device.args b/tests/qemuxml2argvdata/multifunction-pci-device.args index e314068699..94e89c411f 100644 --- a/tests/qemuxml2argvdata/multifunction-pci-device.args +++ b/tests/qemuxml2argvdata/multifunction-pci-device.args @@ -31,6 +31,6 @@ server,nowait \ -device lsi,id=scsi8,bus=pci.0,addr=0x4.0x7 \ -usb \ -drive file=/tmp/scsidisk.img,format=raw,if=none,id=drive-scsi0-0-0 \ --device scsi-disk,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0,\ +-device scsi-hd,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0,\ bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 diff --git a/tests/qemuxml2argvdata/pseries-vio-user-assigned.args b/tests/qemuxml2argvdata/pseries-vio-user-assigned.args index 5de2646e21..62b98363ef 100644 --- a/tests/qemuxml2argvdata/pseries-vio-user-assigned.args +++ b/tests/qemuxml2argvdata/pseries-vio-user-assigned.args @@ -23,8 +23,8 @@ server,nowait \ -device spapr-vscsi,id=scsi1,reg=0x30000000 \ -usb \ -drive file=/tmp/scsidisk.img,format=raw,if=none,id=drive-scsi1-0-0-0 \ --device scsi-disk,bus=scsi1.0,channel=0,scsi-id=0,lun=0,\ -drive=drive-scsi1-0-0-0,id=scsi1-0-0-0,bootindex=1 \ +-device scsi-hd,bus=scsi1.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi1-0-0-0,\ +id=scsi1-0-0-0,bootindex=1 \ -chardev pty,id=charserial0 \ -device spapr-vty,chardev=charserial0,id=serial0,reg=0x20000000 \ -chardev pty,id=charserial1 \ diff --git a/tests/qemuxml2argvdata/pseries-vio.args b/tests/qemuxml2argvdata/pseries-vio.args index 454f6cffa9..d55272e85b 100644 --- a/tests/qemuxml2argvdata/pseries-vio.args +++ b/tests/qemuxml2argvdata/pseries-vio.args @@ -23,8 +23,8 @@ server,nowait \ -device spapr-vscsi,id=scsi1,reg=0x3000 \ -usb \ -drive file=/tmp/scsidisk.img,format=raw,if=none,id=drive-scsi1-0-0-0 \ --device scsi-disk,bus=scsi1.0,channel=0,scsi-id=0,lun=0,\ -drive=drive-scsi1-0-0-0,id=scsi1-0-0-0,bootindex=1 \ +-device scsi-hd,bus=scsi1.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi1-0-0-0,\ +id=scsi1-0-0-0,bootindex=1 \ -chardev pty,id=charserial0 \ -device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000 \ -chardev pty,id=charserial1 \ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 3c9491982b..a873977d81 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1116,16 +1116,13 @@ mymain(void) DO_TEST_CAPS_VER("disk-scsi-device-auto", "1.5.3"); DO_TEST_CAPS_LATEST("disk-scsi-device-auto"); DO_TEST("disk-scsi-disk-split", - QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI); + QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-scsi-disk-wwn", - QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_SCSI_DISK_WWN); + QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_DISK_WWN); DO_TEST("disk-scsi-disk-vpd", - QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_SCSI_DISK_WWN); + QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_DISK_WWN); DO_TEST_FAILURE("disk-scsi-disk-vpd-build-error", - QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_SCSI_DISK_WWN); + QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_DISK_WWN); DO_TEST_CAPS_LATEST("controller-virtio-scsi"); DO_TEST("disk-sata-device", QEMU_CAPS_ICH9_AHCI); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index a4981affe8..370920f926 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -557,11 +557,9 @@ mymain(void) DO_TEST("numad-static-vcpu-no-numatune", NONE); DO_TEST("disk-scsi-lun-passthrough-sgio", - QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, - QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_DISK_WWN); + QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_DISK_WWN); DO_TEST("disk-scsi-disk-vpd", - QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, - QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_DISK_WWN); + QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_DISK_WWN); DO_TEST("disk-source-pool", NONE); DO_TEST("disk-source-pool-mode", NONE); -- 2.20.1