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 +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 2413634..a0f2828 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -20,7 +20,7 @@ Name: virt-manager Version: 1.4.3 -Release: 1%{?dist} +Release: 2%{?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 @@ -108,6 +111,9 @@ machine). %prep %setup -q +# Fix 'Add Hardware' wizard for non-x86 guests (bz #1505532) +%patch0001 -p1 + %build %if %{qemu_user} @@ -230,6 +236,9 @@ fi %changelog +* Tue Nov 21 2017 Cole Robinson - 1.4.3-2 +- Fix 'Add Hardware' wizard for non-x86 guests (bz #1505532) + * Tue Sep 19 2017 Cole Robinson - 1.4.3-1 - Rebased to version 1.4.3 - Improve install of debian/ubuntu non-x86 media (Viktor Mihajlovski, Andrew