tests: Rename s390-usb-*

These tests currently cover the scenarios in which the guest
can end up with no USB controller, one of which is specific
to s390x. We are going to add more USB on s390x scenarios, so
a different naming convention is needed.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>

tests/qemuxmlconftest.c

@@ -2319,8 +2319,8 @@ mymain(void)
     DO_TEST_CAPS_LATEST_PARSE_ERROR("virtio-rng-egd-crash");
     DO_TEST_CAPS_ARCH_LATEST("virtio-rng-ccw", "s390x");
 
-    DO_TEST_CAPS_ARCH_LATEST("s390-allow-bogus-usb-none", "s390x");
-    DO_TEST_CAPS_ARCH_LATEST("s390-allow-bogus-usb-controller", "s390x");
+    DO_TEST_CAPS_ARCH_LATEST("s390-usb-none", "s390x");
+    DO_TEST_CAPS_ARCH_LATEST("s390-usb-address", "s390x");
 
     DO_TEST_CAPS_ARCH_LATEST("s390-panic-no-address", "s390x");
     DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("s390-panic-address", "s390x");