38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
|
Subject: xmlnsqemu: Order XML output like libvirt does
|
||
|
|
From: Cole Robinson crobinso@redhat.com Fri Oct 20 15:26:03 2017 -0400
|
||
|
|
Date: Fri Oct 20 16:13:04 2017 -0400:
|
||
|
|
Git: b8fa0c6b6769663837079084b6ff93da243d52a1
|
||
|
|
|
||
|
|
args before env
|
||
|
|
|
||
|
|
diff --git a/tests/cli-test-xml/compare/virt-install-many-devices.xml b/tests/cli-test-xml/compare/virt-install-many-devices.xml
|
||
|
|
index 87855238..2873a65b 100644
|
||
|
|
--- a/tests/cli-test-xml/compare/virt-install-many-devices.xml
|
||
|
|
+++ b/tests/cli-test-xml/compare/virt-install-many-devices.xml
|
||
|
|
@@ -386,12 +386,12 @@
|
||
|
|
</panic>
|
||
|
|
</devices>
|
||
|
|
<qemu:commandline>
|
||
|
|
- <qemu:env name="DISPLAY" value=":0.1"/>
|
||
|
|
<qemu:arg value="-display"/>
|
||
|
|
<qemu:arg value="gtk,gl=on"/>
|
||
|
|
<qemu:arg value="-device"/>
|
||
|
|
<qemu:arg value="vfio-pci,addr=05.0,sysfsdev=/sys/class/mdev_bus/0000:00:02.0/f321853c-c584-4a6b-b99a-3eee22a3919c"/>
|
||
|
|
<qemu:arg value="-set"/>
|
||
|
|
<qemu:arg value="device.video0.driver=virtio-vga"/>
|
||
|
|
+ <qemu:env name="DISPLAY" value=":0.1"/>
|
||
|
|
</qemu:commandline>
|
||
|
|
</domain>
|
||
|
|
diff --git a/virtinst/xmlnsqemu.py b/virtinst/xmlnsqemu.py
|
||
|
|
index 28259bf2..5213e5d1 100644
|
||
|
|
--- a/virtinst/xmlnsqemu.py
|
||
|
|
+++ b/virtinst/xmlnsqemu.py
|
||
|
|
@@ -37,6 +37,7 @@ class XMLNSQemu(XMLBuilder):
|
||
|
|
Class for generating <qemu:commandline> XML
|
||
|
|
"""
|
||
|
|
_XML_ROOT_NAME = "qemu:commandline"
|
||
|
|
+ _XML_PROP_ORDER = ["args", "envs"]
|
||
|
|
|
||
|
|
args = XMLChildProperty(_XMLNSQemuArg)
|
||
|
|
def add_arg(self, value):
|