tests: don't add the same USB devices to the guest twice

Libvirt now validates that all <hostdev> elements refer to distinct host
devices. The test suite violates that constraint by trying to build a
new guest with the same USB devices added to the guest twice, to
validate the various host device syntax options.

Signed-off-by: Daniel P. Berrangé <[email protected]>

Author: berrange

tests/data/cli/compare/virt-install-many-devices.xml

@@ -571,15 +571,15 @@
     </hostdev>
     <hostdev mode="subsystem" type="usb" managed="yes">
       <source>
-        <vendor id="0x0781"/>
-        <product id="0x5151"/>
+        <vendor id="0x062a"/>
+        <product id="0x0001"/>
       </source>
       <driver name="vfio"/>
     </hostdev>
     <hostdev mode="subsystem" type="usb" managed="yes">
       <source>
-        <vendor id="0x04b3"/>
-        <product id="0x4485"/>
+        <vendor id="0x0483"/>
+        <product id="0x2016"/>
       </source>
     </hostdev>
     <hostdev mode="subsystem" type="scsi" managed="no">

tests/test_cli.py

@@ -695,8 +695,8 @@ def add_compare(self, cat, args, compbase, **kwargs):
 --hostdev 15:0.1
 --host-device 2:15:0.2
 --hostdev 0:15:0.3,address.type=pci,address.zpci.uid=0xffff,address.zpci.fid=0xffffffff
---host-device 0x0781:0x5151,driver_name=vfio
---host-device 04b3:4485
+--host-device 0x062a:0x0001,driver_name=vfio
+--host-device 0483:2016
 --host-device pci_8086_2829_scsi_host_scsi_device_lun0,rom.bar=on
 --hostdev usb_5_20 --hostdev usb_5_21
 --hostdev wlan0,type=net