ba698f40db
9a9f9ecd-ignore-comments-in-keymap-conf-files.patch 9617d126-systray-Use-APPLICATION_STATUS-for-appindicator.patch e73abe5a-diskbackend-convert-to-long-the-calculated-size.patch 6e6f59e7-diskbackend-get-a-proper-size-of-existing-block-device-while-cloning.patch 23aaf852-network-Set-bridge-name-to-None-instead-of-blank.patch d1e1cf64-progress-remove-trailing-white-space.patch 63fce081-pycodestyle-Use-isinstance-for-type-checking.patch 08a58d61-pycodestyle-remove-description-of-fixed-errors.patch bc3c9a9d-progress-remove-unused-import.patch 2d276ebe-progress-dont-overwrite-format.patch e2ad4b2f-convert-iteritems-to-items.patch dff00d4f-remove-deprecated-statvfs-module.patch 75210ed3-replace-StringIO-with-io.patch a2bcd6c4-dont-compare-between-None-and-int.patch 44de92b7-use-reload-from-imp-module.patch 69c84bea-import-reduce-from-functools-module.patch 37ea5207-replace-StandardError-with-Exception.patch f41aafc7-Use-enumerate-instead-of-range-and-len.patch 91c0669c-cli-Fix-OrderedDict-mutated-during-iteration-on-python3.patch b8fa0c6b-xmlnsqemu-order-XML-output-like-libvirt-does.patch d2648d81-virtconv-dont-implicitly-depend-on-dict-hash-order.patch 999dbb36-cli-Make-VirtCLIArgument-instantiation-less-crazy.patch 7f1b4cee-pycodestyle-fix-all-E125-warnings.patch d82022bd-manager-drop-python2-only-cmp-usage.patch 374a3779-urlfetcher-write-test-file-as-binary-content.patch f7c8cf9f-devicepanic-dont-return-empty-model-list.patch 3be78d1f-addhardware-dont-allow-panic-option-where-not-supported.patch 73de8285-systray-remove-redundant-variable-assignment.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=375
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):
|