[libvirt] [PATCH v2 14/32] tests: qemu: Rename 'disk-scsi-device' to 'disk-scsi'

Drop the 'device' suffix which is quite pointless. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- .../qemuxml2argvdata/{disk-scsi-device.args => disk-scsi.args} | 0 tests/qemuxml2argvdata/{disk-scsi-device.xml => disk-scsi.xml} | 0 tests/qemuxml2argvtest.c | 2 +- .../qemuxml2xmloutdata/{disk-scsi-device.xml => disk-scsi.xml} | 0 tests/qemuxml2xmltest.c | 3 +-- 5 files changed, 2 insertions(+), 3 deletions(-) rename tests/qemuxml2argvdata/{disk-scsi-device.args => disk-scsi.args} (100%) rename tests/qemuxml2argvdata/{disk-scsi-device.xml => disk-scsi.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-scsi-device.xml => disk-scsi.xml} (100%) diff --git a/tests/qemuxml2argvdata/disk-scsi-device.args b/tests/qemuxml2argvdata/disk-scsi.args similarity index 100% rename from tests/qemuxml2argvdata/disk-scsi-device.args rename to tests/qemuxml2argvdata/disk-scsi.args diff --git a/tests/qemuxml2argvdata/disk-scsi-device.xml b/tests/qemuxml2argvdata/disk-scsi.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-scsi-device.xml rename to tests/qemuxml2argvdata/disk-scsi.xml diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index b7d313d215..e2f3230c59 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1114,7 +1114,7 @@ mymain(void) QEMU_CAPS_USB_STORAGE_REMOVABLE); DO_TEST_FAILURE("disk-usb-pci", QEMU_CAPS_DEVICE_USB_STORAGE); - DO_TEST("disk-scsi-device", + DO_TEST("disk-scsi", QEMU_CAPS_SCSI_LSI); DO_TEST_CAPS_VER("disk-scsi-device-auto", "1.5.3"); DO_TEST_CAPS_LATEST("disk-scsi-device-auto"); diff --git a/tests/qemuxml2xmloutdata/disk-scsi-device.xml b/tests/qemuxml2xmloutdata/disk-scsi.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-scsi-device.xml rename to tests/qemuxml2xmloutdata/disk-scsi.xml diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 7b755de39f..fc8ed318b8 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -364,8 +364,7 @@ mymain(void) DO_TEST("disk-network-sheepdog", NONE); DO_TEST("disk-network-vxhs", NONE); DO_TEST("disk-network-tlsx509", NONE); - DO_TEST("disk-scsi-device", - QEMU_CAPS_SCSI_LSI); + DO_TEST("disk-scsi", QEMU_CAPS_SCSI_LSI); DO_TEST("disk-scsi-vscsi", NONE); DO_TEST("disk-virtio-scsi-reservations", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_PR_MANAGER_HELPER); -- 2.20.1