From c83f547d4d24d0edbe0168edb7baf9e0c12c0aa5 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Tue, 6 Feb 2018 18:29:18 -0500
Subject: [PATCH] Revert "Rebased to version 1.5.0"

This reverts commit a07c8142b984053c6e70013910c92b7f9d899f43.
---
 ...t-return-empty-model-list-bz-1505532.patch | 34 +++++++++++++++++++
 virt-manager.spec                             | 34 +++++--------------
 2 files changed, 42 insertions(+), 26 deletions(-)
 create mode 100644 0001-devicepanic-Don-t-return-empty-model-list-bz-1505532.patch

diff --git a/0001-devicepanic-Don-t-return-empty-model-list-bz-1505532.patch b/0001-devicepanic-Don-t-return-empty-model-list-bz-1505532.patch
new file mode 100644
index 0000000..b64ea43
--- /dev/null
+++ b/0001-devicepanic-Don-t-return-empty-model-list-bz-1505532.patch
@@ -0,0 +1,34 @@
+From: Cole Robinson <crobinso@redhat.com>
+Date: Fri, 27 Oct 2017 09:42:54 +0200
+Subject: [PATCH virt-manager] devicepanic: Don't return empty model list (bz
+ #1505532)
+
+Callers don't expect it, and it breaks opening the addhardware dialog
+for aarch64 VMs
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1505532
+(cherry picked from commit f7c8cf9f667f2b0122f5689009d74c94c38c7316)
+---
+ virtinst/devicepanic.py | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/virtinst/devicepanic.py b/virtinst/devicepanic.py
+index 63a88f71..9f44e93e 100644
+--- a/virtinst/devicepanic.py
++++ b/virtinst/devicepanic.py
+@@ -49,12 +49,13 @@ class VirtualPanicDevice(VirtualDevice):
+     @staticmethod
+     def get_models(os):
+         if os.is_x86():
+-            return [VirtualPanicDevice.MODEL_ISA, VirtualPanicDevice.MODEL_HYPERV]
++            return [VirtualPanicDevice.MODEL_ISA,
++                    VirtualPanicDevice.MODEL_HYPERV]
+         elif os.is_pseries():
+             return [VirtualPanicDevice.MODEL_PSERIES]
+         elif os.is_s390x():
+             return [VirtualPanicDevice.MODEL_S390]
+-        return None
++        return []
+ 
+     @staticmethod
+     def get_default_model(os):
diff --git a/virt-manager.spec b/virt-manager.spec
index f4c0093..6a25d49 100644
--- a/virt-manager.spec
+++ b/virt-manager.spec
@@ -19,8 +19,8 @@
 # End local config
 
 Name: virt-manager
-Version: 1.5.0
-Release: 1%{?dist}
+Version: 1.4.3
+Release: 3%{?dist}
 %global verrel %{version}-%{release}
 
 Summary: Desktop tool for managing virtual machines via libvirt
@@ -30,6 +30,9 @@ BuildArch: noarch
 URL: http://virt-manager.org/
 Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz
 
+# Fix 'Add Hardware' wizard for non-x86 guests (bz #1505532)
+Patch0001: 0001-devicepanic-Don-t-return-empty-model-list-bz-1505532.patch
+
 
 Requires: virt-manager-common = %{verrel}
 Requires: pygobject3
@@ -80,8 +83,6 @@ Requires: python-ipaddr
 Requires: libosinfo >= 0.2.10
 # Required for gobject-introspection infrastructure
 Requires: pygobject3-base
-# Required for pulling files from iso media with isoinfo
-Requires: genisoimage
 
 %description common
 Common files used by the different virt-manager interfaces, as well as
@@ -110,6 +111,9 @@ machine).
 %prep
 %setup -q
 
+# Fix 'Add Hardware' wizard for non-x86 guests (bz #1505532)
+%patch0001 -p1
+
 
 %build
 %if %{qemu_user}
@@ -213,28 +217,6 @@ rm %{buildroot}%{_datadir}/GConf/gsettings/org.virt-manager.virt-manager.convert
 
 
 %changelog
-* Tue Feb 06 2018 Cole Robinson <crobinso@redhat.com> - 1.5.0-1
-- Rebased to version 1.5.0
-- python3 prep work (Radostin Stoyanov, Cole Robinson, Cédric Bosdonnat)
-- Switch --location ISO to use isoinfo (Andrew Wong)
-- virt-install: add --cpu numa distance handling (Menno Lageman)
-- virt-install: fix --disk for rbd volumes with auth (Rauno Väli)
-- virt-install: add --cputune vcpupin handling (Wim ten Have)
-- details ui: Showing attached scsi devices per controller (Lin Ma)
-- network ui: Show details about SR-IOV VF pool (Lin Ma)
-- Greatly expand UI test suite coverage
-
-* Tue Feb 06 2018 Cole Robinson <crobinso@redhat.com> - 1.5.0-1
-- Rebased to version 1.5.0
-- python3 prep work (Radostin Stoyanov, Cole Robinson, Cédric Bosdonnat)
-- Switch --location ISO to use isoinfo (Andrew Wong)
-- virt-install: add --cpu numa distance handling (Menno Lageman)
-- virt-install: fix --disk for rbd volumes with auth (Rauno Väli)
-- virt-install: add --cputune vcpupin handling (Wim ten Have)
-- details ui: Showing attached scsi devices per controller (Lin Ma)
-- network ui: Show details about SR-IOV VF pool (Lin Ma)
-- Greatly expand UI test suite coverage
-
 * Fri Jan 05 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.4.3-3
 - Remove obsolete scriptlets