usb-hub and usb-storage got non-zero IDs in upstream qemu.
usb-hub has 0409:55aa
usb-storage has 46f4:0001
Adapt config & testcases.
Signed-off-by: Gerd Hoffmann <kra...@redhat.com>
---
client/tests/kvm/tests/usb.py | 2 +-
client/virt/subtests.cfg.sample | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/client/tests/kvm/tests/usb.py b/client/tests/kvm/tests/usb.py
index 10b107b..35ca2b3 100644
--- a/client/tests/kvm/tests/usb.py
+++ b/client/tests/kvm/tests/usb.py
@@ -258,7 +258,7 @@ def run_usb(test, params, env):
session = _login()
output = session.cmd("lsusb -v")
# No bus specified, default using "usb.0" for "usb-storage"
- for i in ["ID 0000:0000", "Mass Storage", "SCSI", "QEMU USB HARDDRIVE"]:
+ for i in ["Mass Storage", "SCSI", "QEMU USB HARDDRIVE"]:
_verify_string(i, output, [i])
_do_io_test_guest(session)
session.close()
diff --git a/client/virt/subtests.cfg.sample b/client/virt/subtests.cfg.sample
index 30618d3..8c5310e 100644
--- a/client/virt/subtests.cfg.sample
+++ b/client/virt/subtests.cfg.sample
@@ -368,9 +368,9 @@ variants:
usb_controller_hub1 = uhci
check_func = "check_usb_device"
info_usb_name = "QEMU USB Hub"
- vendor_id = "0000"
+ vendor_id = "(0000|0409)"
vendor = ""
- product_id = "0000"
+ product_id = "(0000|55aa)"
product = "QEMU USB Hub"
- storage:
# Disable other usb devices
@@ -380,9 +380,9 @@ variants:
usb_max_port_usb1 = 6
check_func = "check_usb_device"
info_usb_name = "QEMU USB MSD"
- vendor_id = "0000"
+ vendor_id = "(0000|46f4)"
vendor = ""
- product_id = "0000"
+ product_id = "(0000|0001)"
product = "QEMU USB HARDDRIVE"
images += " stg"
image_boot_image1 = yes
@@ -448,9 +448,9 @@ variants:
usb_controller_hub1 = uhci
check_func = "check_usb_device"
info_usb_name = "QEMU USB Hub"
- vendor_id = "0000"
+ vendor_id = "(0000|0409)"
vendor = ""
- product_id = "0000"
+ product_id = "(0000|55aa)"
product = "QEMU USB Hub"
- storage:
# Disable other usb devices
@@ -460,9 +460,9 @@ variants:
usb_max_port_usb1 = 6
check_func = "check_usb_device"
info_usb_name = "QEMU USB MSD"
- vendor_id = "0000"
+ vendor_id = "(0000|46f4)"
vendor = ""
- product_id = "0000"
+ product_id = "(0000|0001)"
product = "QEMU USB HARDDRIVE"
images += " stg"
image_boot_image1 = yes
--
1.7.1
_______________________________________________
Autotest mailing list
Autotest@test.kernel.org
http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
