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
31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
Subject: devicepanic: Don't return empty model list (bz #1505532)
|
|
From: Cole Robinson crobinso@redhat.com Fri Oct 27 09:42:54 2017 +0200
|
|
Date: Fri Oct 27 09:42:54 2017 +0200:
|
|
Git: f7c8cf9f667f2b0122f5689009d74c94c38c7316
|
|
|
|
Callers don't expect it, and it breaks opening the addhardware dialog
|
|
for aarch64 VMs
|
|
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1505532
|
|
|
|
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):
|