pool/virt-manager
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- Replace downstream patch with upstream version (bsc#1203252)

Browse Source 
67832d30-addhardware-Fix-backtrace-when-controller-index-is-None.patch
  Drop virtman-fix-uninitialized-controller-index.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=590
This commit is contained in:
Charles Arnold 2023-01-20 21:43:34 +00:00 committed by Git OBS Bridge
parent 0aabe59115
commit 462bcf1fc7
4 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
67832d30-addhardware-Fix-backtrace-when-controller-index-is-None.patch Normal file
View File

@ -0,0 +1,26 @@
Subject: addhardware: Fix backtrace when controller.index is None
From: Cole Robinson crobinso@redhat.com Tue Dec 13 13:49:35 2022 -0500
Date: Tue Dec 13 13:49:35 2022 -0500:
Git: 67832d3097cd6451833c30452d6991896e05933c
When creating a new VM, in the customize wizard we can't depend on
index= value being set (virtinst doesn't do it for example).
For example, this causes a backtrace when adding two virtio-scsi
controllers via the Customize wizard, or adding an extra
virtio-scsi controller to an aarch64 CDROM install.
Reported-by: Charles Arnold <carnold@suse.com>
Signed-off-by: Cole Robinson <crobinso@redhat.com>
--- a/virtManager/addhardware.py
+++ b/virtManager/addhardware.py
@@ -1560,7 +1560,7 @@ class vmmAddHardware(vmmGObjectUI):
controller_num = [x for x in controllers if
(x.type == controller_type)]
if len(controller_num) > 0:
- index_new = max([x.index for x in controller_num]) + 1
+ index_new = max(int(x.index or 0) for x in controller_num) + 1
dev.index = index_new
dev.type = controller_type

7
virt-manager.changes
View File

@ -7,6 +7,13 @@ Fri Jan 20 11:20:21 MST 2023 - carnold@suse.com
request alignment"
virtman-fix-shared-disk-request-alignment-error.patch
-------------------------------------------------------------------
Thu Jan 5 10:45:46 MST 2023 - carnold@suse.com
- Replace downstream patch with upstream version (bsc#1203252)
67832d30-addhardware-Fix-backtrace-when-controller-index-is-None.patch
Drop virtman-fix-uninitialized-controller-index.patch
-------------------------------------------------------------------
Mon Nov 28 12:28:44 MST 2022 - carnold@suse.com

2
virt-manager.spec
View File

@ -51,6 +51,7 @@ Patch7: c22a876e-tests-Add-a-compat-check-for-linux2020-in-amd-sev-test-
Patch8: fbdf0516-cli-cpu-Add-maxphysaddr.mode-bits-options.patch
Patch9: b0d05167-cloner-Sync-uuid-and-sysinfo-system-uuid.patch
Patch10: 999ccb85-virt-install-unattended-and-cloud-init-conflict.patch
Patch11: 67832d30-addhardware-Fix-backtrace-when-controller-index-is-None.patch
# SUSE Only
Patch70: virtman-desktop.patch
Patch71: virtman-kvm.patch
@ -84,7 +85,6 @@ Patch157: virtman-fix-restore-vm-menu-selection.patch
Patch158: virtman-disallow-adding-floppy-disk.patch
Patch159: virtman-register-delete-event-for-details-dialog.patch
Patch160: virtman-revert-use-of-AyatanaAppIndicator3.patch
Patch161: virtman-fix-uninitialized-controller-index.patch
Patch170: virtinst-xen-drive-type.patch
Patch171: virtinst-xenbus-disk-index-fix.patch
Patch172: virtinst-refresh_before_fetch_pool.patch

13
virtman-fix-uninitialized-controller-index.patch
View File

@ -1,13 +0,0 @@
References: bsc#1203252
--- virt-manager-4.1.0/virtManager/addhardware.py.orig 2022-11-15 07:49:08.318413181 -0700
+++ virt-manager-4.1.0/virtManager/addhardware.py 2022-11-15 07:49:48.126414130 -0700
@@ -1570,6 +1570,8 @@ class vmmAddHardware(vmmGObjectUI):
if len(controller_num) > 0:
index_new = max([x.index for x in controller_num]) + 1
dev.index = index_new
+ else:
+ dev.index = 0
dev.type = controller_type