openkylin
/
virt-manager
mirror of https://gitee.com/openkylin/virt-manager.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

osdict: Use USB tablet if no OS specified 

Most OS users will be installing benefit from it, so make it the
default
This commit is contained in:
Cole Robinson 2018-09-29 13:34:48 -04:00
parent 184b96a815
commit 7356afcca7
19 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,6 +57,7 @@
<channel type="spicevmc"> <channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/> <target type="virtio" name="com.redhat.spice.0"/>
</channel> </channel>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes"> <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/> <image compression="off"/>
</graphics> </graphics>

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

@ -54,6 +54,7 @@
<channel type="spicevmc"> <channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/> <target type="virtio" name="com.redhat.spice.0"/>
</channel> </channel>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes"> <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/> <image compression="off"/>
</graphics> </graphics>

1
tests/cli-test-xml/compare/virt-install-boot-uefi.xml
View File

@ -46,6 +46,7 @@
<channel type="spicevmc"> <channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/> <target type="virtio" name="com.redhat.spice.0"/>
</channel> </channel>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes"> <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/> <image compression="off"/>
</graphics> </graphics>

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

@ -45,6 +45,7 @@
<channel type="spicevmc"> <channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/> <target type="virtio" name="com.redhat.spice.0"/>
</channel> </channel>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes"> <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/> <image compression="off"/>
</graphics> </graphics>
@ -102,6 +103,7 @@
<channel type="spicevmc"> <channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/> <target type="virtio" name="com.redhat.spice.0"/>
</channel> </channel>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes"> <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/> <image compression="off"/>
</graphics> </graphics>

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

@ -49,6 +49,7 @@
<channel type="spicevmc"> <channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/> <target type="virtio" name="com.redhat.spice.0"/>
</channel> </channel>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes"> <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/> <image compression="off"/>
</graphics> </graphics>
@ -107,6 +108,7 @@
<channel type="spicevmc"> <channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/> <target type="virtio" name="com.redhat.spice.0"/>
</channel> </channel>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes"> <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/> <image compression="off"/>
</graphics> </graphics>

2
tests/cli-test-xml/compare/virt-install-q35-defaults.xml
View File

@ -59,6 +59,7 @@
<channel type="spicevmc"> <channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/> <target type="virtio" name="com.redhat.spice.0"/>
</channel> </channel>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes"> <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/> <image compression="off"/>
</graphics> </graphics>
@ -127,6 +128,7 @@
<channel type="spicevmc"> <channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/> <target type="virtio" name="com.redhat.spice.0"/>
</channel> </channel>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes"> <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/> <image compression="off"/>
</graphics> </graphics>

1
tests/cli-test-xml/compare/virt-install-xen-hvm.xml
View File

@ -34,6 +34,7 @@
<mac address="00:11:22:33:44:55"/> <mac address="00:11:22:33:44:55"/>
</interface> </interface>
<console type="pty"/> <console type="pty"/>
<input type="tablet" bus="usb"/>
<graphics type="vnc" port="-1"/> <graphics type="vnc" port="-1"/>
<video> <video>
<model type="vga"/> <model type="vga"/>

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

@ -51,6 +51,7 @@
<channel type="spicevmc"> <channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/> <target type="virtio" name="com.redhat.spice.0"/>
</channel> </channel>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes"> <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/> <image compression="off"/>
</graphics> </graphics>

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

@ -57,6 +57,7 @@
<channel type="spicevmc"> <channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/> <target type="virtio" name="com.redhat.spice.0"/>
</channel> </channel>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes"> <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/> <image compression="off"/>
</graphics> </graphics>

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

@ -57,6 +57,7 @@
<channel type="spicevmc"> <channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/> <target type="virtio" name="com.redhat.spice.0"/>
</channel> </channel>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes"> <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/> <image compression="off"/>
</graphics> </graphics>

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

@ -52,6 +52,7 @@
<channel type="spicevmc"> <channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/> <target type="virtio" name="com.redhat.spice.0"/>
</channel> </channel>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes"> <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/> <image compression="off"/>
</graphics> </graphics>

1
tests/virtconv-files/libvirt_output/ovf2libvirt_test_gzip.libvirt
View File

@ -51,6 +51,7 @@
<channel type="spicevmc"> <channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/> <target type="virtio" name="com.redhat.spice.0"/>
</channel> </channel>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes"> <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/> <image compression="off"/>
</graphics> </graphics>

1
tests/virtconv-files/libvirt_output/ovf2libvirt_test_gzip.libvirt.disk_raw
View File

@ -51,6 +51,7 @@
<channel type="spicevmc"> <channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/> <target type="virtio" name="com.redhat.spice.0"/>
</channel> </channel>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes"> <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/> <image compression="off"/>
</graphics> </graphics>

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

@ -49,6 +49,7 @@
<channel type="spicevmc"> <channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/> <target type="virtio" name="com.redhat.spice.0"/>
</channel> </channel>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes"> <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/> <image compression="off"/>
</graphics> </graphics>

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

@ -55,6 +55,7 @@
<channel type="spicevmc"> <channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/> <target type="virtio" name="com.redhat.spice.0"/>
</channel> </channel>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes"> <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/> <image compression="off"/>
</graphics> </graphics>

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

@ -54,6 +54,7 @@
<channel type="spicevmc"> <channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/> <target type="virtio" name="com.redhat.spice.0"/>
</channel> </channel>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes"> <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/> <image compression="off"/>
</graphics> </graphics>

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

@ -54,6 +54,7 @@
<channel type="spicevmc"> <channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/> <target type="virtio" name="com.redhat.spice.0"/>
</channel> </channel>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes"> <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/> <image compression="off"/>
</graphics> </graphics>

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

@ -54,6 +54,7 @@
<channel type="spicevmc"> <channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/> <target type="virtio" name="com.redhat.spice.0"/>
</channel> </channel>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes"> <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/> <image compression="off"/>
</graphics> </graphics>

3
virtinst/osdict.py
View File

@ -352,6 +352,9 @@ class _OsVariant(object):
return self._device_filter(cls="net") return self._device_filter(cls="net")
def supports_usbtablet(self): def supports_usbtablet(self):
# If no OS specified, still default to tablet
if not self._os:
return True
return bool(self._device_filter(cls="input", name="tablet", bus="usb")) return bool(self._device_filter(cls="input", name="tablet", bus="usb"))
def supports_virtiodisk(self): def supports_virtiodisk(self):