To usb-controller-automatic-*. This matches the existing q35 test, and in general makes more sense as a name since these tests are providing coverage for USB controllers getting automatically added by libvirt for new domains, rather than implicit (i.e. built-in, non-removable) devices. Note that, in the case of physical i440fx machines, the USB controller is actually part of the chipset and would thus qualify as implicit; the corresponding QEMU machine type, however, allows for it to be removed, so the new name is still more appropriate when discussing virtual hardware. Signed-off-by: Andrea Bolognani <abologna@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Peter Krempa <pkrempa@redhat.com> --- ...s => usb-controller-automatic-i440fx.x86_64-latest.args} | 0 ...ml => usb-controller-automatic-i440fx.x86_64-latest.xml} | 0 ...licit-i440fx.xml => usb-controller-automatic-i440fx.xml} | 0 ...gs => usb-controller-automatic-isapc.x86_64-latest.args} | 0 ...xml => usb-controller-automatic-isapc.x86_64-latest.xml} | 0 ...mplicit-isapc.xml => usb-controller-automatic-isapc.xml} | 0 ...args => usb-controller-automatic-q35.x86_64-latest.args} | 0 ...t.xml => usb-controller-automatic-q35.x86_64-latest.xml} | 0 ...er-implicit-q35.xml => usb-controller-automatic-q35.xml} | 0 tests/qemuxmlconftest.c | 6 +++--- 10 files changed, 3 insertions(+), 3 deletions(-) rename tests/qemuxmlconfdata/{usb-controller-implicit-i440fx.x86_64-latest.args => usb-controller-automatic-i440fx.x86_64-latest.args} (100%) rename tests/qemuxmlconfdata/{usb-controller-implicit-i440fx.x86_64-latest.xml => usb-controller-automatic-i440fx.x86_64-latest.xml} (100%) rename tests/qemuxmlconfdata/{usb-controller-implicit-i440fx.xml => usb-controller-automatic-i440fx.xml} (100%) rename tests/qemuxmlconfdata/{usb-controller-implicit-isapc.x86_64-latest.args => usb-controller-automatic-isapc.x86_64-latest.args} (100%) rename tests/qemuxmlconfdata/{usb-controller-implicit-isapc.x86_64-latest.xml => usb-controller-automatic-isapc.x86_64-latest.xml} (100%) rename tests/qemuxmlconfdata/{usb-controller-implicit-isapc.xml => usb-controller-automatic-isapc.xml} (100%) rename tests/qemuxmlconfdata/{usb-controller-implicit-q35.x86_64-latest.args => usb-controller-automatic-q35.x86_64-latest.args} (100%) rename tests/qemuxmlconfdata/{usb-controller-implicit-q35.x86_64-latest.xml => usb-controller-automatic-q35.x86_64-latest.xml} (100%) rename tests/qemuxmlconfdata/{usb-controller-implicit-q35.xml => usb-controller-automatic-q35.xml} (100%) diff --git a/tests/qemuxmlconfdata/usb-controller-implicit-i440fx.x86_64-latest.args b/tests/qemuxmlconfdata/usb-controller-automatic-i440fx.x86_64-latest.args similarity index 100% rename from tests/qemuxmlconfdata/usb-controller-implicit-i440fx.x86_64-latest.args rename to tests/qemuxmlconfdata/usb-controller-automatic-i440fx.x86_64-latest.args diff --git a/tests/qemuxmlconfdata/usb-controller-implicit-i440fx.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-controller-automatic-i440fx.x86_64-latest.xml similarity index 100% rename from tests/qemuxmlconfdata/usb-controller-implicit-i440fx.x86_64-latest.xml rename to tests/qemuxmlconfdata/usb-controller-automatic-i440fx.x86_64-latest.xml diff --git a/tests/qemuxmlconfdata/usb-controller-implicit-i440fx.xml b/tests/qemuxmlconfdata/usb-controller-automatic-i440fx.xml similarity index 100% rename from tests/qemuxmlconfdata/usb-controller-implicit-i440fx.xml rename to tests/qemuxmlconfdata/usb-controller-automatic-i440fx.xml diff --git a/tests/qemuxmlconfdata/usb-controller-implicit-isapc.x86_64-latest.args b/tests/qemuxmlconfdata/usb-controller-automatic-isapc.x86_64-latest.args similarity index 100% rename from tests/qemuxmlconfdata/usb-controller-implicit-isapc.x86_64-latest.args rename to tests/qemuxmlconfdata/usb-controller-automatic-isapc.x86_64-latest.args diff --git a/tests/qemuxmlconfdata/usb-controller-implicit-isapc.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-controller-automatic-isapc.x86_64-latest.xml similarity index 100% rename from tests/qemuxmlconfdata/usb-controller-implicit-isapc.x86_64-latest.xml rename to tests/qemuxmlconfdata/usb-controller-automatic-isapc.x86_64-latest.xml diff --git a/tests/qemuxmlconfdata/usb-controller-implicit-isapc.xml b/tests/qemuxmlconfdata/usb-controller-automatic-isapc.xml similarity index 100% rename from tests/qemuxmlconfdata/usb-controller-implicit-isapc.xml rename to tests/qemuxmlconfdata/usb-controller-automatic-isapc.xml diff --git a/tests/qemuxmlconfdata/usb-controller-implicit-q35.x86_64-latest.args b/tests/qemuxmlconfdata/usb-controller-automatic-q35.x86_64-latest.args similarity index 100% rename from tests/qemuxmlconfdata/usb-controller-implicit-q35.x86_64-latest.args rename to tests/qemuxmlconfdata/usb-controller-automatic-q35.x86_64-latest.args diff --git a/tests/qemuxmlconfdata/usb-controller-implicit-q35.x86_64-latest.xml b/tests/qemuxmlconfdata/usb-controller-automatic-q35.x86_64-latest.xml similarity index 100% rename from tests/qemuxmlconfdata/usb-controller-implicit-q35.x86_64-latest.xml rename to tests/qemuxmlconfdata/usb-controller-automatic-q35.x86_64-latest.xml diff --git a/tests/qemuxmlconfdata/usb-controller-implicit-q35.xml b/tests/qemuxmlconfdata/usb-controller-automatic-q35.xml similarity index 100% rename from tests/qemuxmlconfdata/usb-controller-implicit-q35.xml rename to tests/qemuxmlconfdata/usb-controller-automatic-q35.xml diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 7b185dae29..cc1387fc04 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -2057,9 +2057,9 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("chardev-reconnect-invalid-timeout"); DO_TEST_CAPS_LATEST_PARSE_ERROR("chardev-reconnect-generated-path"); - DO_TEST_CAPS_LATEST("usb-controller-implicit-isapc"); - DO_TEST_CAPS_LATEST("usb-controller-implicit-i440fx"); - DO_TEST_CAPS_LATEST("usb-controller-implicit-q35"); + DO_TEST_CAPS_LATEST("usb-controller-automatic-isapc"); + DO_TEST_CAPS_LATEST("usb-controller-automatic-i440fx"); + DO_TEST_CAPS_LATEST("usb-controller-automatic-q35"); DO_TEST_CAPS_LATEST_PARSE_ERROR("usb-controller-default-isapc"); DO_TEST_CAPS_LATEST("usb-controller-default-i440fx"); DO_TEST_CAPS_LATEST("usb-controller-default-q35"); -- 2.51.0