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

- jsc#SLE-16582, Upgrade virt-manager >= 3.x

Browse Source 
* Slim down filesystem device editor UI
  * Fix TOCTTOU virt-install bugs (Martin Pitt)
  * Several other bug fixes
  virt-manager-3.2.0.tar.bz2
- Drop patches contained in new tarball
  1a1e4580-cloner-Explicitly-reject-network-disks-we-dont-know-how-to-clone.patch
  2773bc35-storagepool-cleanup-volumes-on-pool-cleanup.patch
  b1328202-devices-disk-Skip-check_path_search-for-path.patch
  virtman-append-usr-sbin-to-search-path.patch

- Upstream bug fixes (bsc#1027942)
  1a1e4580-cloner-Explicitly-reject-network-disks-we-dont-know-how-to-clone.patch
  2773bc35-storagepool-cleanup-volumes-on-pool-cleanup.patch
  b1328202-devices-disk-Skip-check_path_search-for-path.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=525
This commit is contained in:
Charles Arnold 2020-11-16 17:09:49 +00:00 committed by Git OBS Bridge
parent 9f737c10db
commit f88a913443
17 changed files with 101 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
virt-manager-3.1.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:442c789b5527663a4da3403c999f6d9f331cf8919860da900d36342b05866cef
size 1623789

3
virt-manager-3.2.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e858f393b74593dace3e19503a2e6b50e41fd512ee20545c0475199d912fb31e
size 1636046

22
virt-manager.changes
View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Mon Nov 16 09:57:34 MST 2020 - carnold@suse.com
- jsc#SLE-16582, Upgrade virt-manager >= 3.x
* Slim down filesystem device editor UI
* Fix TOCTTOU virt-install bugs (Martin Pitt)
* Several other bug fixes
virt-manager-3.2.0.tar.bz2
- Drop patches contained in new tarball
1a1e4580-cloner-Explicitly-reject-network-disks-we-dont-know-how-to-clone.patch
2773bc35-storagepool-cleanup-volumes-on-pool-cleanup.patch
b1328202-devices-disk-Skip-check_path_search-for-path.patch
virtman-append-usr-sbin-to-search-path.patch
-------------------------------------------------------------------
Wed Nov 11 09:06:35 MST 2020 - carnold@suse.com
- Upstream bug fixes (bsc#1027942)
1a1e4580-cloner-Explicitly-reject-network-disks-we-dont-know-how-to-clone.patch
2773bc35-storagepool-cleanup-volumes-on-pool-cleanup.patch
b1328202-devices-disk-Skip-check_path_search-for-path.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Oct 30 14:03:50 MDT 2020 - carnold@suse.com Fri Oct 30 14:03:50 MDT 2020 - carnold@suse.com

4
virt-manager.spec
View File

@ -21,7 +21,7 @@
%global default_hvs "qemu,xen,lxc" %global default_hvs "qemu,xen,lxc"
Name: virt-manager Name: virt-manager
Version: 3.1.0 Version: 3.2.0
Release: 0 Release: 0
Summary: Virtual Machine Manager Summary: Virtual Machine Manager
License: GPL-2.0-or-later License: GPL-2.0-or-later
@ -64,7 +64,6 @@ Patch156: virtman-dont-specify-gtksource-version.patch
Patch157: virtman-fix-restore-vm-menu-selection.patch Patch157: virtman-fix-restore-vm-menu-selection.patch
Patch158: virtman-disallow-adding-floppy-disk.patch Patch158: virtman-disallow-adding-floppy-disk.patch
Patch159: virtman-register-delete-event-for-details-dialog.patch Patch159: virtman-register-delete-event-for-details-dialog.patch
Patch160: virtman-append-usr-sbin-to-search-path.patch
Patch170: virtinst-xen-drive-type.patch Patch170: virtinst-xen-drive-type.patch
Patch171: virtinst-xenbus-disk-index-fix.patch Patch171: virtinst-xenbus-disk-index-fix.patch
Patch172: virtinst-refresh_before_fetch_pool.patch Patch172: virtinst-refresh_before_fetch_pool.patch
@ -189,7 +188,6 @@ machine).
%patch157 -p1 %patch157 -p1
%patch158 -p1 %patch158 -p1
%patch159 -p1 %patch159 -p1
%patch160 -p1
%patch170 -p1 %patch170 -p1
%patch171 -p1 %patch171 -p1
%patch172 -p1 %patch172 -p1

32
virtinst-add-pvh-support.patch
View File

@ -1,10 +1,10 @@
References: fate#326698 - Add pvh support to virt-manager References: fate#326698 - Add pvh support to virt-manager
At this time support is disabled in this patch. At this time support is disabled in this patch.
Index: virt-manager-3.1.0/virtManager/createvm.py Index: virt-manager-3.2.0/virtManager/createvm.py
=================================================================== ===================================================================
--- virt-manager-3.1.0.orig/virtManager/createvm.py --- virt-manager-3.2.0.orig/virtManager/createvm.py
+++ virt-manager-3.1.0/virtManager/createvm.py +++ virt-manager-3.2.0/virtManager/createvm.py
@@ -836,6 +836,9 @@ class vmmCreateVM(vmmGObjectUI): @@ -836,6 +836,9 @@ class vmmCreateVM(vmmGObjectUI):
break break
if label is None: if label is None:
@ -15,10 +15,10 @@ Index: virt-manager-3.1.0/virtManager/createvm.py
# Determine if this is the default given by guest_lookup # Determine if this is the default given by guest_lookup
if (gtype == self._capsinfo.os_type and if (gtype == self._capsinfo.os_type and
Index: virt-manager-3.1.0/virtinst/domain/os.py Index: virt-manager-3.2.0/virtinst/domain/os.py
=================================================================== ===================================================================
--- virt-manager-3.1.0.orig/virtinst/domain/os.py --- virt-manager-3.2.0.orig/virtinst/domain/os.py
+++ virt-manager-3.1.0/virtinst/domain/os.py +++ virt-manager-3.2.0/virtinst/domain/os.py
@@ -32,6 +32,8 @@ class DomainOs(XMLBuilder): @@ -32,6 +32,8 @@ class DomainOs(XMLBuilder):
return self.os_type == "hvm" return self.os_type == "hvm"
def is_xenpv(self): def is_xenpv(self):
@ -28,10 +28,10 @@ Index: virt-manager-3.1.0/virtinst/domain/os.py
def is_container(self): def is_container(self):
return self.os_type == "exe" return self.os_type == "exe"
Index: virt-manager-3.1.0/virtinst/guest.py Index: virt-manager-3.2.0/virtinst/guest.py
=================================================================== ===================================================================
--- virt-manager-3.1.0.orig/virtinst/guest.py --- virt-manager-3.2.0.orig/virtinst/guest.py
+++ virt-manager-3.1.0/virtinst/guest.py +++ virt-manager-3.2.0/virtinst/guest.py
@@ -814,7 +814,7 @@ class Guest(XMLBuilder): @@ -814,7 +814,7 @@ class Guest(XMLBuilder):
usb_tablet = False usb_tablet = False
@ -41,11 +41,11 @@ Index: virt-manager-3.1.0/virtinst/guest.py
usb_tablet = self.osinfo.supports_usbtablet() usb_tablet = self.osinfo.supports_usbtablet()
if (self.os.is_arm_machvirt() or if (self.os.is_arm_machvirt() or
self.os.is_riscv_virt() or self.os.is_riscv_virt() or
Index: virt-manager-3.1.0/virtManager/object/domain.py Index: virt-manager-3.2.0/virtManager/object/domain.py
=================================================================== ===================================================================
--- virt-manager-3.1.0.orig/virtManager/object/domain.py --- virt-manager-3.2.0.orig/virtManager/object/domain.py
+++ virt-manager-3.1.0/virtManager/object/domain.py +++ virt-manager-3.2.0/virtManager/object/domain.py
@@ -1220,6 +1220,8 @@ class vmmDomain(vmmLibvirtObject): @@ -1219,6 +1219,8 @@ class vmmDomain(vmmLibvirtObject):
return self.get_xmlobj().os.is_xenpv() return self.get_xmlobj().os.is_xenpv()
def is_hvm(self): def is_hvm(self):
return self.get_xmlobj().os.is_hvm() return self.get_xmlobj().os.is_hvm()
@ -54,10 +54,10 @@ Index: virt-manager-3.1.0/virtManager/object/domain.py
def get_uuid(self): def get_uuid(self):
if self._uuid is None: if self._uuid is None:
Index: virt-manager-3.1.0/virtManager/connection.py Index: virt-manager-3.2.0/virtManager/connection.py
=================================================================== ===================================================================
--- virt-manager-3.1.0.orig/virtManager/connection.py --- virt-manager-3.2.0.orig/virtManager/connection.py
+++ virt-manager-3.1.0/virtManager/connection.py +++ virt-manager-3.2.0/virtManager/connection.py
@@ -211,6 +211,8 @@ class vmmConnection(vmmGObject): @@ -211,6 +211,8 @@ class vmmConnection(vmmGObject):
label = "xen (paravirt)" label = "xen (paravirt)"
elif gtype == "hvm": elif gtype == "hvm":

14
virtinst-change-location-for-grub_xen.patch
View File

@ -1,10 +1,10 @@
References: fate#326960, bsc#1123942 References: fate#326960, bsc#1123942
Index: virt-manager-3.0.0/virtinst/install/installer.py Index: virt-manager-3.2.0/virtinst/install/installer.py
=================================================================== ===================================================================
--- virt-manager-3.0.0.orig/virtinst/install/installer.py --- virt-manager-3.2.0.orig/virtinst/install/installer.py
+++ virt-manager-3.0.0/virtinst/install/installer.py +++ virt-manager-3.2.0/virtinst/install/installer.py
@@ -594,7 +594,10 @@ class Installer(object): @@ -604,7 +604,10 @@ class Installer(object):
guest.bootloader = "pygrub" guest.bootloader = "pygrub"
else: else:
guest.bootloader = None guest.bootloader = None
@ -16,10 +16,10 @@ Index: virt-manager-3.0.0/virtinst/install/installer.py
log.debug("Using grub.xen to boot guest") log.debug("Using grub.xen to boot guest")
on_reboot_value = guest.on_reboot on_reboot_value = guest.on_reboot
self._alter_bootconfig(guest) self._alter_bootconfig(guest)
Index: virt-manager-3.0.0/virtManager/delete.py Index: virt-manager-3.2.0/virtManager/delete.py
=================================================================== ===================================================================
--- virt-manager-3.0.0.orig/virtManager/delete.py --- virt-manager-3.2.0.orig/virtManager/delete.py
+++ virt-manager-3.0.0/virtManager/delete.py +++ virt-manager-3.2.0/virtManager/delete.py
@@ -458,7 +458,7 @@ def _populate_storage_list(storage_list, @@ -458,7 +458,7 @@ def _populate_storage_list(storage_list,
model.clear() model.clear()

21
virtinst-graphics-add-check-for-qemu-modules-in-spice-graphic.patch
View File

@ -20,10 +20,10 @@ Signed-off-by: Bruce Rogers <brogers@suse.com>
virtinst/support.py | 1 + virtinst/support.py | 1 +
2 files changed, 10 insertions(+) 2 files changed, 10 insertions(+)
diff --git a/virtinst/devices/graphics.py b/virtinst/devices/graphics.py Index: virt-manager-3.1.0/virtinst/devices/graphics.py
index a514b455..f5083e68 100644 ===================================================================
--- a/virtinst/devices/graphics.py --- virt-manager-3.1.0.orig/virtinst/devices/graphics.py
+++ b/virtinst/devices/graphics.py +++ virt-manager-3.1.0/virtinst/devices/graphics.py
@@ -135,6 +135,15 @@ class DeviceGraphics(Device): @@ -135,6 +135,15 @@ class DeviceGraphics(Device):
# Spice has issues on some host arches, like ppc, so allow it # Spice has issues on some host arches, like ppc, so allow it
if self.conn.caps.host.cpu.arch not in ["i686", "x86_64"]: if self.conn.caps.host.cpu.arch not in ["i686", "x86_64"]:
@ -40,11 +40,11 @@ index a514b455..f5083e68 100644
return True return True
def _listen_need_port(self): def _listen_need_port(self):
diff --git a/virtinst/support.py b/virtinst/support.py Index: virt-manager-3.1.0/virtinst/support.py
index de73629e..29dad32b 100644 ===================================================================
--- a/virtinst/support.py --- virt-manager-3.1.0.orig/virtinst/support.py
+++ b/virtinst/support.py +++ virt-manager-3.1.0/virtinst/support.py
@@ -281,6 +281,7 @@ class SupportCache: @@ -282,6 +282,7 @@ class SupportCache:
conn_disk_driver_name_qemu = _make( conn_disk_driver_name_qemu = _make(
hv_version={"qemu": 0, "xen": "4.2.0"}, hv_version={"qemu": 0, "xen": "4.2.0"},
hv_libvirt_version={"qemu": 0, "xen": "1.1.0"}) hv_libvirt_version={"qemu": 0, "xen": "1.1.0"})
@ -52,6 +52,3 @@ index de73629e..29dad32b 100644
# Domain checks # Domain checks
domain_xml_inactive = _make(function="virDomain.XMLDesc", run_args=(), domain_xml_inactive = _make(function="virDomain.XMLDesc", run_args=(),
--
2.29.0

8
virtinst-keep-install-iso-attached.patch
View File

@ -2,11 +2,11 @@ Older SLE guests have a two stage installation that need the ISO.
Newer SLE PV guests hang when a cdrom device is attached without Newer SLE PV guests hang when a cdrom device is attached without
an ISO file. an ISO file.
Index: virt-manager-3.0.0/virtinst/install/installer.py Index: virt-manager-3.2.0/virtinst/install/installer.py
=================================================================== ===================================================================
--- virt-manager-3.0.0.orig/virtinst/install/installer.py --- virt-manager-3.2.0.orig/virtinst/install/installer.py
+++ virt-manager-3.0.0/virtinst/install/installer.py +++ virt-manager-3.2.0/virtinst/install/installer.py
@@ -166,7 +166,8 @@ class Installer(object): @@ -167,7 +167,8 @@ class Installer(object):
def _remove_install_cdrom_media(self, guest): def _remove_install_cdrom_media(self, guest):
if not self._install_cdrom_device_added: if not self._install_cdrom_device_added:
return return

10
virtinst-pvgrub2-bootloader.patch
View File

@ -2,11 +2,11 @@ Reference: bnc#863821
grub.xen is required to boot PV VMs that use the BTRFS filesystem. grub.xen is required to boot PV VMs that use the BTRFS filesystem.
This patch forces the use of grub.xen (instead of using pygrub) for This patch forces the use of grub.xen (instead of using pygrub) for
suse distros SLE12GA, openSUSE 13.2, and newer. suse distros SLE12GA, openSUSE 13.2, and newer.
Index: virt-manager-3.0.0/virtinst/install/installer.py Index: virt-manager-3.2.0/virtinst/install/installer.py
=================================================================== ===================================================================
--- virt-manager-3.0.0.orig/virtinst/install/installer.py --- virt-manager-3.2.0.orig/virtinst/install/installer.py
+++ virt-manager-3.0.0/virtinst/install/installer.py +++ virt-manager-3.2.0/virtinst/install/installer.py
@@ -218,7 +218,8 @@ class Installer(object): @@ -220,7 +220,8 @@ class Installer(object):
def _alter_treemedia_bootconfig(self, guest): def _alter_treemedia_bootconfig(self, guest):
if not self._treemedia: if not self._treemedia:
@ -16,7 +16,7 @@ Index: virt-manager-3.0.0/virtinst/install/installer.py
kernel, initrd, kernel_args = self._treemedia_bootconfig kernel, initrd, kernel_args = self._treemedia_bootconfig
if kernel: if kernel:
@@ -584,6 +585,20 @@ class Installer(object): @@ -594,6 +595,20 @@ class Installer(object):
install_xml = None install_xml = None
if self.has_install_phase(): if self.has_install_phase():
install_xml = self._get_install_xml(guest, meter) install_xml = self._get_install_xml(guest, meter)

8
virtinst-set-cache-mode-unsafe-for-install.patch
View File

@ -1,10 +1,10 @@
Set cache mode for target installation disk to unsafe for better Set cache mode for target installation disk to unsafe for better
performance. performance.
Index: virt-manager-3.0.0/virtinst/install/installer.py Index: virt-manager-3.2.0/virtinst/install/installer.py
=================================================================== ===================================================================
--- virt-manager-3.0.0.orig/virtinst/install/installer.py --- virt-manager-3.2.0.orig/virtinst/install/installer.py
+++ virt-manager-3.0.0/virtinst/install/installer.py +++ virt-manager-3.2.0/virtinst/install/installer.py
@@ -570,11 +570,22 @@ class Installer(object): @@ -580,11 +580,22 @@ class Installer(object):
guest.memory) = data guest.memory) = data
def _get_install_xml(self, guest, meter): def _get_install_xml(self, guest, meter):

8
virtinst-use-qemu-for-cdrom-device.patch
View File

@ -2,11 +2,11 @@ References: bsc#989639
When the device added is a cdrom device (/dev/sr0), don't use When the device added is a cdrom device (/dev/sr0), don't use
"phy" as the driver name but instead use "qemu". "phy" as the driver name but instead use "qemu".
Index: virt-manager-3.0.0/virtinst/devices/disk.py Index: virt-manager-3.2.0/virtinst/devices/disk.py
=================================================================== ===================================================================
--- virt-manager-3.0.0.orig/virtinst/devices/disk.py --- virt-manager-3.2.0.orig/virtinst/devices/disk.py
+++ virt-manager-3.0.0/virtinst/devices/disk.py +++ virt-manager-3.2.0/virtinst/devices/disk.py
@@ -384,7 +384,8 @@ class DeviceDisk(Device): @@ -527,7 +527,8 @@ class DeviceDisk(Device):
# Recommended xen defaults from here: # Recommended xen defaults from here:
# https://bugzilla.redhat.com/show_bug.cgi?id=1171550#c9 # https://bugzilla.redhat.com/show_bug.cgi?id=1171550#c9
# If type block, use name=phy. Otherwise do the same as qemu # If type block, use name=phy. Otherwise do the same as qemu

14
virtinst-vol-default-nocow.patch
View File

@ -4,11 +4,11 @@ issue on btrfs.
Signed-off-by: Chunyan Liu <cyliu@suse.com> Signed-off-by: Chunyan Liu <cyliu@suse.com>
Index: virt-manager-3.0.0/virtinst/storage.py Index: virt-manager-3.2.0/virtinst/storage.py
=================================================================== ===================================================================
--- virt-manager-3.0.0.orig/virtinst/storage.py --- virt-manager-3.2.0.orig/virtinst/storage.py
+++ virt-manager-3.0.0/virtinst/storage.py +++ virt-manager-3.2.0/virtinst/storage.py
@@ -569,6 +569,11 @@ class StorageVolume(_StorageObject): @@ -570,6 +570,11 @@ class StorageVolume(_StorageObject):
return self._pool_xml.get_disk_type() return self._pool_xml.get_disk_type()
file_type = property(_get_vol_type) file_type = property(_get_vol_type)
@ -20,10 +20,10 @@ Index: virt-manager-3.0.0/virtinst/storage.py
################## ##################
# XML properties # # XML properties #
Index: virt-manager-3.0.0/virtinst/support.py Index: virt-manager-3.2.0/virtinst/support.py
=================================================================== ===================================================================
--- virt-manager-3.0.0.orig/virtinst/support.py --- virt-manager-3.2.0.orig/virtinst/support.py
+++ virt-manager-3.0.0/virtinst/support.py +++ virt-manager-3.2.0/virtinst/support.py
@@ -269,6 +269,7 @@ class SupportCache: @@ -269,6 +269,7 @@ class SupportCache:
conn_vnc_none_auth = _make(hv_version={"qemu": "2.9.0"}) conn_vnc_none_auth = _make(hv_version={"qemu": "2.9.0"})
conn_device_boot_order = _make(hv_version={"qemu": 0, "test": 0}) conn_device_boot_order = _make(hv_version={"qemu": 0, "test": 0})

8
virtinst-xen-drive-type.patch
View File

@ -2,11 +2,11 @@ Reference: bnc#813082
Virt-manager on Xen doesn't fill in any type thereby defaulting to Virt-manager on Xen doesn't fill in any type thereby defaulting to
'raw'. This patch will generate the correct XML on Xen. 'raw'. This patch will generate the correct XML on Xen.
Index: virt-manager-3.0.0/virtinst/devices/disk.py Index: virt-manager-3.2.0/virtinst/devices/disk.py
=================================================================== ===================================================================
--- virt-manager-3.0.0.orig/virtinst/devices/disk.py --- virt-manager-3.2.0.orig/virtinst/devices/disk.py
+++ virt-manager-3.0.0/virtinst/devices/disk.py +++ virt-manager-3.2.0/virtinst/devices/disk.py
@@ -401,6 +401,10 @@ class DeviceDisk(Device): @@ -544,6 +544,10 @@ class DeviceDisk(Device):
https://lists.gnu.org/archive/html/qemu-devel/2008-04/msg00675.html https://lists.gnu.org/archive/html/qemu-devel/2008-04/msg00675.html
""" """
if self.driver_name != self.DRIVER_NAME_QEMU: if self.driver_name != self.DRIVER_NAME_QEMU:

10
virtinst-xenbus-disk-index-fix.patch
View File

@ -6,11 +6,11 @@ types (ide vs xen) it added xvda with hda. These disks were then
passed to qemu where it error'ed out with the disks having the same passed to qemu where it error'ed out with the disks having the same
index (in this case both are 0). index (in this case both are 0).
Index: virt-manager-3.0.0/virtinst/devices/disk.py Index: virt-manager-3.2.0/virtinst/devices/disk.py
=================================================================== ===================================================================
--- virt-manager-3.0.0.orig/virtinst/devices/disk.py --- virt-manager-3.2.0.orig/virtinst/devices/disk.py
+++ virt-manager-3.0.0/virtinst/devices/disk.py +++ virt-manager-3.2.0/virtinst/devices/disk.py
@@ -850,6 +850,17 @@ class DeviceDisk(Device): @@ -896,6 +896,17 @@ class DeviceDisk(Device):
:returns: generated target :returns: generated target
""" """
prefix, maxnode = self.get_target_prefix() prefix, maxnode = self.get_target_prefix()
@ -28,7 +28,7 @@ Index: virt-manager-3.0.0/virtinst/devices/disk.py
skip_targets = [t for t in skip_targets if t and t.startswith(prefix)] skip_targets = [t for t in skip_targets if t and t.startswith(prefix)]
skip_targets.sort() skip_targets.sort()
@@ -857,7 +868,12 @@ class DeviceDisk(Device): @@ -903,7 +914,12 @@ class DeviceDisk(Device):
first_found = None first_found = None
for i in range(maxnode): for i in range(maxnode):

19
virtman-append-usr-sbin-to-search-path.patch
View File

@ -1,19 +0,0 @@
References: bsc#1177763
When virt-manager is launched by a user (non-root) for the first
time and no connection was previously defined, the user path
typically does not have /usr/sbin and will therefore fail to find
the installed libvirtd.
--- virt-manager-3.1.0/virtManager/lib/connectauth.py.orig 2020-10-23 13:18:59.894366558 -0600
+++ virt-manager-3.1.0/virtManager/lib/connectauth.py 2020-10-23 13:20:03.050368102 -0600
@@ -204,7 +204,8 @@ def connect_error(conn, errmsg, tb, warn
##################################
def setup_first_uri(config, tryuri):
- libvirtd_installed = bool(shutil.which("libvirtd"))
+ # Add /usr/sbin to the path in case non-root user launches virt-manager
+ libvirtd_installed = bool(shutil.which("libvirtd", path=os.environ['PATH'] + os.pathsep + "/usr/sbin"))
if config.CLITestOptions.fake_no_libvirtd:
libvirtd_installed = False

12
virtman-disallow-adding-floppy-disk.patch
View File

@ -4,11 +4,11 @@ in this patch anyways to correctly set up a bus if a floppy were
added. added.
Index: virt-manager-3.0.0/virtManager/addhardware.py Index: virt-manager-3.2.0/virtManager/addhardware.py
=================================================================== ===================================================================
--- virt-manager-3.0.0.orig/virtManager/addhardware.py --- virt-manager-3.2.0.orig/virtManager/addhardware.py
+++ virt-manager-3.0.0/virtManager/addhardware.py +++ virt-manager-3.2.0/virtManager/addhardware.py
@@ -481,6 +481,9 @@ class vmmAddHardware(vmmGObjectUI): @@ -480,6 +480,9 @@ class vmmAddHardware(vmmGObjectUI):
buses = domcaps.devices.disk.get_enum("bus").get_values() buses = domcaps.devices.disk.get_enum("bus").get_values()
else: else:
buses = vmmAddHardware.disk_old_recommended_buses(guest) buses = vmmAddHardware.disk_old_recommended_buses(guest)
@ -18,7 +18,7 @@ Index: virt-manager-3.0.0/virtManager/addhardware.py
bus_map = { bus_map = {
"disk": ["ide", "sata", "scsi", "sd", "usb", "virtio", "xen"], "disk": ["ide", "sata", "scsi", "sd", "usb", "virtio", "xen"],
@@ -500,6 +503,7 @@ class vmmAddHardware(vmmGObjectUI): @@ -499,6 +502,7 @@ class vmmAddHardware(vmmGObjectUI):
"usb": _("USB"), "usb": _("USB"),
"virtio": _("VirtIO"), "virtio": _("VirtIO"),
"xen": _("Xen"), "xen": _("Xen"),
@ -26,7 +26,7 @@ Index: virt-manager-3.0.0/virtManager/addhardware.py
} }
return bus_mappings.get(bus, bus) return bus_mappings.get(bus, bus)
@@ -681,8 +685,9 @@ class vmmAddHardware(vmmGObjectUI): @@ -680,8 +684,9 @@ class vmmAddHardware(vmmGObjectUI):
"drive-harddisk", _("Disk device")]) "drive-harddisk", _("Disk device")])
target_model.append([DeviceDisk.DEVICE_CDROM, target_model.append([DeviceDisk.DEVICE_CDROM,
"media-optical", _("CDROM device")]) "media-optical", _("CDROM device")])

8
virtman-fix-restore-vm-menu-selection.patch
View File

@ -3,11 +3,11 @@ virt-manager no longer tracks the saved state but leaves it up to libvirt.
Libvirt returns libvirt.VIR_DOMAIN_PMSUSPENDED after a vm has been 'saved'. Libvirt returns libvirt.VIR_DOMAIN_PMSUSPENDED after a vm has been 'saved'.
Index: virt-manager-3.1.0/virtManager/object/domain.py Index: virt-manager-3.2.0/virtManager/object/domain.py
=================================================================== ===================================================================
--- virt-manager-3.1.0.orig/virtManager/object/domain.py --- virt-manager-3.2.0.orig/virtManager/object/domain.py
+++ virt-manager-3.1.0/virtManager/object/domain.py +++ virt-manager-3.2.0/virtManager/object/domain.py
@@ -1527,7 +1527,8 @@ class vmmDomain(vmmLibvirtObject): @@ -1526,7 +1526,8 @@ class vmmDomain(vmmLibvirtObject):
return (self.is_stoppable() or return (self.is_stoppable() or
self.status() in [libvirt.VIR_DOMAIN_CRASHED]) self.status() in [libvirt.VIR_DOMAIN_CRASHED])
def is_runable(self): def is_runable(self):