3f42ed6e48
virt-manager.spec - Add upstream bug fix 5e68b0fc-dont-try-to-set-vmport-on-non-x86.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=254
69 lines
2.6 KiB
Diff
69 lines
2.6 KiB
Diff
Subject: guest: Don't try to set vmport on non-x86, it isn't supported (bz 1259998)
|
|
From: Cole Robinson crobinso@redhat.com Fri Sep 4 12:14:22 2015 -0400
|
|
Date: Fri Sep 4 12:14:22 2015 -0400:
|
|
Git: 5e68b0fc3d9b93491817a3c1914fa9b3633440b6
|
|
|
|
|
|
Index: virt-manager-1.2.1/tests/cli-test-xml/compare/virt-install-ppc64-machdefault-f20.xml
|
|
===================================================================
|
|
--- virt-manager-1.2.1.orig/tests/cli-test-xml/compare/virt-install-ppc64-machdefault-f20.xml
|
|
+++ virt-manager-1.2.1/tests/cli-test-xml/compare/virt-install-ppc64-machdefault-f20.xml
|
|
@@ -8,12 +8,6 @@
|
|
<type arch="ppc64" machine="pseries">hvm</type>
|
|
<boot dev="network"/>
|
|
</os>
|
|
- <features>
|
|
- <acpi/>
|
|
- <apic/>
|
|
- <pae/>
|
|
- <vmport state="off"/>
|
|
- </features>
|
|
<clock offset="utc"/>
|
|
<on_poweroff>destroy</on_poweroff>
|
|
<on_reboot>restart</on_reboot>
|
|
Index: virt-manager-1.2.1/tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml
|
|
===================================================================
|
|
--- virt-manager-1.2.1.orig/tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml
|
|
+++ virt-manager-1.2.1/tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml
|
|
@@ -8,12 +8,6 @@
|
|
<type arch="ppc64" machine="pseries">hvm</type>
|
|
<boot dev="network"/>
|
|
</os>
|
|
- <features>
|
|
- <acpi/>
|
|
- <apic/>
|
|
- <pae/>
|
|
- <vmport state="off"/>
|
|
- </features>
|
|
<clock offset="utc"/>
|
|
<on_poweroff>destroy</on_poweroff>
|
|
<on_reboot>restart</on_reboot>
|
|
Index: virt-manager-1.2.1/tests/cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml
|
|
===================================================================
|
|
--- virt-manager-1.2.1.orig/tests/cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml
|
|
+++ virt-manager-1.2.1/tests/cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml
|
|
@@ -8,11 +8,6 @@
|
|
<type arch="ppc64le" machine="pseries">hvm</type>
|
|
<boot dev="hd"/>
|
|
</os>
|
|
- <features>
|
|
- <acpi/>
|
|
- <apic/>
|
|
- <vmport state="off"/>
|
|
- </features>
|
|
<clock offset="utc"/>
|
|
<on_poweroff>destroy</on_poweroff>
|
|
<on_reboot>restart</on_reboot>
|
|
Index: virt-manager-1.2.1/virtinst/guest.py
|
|
===================================================================
|
|
--- virt-manager-1.2.1.orig/virtinst/guest.py
|
|
+++ virt-manager-1.2.1/virtinst/guest.py
|
|
@@ -847,6 +847,7 @@ class Guest(XMLBuilder):
|
|
self.features.pae = self.conn.caps.supports_pae()
|
|
|
|
if (self.features.vmport == "default" and
|
|
+ self.os.is_x86() and
|
|
self.has_spice() and
|
|
self.conn.check_support(self.conn.SUPPORT_CONN_VMPORT)):
|
|
self.features.vmport = False
|