NuKVM/virt-manager
3
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

guest: devices: change XML ordering to match libvirt

Browse Source
This commit is contained in:
Cole Robinson 2018-03-21 09:08:30 -04:00
parent b7f6e4990e
commit 538ea96116
44 changed files with 198 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,13 +53,13 @@
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="qxl"/>

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

@ -50,13 +50,13 @@
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="qxl"/>

10
tests/cli-test-xml/compare/virt-install-aarch64-graphics.xml
View File

@ -14,11 +14,6 @@
<devices>
<emulator>/usr/bin/qemu-system-aarch64</emulator>
<controller type="usb" index="0" model="qemu-xhci" ports="8"/>
<input type="tablet" bus="usb"/>
<input type="keyboard" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="unix">
<source mode="bind"/>
@ -27,6 +22,11 @@
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<input type="tablet" bus="usb"/>
<input type="keyboard" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="virtio"/>

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

@ -43,13 +43,13 @@
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="qxl"/>

4
tests/cli-test-xml/compare/virt-install-f21-kvm-remote.xml
View File

@ -47,8 +47,6 @@
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes"/>
<console type="pty"/>
<channel type="unix">
<source mode="bind"/>
@ -57,6 +55,8 @@
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes"/>
<sound model="ich6"/>
<video>
<model type="qxl"/>

12
tests/cli-test-xml/compare/virt-install-features-smm.xml
View File

@ -43,13 +43,13 @@
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="qxl"/>
@ -102,13 +102,13 @@
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="qxl"/>

16
tests/cli-test-xml/compare/virt-install-kvm-centos7.xml
View File

@ -49,10 +49,6 @@
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="unix">
<source mode="bind"/>
@ -61,6 +57,10 @@
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="qxl"/>
@ -118,10 +118,6 @@
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="unix">
<source mode="bind"/>
@ -130,6 +126,10 @@
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="qxl"/>

16
tests/cli-test-xml/compare/virt-install-kvm-rhel6.xml
View File

@ -49,10 +49,6 @@
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="unix">
<source mode="bind"/>
@ -61,6 +57,10 @@
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="qxl"/>
@ -118,10 +118,6 @@
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="unix">
<source mode="bind"/>
@ -130,6 +126,10 @@
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="qxl"/>

16
tests/cli-test-xml/compare/virt-install-kvm-rhel7.xml
View File

@ -49,10 +49,6 @@
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="unix">
<source mode="bind"/>
@ -61,6 +57,10 @@
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="qxl"/>
@ -118,10 +118,6 @@
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="unix">
<source mode="bind"/>
@ -130,6 +126,10 @@
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="qxl"/>

16
tests/cli-test-xml/compare/virt-install-kvm-session-defaults.xml
View File

@ -54,10 +54,6 @@
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="unix">
<source mode="bind"/>
@ -66,6 +62,10 @@
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="qxl"/>
@ -129,10 +129,6 @@
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="unix">
<source mode="bind"/>
@ -141,6 +137,10 @@
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="qxl"/>

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

@ -51,14 +51,14 @@
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="qxl"/>
@ -118,14 +118,14 @@
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="qxl"/>

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

@ -45,13 +45,13 @@
<controller type="usb" index="0" model="ich9-uhci3">
<master startport="4"/>
</controller>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="qxl"/>
@ -103,13 +103,13 @@
<controller type="usb" index="0" model="ich9-uhci3">
<master startport="4"/>
</controller>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="qxl"/>

16
tests/cli-test-xml/compare/virt-install-location-nfs.xml
View File

@ -40,14 +40,14 @@
<controller type="usb" index="0" model="ich9-uhci3">
<master startport="4"/>
</controller>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="qxl"/>
@ -98,14 +98,14 @@
<controller type="usb" index="0" model="ich9-uhci3">
<master startport="4"/>
</controller>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="qxl"/>

58
tests/cli-test-xml/compare/virt-install-many-devices.xml
View File

@ -222,6 +222,35 @@
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>
<smartcard mode="passthrough" type="spicevmc"/>
<smartcard mode="passthrough" type="host"/>
<serial type="tcp">
<source mode="bind" host="127.0.0.1" service="2222"/>
<protocol type="telnet"/>
<log file="/tmp/foo.log" append="on"/>
</serial>
<serial type="nmdm">
<source master="/dev/foo1" slave="/dev/foo2"/>
</serial>
<parallel type="udp">
<source mode="bind" host="127.0.0.1" service="1234"/>
<source mode="connect" host="0.0.0.0" service="1234"/>
</parallel>
<parallel type="unix">
<source mode="bind" path="/tmp/foo-socket"/>
</parallel>
<console type="pty">
<target type="virtio"/>
</console>
<channel type="pty">
<target type="guestfwd" address="127.0.0.1" port="10000"/>
</channel>
<channel type="pty">
<target type="virtio" name="org.linux-kvm.port1"/>
</channel>
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<input type="keyboard" bus="usb"/>
<input type="tablet" bus="usb"/>
<graphics type="sdl" display=":3.4" xauth="/tmp/.Xauthority"/>
@ -266,33 +295,6 @@
<image compression="off"/>
<listen type="socket" socket="/tmp/foobar"/>
</graphics>
<serial type="tcp">
<source mode="bind" host="127.0.0.1" service="2222"/>
<protocol type="telnet"/>
<log file="/tmp/foo.log" append="on"/>
</serial>
<serial type="nmdm">
<source master="/dev/foo1" slave="/dev/foo2"/>
</serial>
<parallel type="udp">
<source mode="bind" host="127.0.0.1" service="1234"/>
<source mode="connect" host="0.0.0.0" service="1234"/>
</parallel>
<parallel type="unix">
<source mode="bind" path="/tmp/foo-socket"/>
</parallel>
<console type="pty">
<target type="virtio"/>
</console>
<channel type="pty">
<target type="guestfwd" address="127.0.0.1" port="10000"/>
</channel>
<channel type="pty">
<target type="virtio" name="org.linux-kvm.port1"/>
</channel>
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<sound model="ich6"/>
<sound model="ac97"/>
<video>
@ -371,8 +373,6 @@
<address bus="1" device="21"/>
</source>
</hostdev>
<smartcard mode="passthrough" type="spicevmc"/>
<smartcard mode="passthrough" type="host"/>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="tcp">
<source host="localhost" service="4000"/>

6
tests/cli-test-xml/compare/virt-install-ppc64-machdefault-f20.xml
View File

@ -16,9 +16,6 @@
<source file="/dev/default-pool/testvol1.img"/>
<target dev="vda" bus="virtio"/>
</disk>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="unix">
<source mode="bind"/>
@ -27,6 +24,9 @@
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="vga"/>

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

@ -21,9 +21,6 @@
<readonly/>
</disk>
<controller type="scsi" index="0" model="virtio-scsi"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="unix">
<source mode="bind"/>
@ -32,6 +29,9 @@
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="vga"/>

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

@ -21,12 +21,12 @@
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>
<graphics type="vnc" port="-1"/>
<console type="pty"/>
<channel type="unix">
<source mode="bind"/>
<target type="virtio" name="org.qemu.guest_agent.0"/>
</channel>
<graphics type="vnc" port="-1"/>
<video>
<model type="vga"/>
</video>

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

@ -54,13 +54,13 @@
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="qxl"/>
@ -121,13 +121,13 @@
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="qxl"/>

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

@ -42,14 +42,14 @@
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="qxl"/>

10
tests/cli-test-xml/compare/virt-install-singleton-config-1.xml
View File

@ -47,6 +47,11 @@
<master startport="4"/>
</controller>
<input type="tablet" bus="usb"/>
<tpm model="tpm-tis">
<backend type="passthrough">
<device path="/dev/tpm0"/>
</backend>
</tpm>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
@ -55,11 +60,6 @@
</video>
<watchdog model="i6300esb" action="reset"/>
<memballoon model="none"/>
<tpm model="tpm-tis">
<backend type="passthrough">
<device path="/dev/tpm0"/>
</backend>
</tpm>
<rng model="virtio">
<backend model="random">/dev/random</backend>
</rng>

16
tests/cli-test-xml/compare/virt-install-singleton-config-2.xml
View File

@ -132,20 +132,20 @@
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>
<input type="tablet" bus="usb"/>
<graphics type="vnc" port="-1"/>
<console type="pty"/>
<channel type="unix">
<source mode="bind"/>
<target type="virtio" name="org.qemu.guest_agent.0"/>
</channel>
<watchdog model="ib700" action="pause"/>
<memballoon model="virtio"/>
<input type="tablet" bus="usb"/>
<tpm model="tpm-tis">
<backend type="passthrough">
<device path="/dev/tpm0"/>
</backend>
</tpm>
<graphics type="vnc" port="-1"/>
<watchdog model="ib700" action="pause"/>
<memballoon model="virtio"/>
<rng model="virtio">
<backend model="egd" type="udp">
<source mode="bind" host="127.0.0.1" service="8000"/>
@ -301,20 +301,20 @@
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>
<input type="tablet" bus="usb"/>
<graphics type="vnc" port="-1"/>
<console type="pty"/>
<channel type="unix">
<source mode="bind"/>
<target type="virtio" name="org.qemu.guest_agent.0"/>
</channel>
<watchdog model="ib700" action="pause"/>
<memballoon model="virtio"/>
<input type="tablet" bus="usb"/>
<tpm model="tpm-tis">
<backend type="passthrough">
<device path="/dev/tpm0"/>
</backend>
</tpm>
<graphics type="vnc" port="-1"/>
<watchdog model="ib700" action="pause"/>
<memballoon model="virtio"/>
<rng model="virtio">
<backend model="egd" type="udp">
<source mode="bind" host="127.0.0.1" service="8000"/>

8
tests/cli-test-xml/compare/virt-install-solaris10-defaults.xml
View File

@ -47,14 +47,14 @@
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="qxl"/>

10
tests/cli-test-xml/compare/virt-install-spice-gl.xml
View File

@ -42,11 +42,6 @@
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<gl enable="yes" rendernode="/dev/dri/by-path/pci-0000:00:02.0-render"/>
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="unix">
<source mode="bind"/>
@ -55,6 +50,11 @@
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<gl enable="yes" rendernode="/dev/dri/by-path/pci-0000:00:02.0-render"/>
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="virtio">

2
tests/cli-test-xml/compare/virt-install-vz-ct-template.xml
View File

@ -17,7 +17,7 @@
<source network="Bridged"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<graphics type="vnc" port="-1" keymap="en-us"/>
<console type="pty"/>
<graphics type="vnc" port="-1" keymap="en-us"/>
</devices>
</domain>

16
tests/cli-test-xml/compare/virt-install-win7-uefi.xml
View File

@ -56,14 +56,14 @@
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="qxl"/>
@ -128,14 +128,14 @@
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<input type="tablet" bus="usb"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="qxl"/>

2
tests/cli-test-xml/compare/virt-install-xen-default.xml
View File

@ -15,7 +15,7 @@
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<graphics type="vnc" port="-1" keymap="en-us"/>
<console type="pty"/>
<graphics type="vnc" port="-1" keymap="en-us"/>
</devices>
</domain>

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

@ -33,7 +33,7 @@
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<graphics type="vnc" port="-1" keymap="en-us"/>
<console type="pty"/>
<graphics type="vnc" port="-1" keymap="en-us"/>
</devices>
</domain>

4
tests/cli-test-xml/compare/virt-install-xen-pv.xml
View File

@ -21,8 +21,8 @@
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<graphics type="vnc" port="-1" keymap="en-us"/>
<console type="pty"/>
<graphics type="vnc" port="-1" keymap="en-us"/>
</devices>
</domain>
<domain type="xen">
@ -42,7 +42,7 @@
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<graphics type="vnc" port="-1" keymap="en-us"/>
<console type="pty"/>
<graphics type="vnc" port="-1" keymap="en-us"/>
</devices>
</domain>

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

@ -47,13 +47,13 @@
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="qxl"/>

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

@ -53,13 +53,13 @@
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="qxl"/>

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

@ -53,13 +53,13 @@
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="qxl"/>

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

@ -48,13 +48,13 @@
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="qxl"/>

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

@ -47,13 +47,13 @@
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="qxl"/>

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

@ -47,13 +47,13 @@
<mac address="00:11:22:33:44:55"/>
<model type="e1000"/>
</interface>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="qxl"/>

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

@ -45,13 +45,13 @@
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="qxl"/>

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

@ -51,13 +51,13 @@
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="qxl"/>

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

@ -50,13 +50,13 @@
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="qxl"/>

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

@ -50,13 +50,13 @@
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="qxl"/>

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

@ -50,13 +50,13 @@
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>
</interface>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<console type="pty"/>
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
<image compression="off"/>
</graphics>
<sound model="ich6"/>
<video>
<model type="qxl"/>

2
tests/xmlconfig-xml/install-f11-norheldefaults.xml
View File

@ -43,9 +43,9 @@
<mac address="22:22:33:44:55:66"/>
<model type="virtio"/>
</interface>
<console type="pty"/>
<input type="tablet" bus="usb"/>
<graphics type="vnc" port="-1" keymap="ja"/>
<console type="pty"/>
<sound model="ac97"/>
</devices>
</domain>

2
tests/xmlconfig-xml/install-f11-rheldefaults.xml
View File

@ -43,9 +43,9 @@
<mac address="22:22:33:44:55:66"/>
<model type="virtio"/>
</interface>
<console type="pty"/>
<input type="tablet" bus="usb"/>
<graphics type="vnc" port="-1" keymap="ja"/>
<console type="pty"/>
<sound model="ac97"/>
</devices>
</domain>

2
tests/xmlconfig-xml/install-hyperv-clock.xml
View File

@ -56,9 +56,9 @@
<source network="default"/>
<mac address="22:22:33:44:55:66"/>
</interface>
<console type="pty"/>
<input type="tablet" bus="usb"/>
<graphics type="vnc" port="-1" keymap="ja"/>
<console type="pty"/>
<sound model="ich6"/>
</devices>
</domain>

2
tests/xmlconfig-xml/install-hyperv-noclock.xml
View File

@ -55,9 +55,9 @@
<source network="default"/>
<mac address="22:22:33:44:55:66"/>
</interface>
<console type="pty"/>
<input type="tablet" bus="usb"/>
<graphics type="vnc" port="-1" keymap="ja"/>
<console type="pty"/>
<sound model="ich6"/>
</devices>
</domain>

7
virtinst/guest.py
View File

@ -29,9 +29,10 @@ _ignore = Device
class _DomainDevices(XMLBuilder):
_XML_ROOT_NAME = "devices"
_XML_PROP_ORDER = ['disk', 'controller', 'filesystem', 'interface',
'input', 'graphics', 'serial', 'parallel', 'console', 'channel',
'sound', 'video', 'hostdev', 'watchdog', 'smartcard', 'redirdev',
'memballoon', 'tpm', 'rng', 'panic', 'memory']
'smartcard', 'serial', 'parallel', 'console', 'channel',
'input', 'tpm', 'graphics', 'sound', 'video', 'hostdev',
'redirdev', 'watchdog', 'memballoon', 'rng', 'panic',
'memory']
disk = XMLChildProperty(DeviceDisk)