shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-01-11 05:17:59 +03:00
Code Issues Projects Releases Wiki Activity

guest: Limit number of default usb redirdevs to 2 (bug 1135488)

Browse Source 
If we use 4 devices here, we fill up all the emulated USB2 slots,
and directly assigned devices are forced to fall back to USB1

https://bugzilla.redhat.com/show_bug.cgi?id=1135488
This commit is contained in:
Cole Robinson 2014-09-20 20:16:31 -04:00
parent 99700821c6
commit 3933ff101b
18 changed files with 4 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/cli-test-xml/compare/virt-convert-ovf-compare.xml
View File

@ -64,7 +64,5 @@
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
</devices>
</domain>

2
tests/cli-test-xml/compare/virt-convert-vmx-compare.xml
View File

@ -61,7 +61,5 @@
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
</devices>
</domain>

2
tests/cli-test-xml/compare/virt-install-kvm-machine.xml
View File

@ -60,7 +60,5 @@
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
</devices>
</domain>

6
tests/cli-test-xml/compare/virt-install-kvm-win2k3-cdrom.xml
View File

@ -61,8 +61,6 @@
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
</devices>
</domain>
<domain type="kvm">
@ -127,8 +125,6 @@
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
</devices>
</domain>
<domain type="kvm">
@ -193,7 +189,5 @@
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
</devices>
</domain>

2
tests/cli-test-xml/compare/virt-install-kvm-xenner.xml
View File

@ -40,7 +40,5 @@
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
</devices>
</domain>

4
tests/cli-test-xml/compare/virt-install-location-iso.xml
View File

@ -55,8 +55,6 @@
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
</devices>
</domain>
<domain type="kvm">
@ -113,7 +111,5 @@
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
</devices>
</domain>

2
tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml
View File

@ -38,7 +38,5 @@
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
</devices>
</domain>

2
tests/cli-test-xml/compare/virt-install-qemu-plain.xml
View File

@ -53,7 +53,5 @@
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
</devices>
</domain>

2
tests/virtconv-files/libvirt_output/ovf2libvirt_ovf_directory.libvirt
View File

@ -58,8 +58,6 @@
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
</devices>
</domain>

2
tests/virtconv-files/libvirt_output/ovf2libvirt_test1.libvirt
View File

@ -64,8 +64,6 @@
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
</devices>
</domain>

2
tests/virtconv-files/libvirt_output/ovf2libvirt_test1.libvirt.disk_qcow2
View File

@ -64,8 +64,6 @@
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
</devices>
</domain>

2
tests/virtconv-files/libvirt_output/ovf2libvirt_test2.libvirt
View File

@ -59,8 +59,6 @@
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
</devices>
</domain>

2
tests/virtconv-files/libvirt_output/vmx2libvirt_test-nodisks.libvirt
View File

@ -56,7 +56,5 @@
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
</devices>
</domain>

2
tests/virtconv-files/libvirt_output/vmx2libvirt_test-vmx-zip.libvirt
View File

@ -63,8 +63,6 @@
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
</devices>
</domain>

2
tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt
View File

@ -61,8 +61,6 @@
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
</devices>
</domain>

2
tests/virtconv-files/libvirt_output/vmx2libvirt_test1.libvirt.disk_raw
View File

@ -61,8 +61,6 @@
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
</devices>
</domain>

2
tests/virtconv-files/libvirt_output/vmx2libvirt_vmx-dir.libvirt
View File

@ -62,8 +62,6 @@
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>
</devices>
</domain>

5
virtinst/guest.py
View File

@ -968,7 +968,10 @@ class Guest(XMLBuilder):
if not self.conn.check_support(self.conn.SUPPORT_CONN_USBREDIR):
return
for ignore in range(4):
# If we use 4 devices here, we fill up all the emulated USB2 slots,
# and directly assigned devices are forced to fall back to USB1
# https://bugzilla.redhat.com/show_bug.cgi?id=1135488
for ignore in range(2):
dev = VirtualRedirDevice(self.conn)
dev.bus = "usb"
dev.type = "spicevmc"