diff --git a/virt-manager-3.1.0.tar.bz2 b/virt-manager-3.1.0.tar.bz2 deleted file mode 100644 index aeaad05a..00000000 --- a/virt-manager-3.1.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:442c789b5527663a4da3403c999f6d9f331cf8919860da900d36342b05866cef -size 1623789 diff --git a/virt-manager-3.2.0.tar.bz2 b/virt-manager-3.2.0.tar.bz2 new file mode 100644 index 00000000..85f25751 --- /dev/null +++ b/virt-manager-3.2.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e858f393b74593dace3e19503a2e6b50e41fd512ee20545c0475199d912fb31e +size 1636046 diff --git a/virt-manager.changes b/virt-manager.changes index 00a30d09..b5c6a2da 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -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 diff --git a/virt-manager.spec b/virt-manager.spec index 91beeb8d..8de1c9bf 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -21,7 +21,7 @@ %global default_hvs "qemu,xen,lxc" Name: virt-manager -Version: 3.1.0 +Version: 3.2.0 Release: 0 Summary: Virtual Machine Manager 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 Patch158: virtman-disallow-adding-floppy-disk.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 Patch171: virtinst-xenbus-disk-index-fix.patch Patch172: virtinst-refresh_before_fetch_pool.patch @@ -189,7 +188,6 @@ machine). %patch157 -p1 %patch158 -p1 %patch159 -p1 -%patch160 -p1 %patch170 -p1 %patch171 -p1 %patch172 -p1 diff --git a/virtinst-add-pvh-support.patch b/virtinst-add-pvh-support.patch index d2e551b5..722931b4 100644 --- a/virtinst-add-pvh-support.patch +++ b/virtinst-add-pvh-support.patch @@ -1,10 +1,10 @@ References: fate#326698 - Add pvh support to virt-manager 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.1.0/virtManager/createvm.py +--- virt-manager-3.2.0.orig/virtManager/createvm.py ++++ virt-manager-3.2.0/virtManager/createvm.py @@ -836,6 +836,9 @@ class vmmCreateVM(vmmGObjectUI): break 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 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.1.0/virtinst/domain/os.py +--- virt-manager-3.2.0.orig/virtinst/domain/os.py ++++ virt-manager-3.2.0/virtinst/domain/os.py @@ -32,6 +32,8 @@ class DomainOs(XMLBuilder): return self.os_type == "hvm" def is_xenpv(self): @@ -28,10 +28,10 @@ Index: virt-manager-3.1.0/virtinst/domain/os.py def is_container(self): 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.1.0/virtinst/guest.py +--- virt-manager-3.2.0.orig/virtinst/guest.py ++++ virt-manager-3.2.0/virtinst/guest.py @@ -814,7 +814,7 @@ class Guest(XMLBuilder): usb_tablet = False @@ -41,11 +41,11 @@ Index: virt-manager-3.1.0/virtinst/guest.py usb_tablet = self.osinfo.supports_usbtablet() if (self.os.is_arm_machvirt() 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.1.0/virtManager/object/domain.py -@@ -1220,6 +1220,8 @@ class vmmDomain(vmmLibvirtObject): +--- virt-manager-3.2.0.orig/virtManager/object/domain.py ++++ virt-manager-3.2.0/virtManager/object/domain.py +@@ -1219,6 +1219,8 @@ class vmmDomain(vmmLibvirtObject): return self.get_xmlobj().os.is_xenpv() def is_hvm(self): 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): 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.1.0/virtManager/connection.py +--- virt-manager-3.2.0.orig/virtManager/connection.py ++++ virt-manager-3.2.0/virtManager/connection.py @@ -211,6 +211,8 @@ class vmmConnection(vmmGObject): label = "xen (paravirt)" elif gtype == "hvm": diff --git a/virtinst-change-location-for-grub_xen.patch b/virtinst-change-location-for-grub_xen.patch index a12bcb23..e5e7e8b9 100644 --- a/virtinst-change-location-for-grub_xen.patch +++ b/virtinst-change-location-for-grub_xen.patch @@ -1,10 +1,10 @@ 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.0.0/virtinst/install/installer.py -@@ -594,7 +594,10 @@ class Installer(object): +--- virt-manager-3.2.0.orig/virtinst/install/installer.py ++++ virt-manager-3.2.0/virtinst/install/installer.py +@@ -604,7 +604,10 @@ class Installer(object): guest.bootloader = "pygrub" else: 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") on_reboot_value = guest.on_reboot 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.0.0/virtManager/delete.py +--- virt-manager-3.2.0.orig/virtManager/delete.py ++++ virt-manager-3.2.0/virtManager/delete.py @@ -458,7 +458,7 @@ def _populate_storage_list(storage_list, model.clear() diff --git a/virtinst-graphics-add-check-for-qemu-modules-in-spice-graphic.patch b/virtinst-graphics-add-check-for-qemu-modules-in-spice-graphic.patch index 3d43c429..e590378b 100644 --- a/virtinst-graphics-add-check-for-qemu-modules-in-spice-graphic.patch +++ b/virtinst-graphics-add-check-for-qemu-modules-in-spice-graphic.patch @@ -20,10 +20,10 @@ Signed-off-by: Bruce Rogers virtinst/support.py | 1 + 2 files changed, 10 insertions(+) -diff --git a/virtinst/devices/graphics.py b/virtinst/devices/graphics.py -index a514b455..f5083e68 100644 ---- a/virtinst/devices/graphics.py -+++ b/virtinst/devices/graphics.py +Index: virt-manager-3.1.0/virtinst/devices/graphics.py +=================================================================== +--- virt-manager-3.1.0.orig/virtinst/devices/graphics.py ++++ virt-manager-3.1.0/virtinst/devices/graphics.py @@ -135,6 +135,15 @@ class DeviceGraphics(Device): # Spice has issues on some host arches, like ppc, so allow it if self.conn.caps.host.cpu.arch not in ["i686", "x86_64"]: @@ -40,11 +40,11 @@ index a514b455..f5083e68 100644 return True def _listen_need_port(self): -diff --git a/virtinst/support.py b/virtinst/support.py -index de73629e..29dad32b 100644 ---- a/virtinst/support.py -+++ b/virtinst/support.py -@@ -281,6 +281,7 @@ class SupportCache: +Index: virt-manager-3.1.0/virtinst/support.py +=================================================================== +--- virt-manager-3.1.0.orig/virtinst/support.py ++++ virt-manager-3.1.0/virtinst/support.py +@@ -282,6 +282,7 @@ class SupportCache: conn_disk_driver_name_qemu = _make( hv_version={"qemu": 0, "xen": "4.2.0"}, hv_libvirt_version={"qemu": 0, "xen": "1.1.0"}) @@ -52,6 +52,3 @@ index de73629e..29dad32b 100644 # Domain checks domain_xml_inactive = _make(function="virDomain.XMLDesc", run_args=(), --- -2.29.0 - diff --git a/virtinst-keep-install-iso-attached.patch b/virtinst-keep-install-iso-attached.patch index 86c9b818..dcf0dc03 100644 --- a/virtinst-keep-install-iso-attached.patch +++ b/virtinst-keep-install-iso-attached.patch @@ -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 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.0.0/virtinst/install/installer.py -@@ -166,7 +166,8 @@ class Installer(object): +--- virt-manager-3.2.0.orig/virtinst/install/installer.py ++++ virt-manager-3.2.0/virtinst/install/installer.py +@@ -167,7 +167,8 @@ class Installer(object): def _remove_install_cdrom_media(self, guest): if not self._install_cdrom_device_added: return diff --git a/virtinst-pvgrub2-bootloader.patch b/virtinst-pvgrub2-bootloader.patch index 5624d95d..37092d4f 100644 --- a/virtinst-pvgrub2-bootloader.patch +++ b/virtinst-pvgrub2-bootloader.patch @@ -2,11 +2,11 @@ Reference: bnc#863821 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 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.0.0/virtinst/install/installer.py -@@ -218,7 +218,8 @@ class Installer(object): +--- virt-manager-3.2.0.orig/virtinst/install/installer.py ++++ virt-manager-3.2.0/virtinst/install/installer.py +@@ -220,7 +220,8 @@ class Installer(object): def _alter_treemedia_bootconfig(self, guest): 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 if kernel: -@@ -584,6 +585,20 @@ class Installer(object): +@@ -594,6 +595,20 @@ class Installer(object): install_xml = None if self.has_install_phase(): install_xml = self._get_install_xml(guest, meter) diff --git a/virtinst-set-cache-mode-unsafe-for-install.patch b/virtinst-set-cache-mode-unsafe-for-install.patch index cf71a11d..fc4cecd3 100644 --- a/virtinst-set-cache-mode-unsafe-for-install.patch +++ b/virtinst-set-cache-mode-unsafe-for-install.patch @@ -1,10 +1,10 @@ Set cache mode for target installation disk to unsafe for better 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.0.0/virtinst/install/installer.py -@@ -570,11 +570,22 @@ class Installer(object): +--- virt-manager-3.2.0.orig/virtinst/install/installer.py ++++ virt-manager-3.2.0/virtinst/install/installer.py +@@ -580,11 +580,22 @@ class Installer(object): guest.memory) = data def _get_install_xml(self, guest, meter): diff --git a/virtinst-use-qemu-for-cdrom-device.patch b/virtinst-use-qemu-for-cdrom-device.patch index e4c4dcf1..8a5a051c 100644 --- a/virtinst-use-qemu-for-cdrom-device.patch +++ b/virtinst-use-qemu-for-cdrom-device.patch @@ -2,11 +2,11 @@ References: bsc#989639 When the device added is a cdrom device (/dev/sr0), don't use "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.0.0/virtinst/devices/disk.py -@@ -384,7 +384,8 @@ class DeviceDisk(Device): +--- virt-manager-3.2.0.orig/virtinst/devices/disk.py ++++ virt-manager-3.2.0/virtinst/devices/disk.py +@@ -527,7 +527,8 @@ class DeviceDisk(Device): # Recommended xen defaults from here: # https://bugzilla.redhat.com/show_bug.cgi?id=1171550#c9 # If type block, use name=phy. Otherwise do the same as qemu diff --git a/virtinst-vol-default-nocow.patch b/virtinst-vol-default-nocow.patch index df25a007..a3d67357 100644 --- a/virtinst-vol-default-nocow.patch +++ b/virtinst-vol-default-nocow.patch @@ -4,11 +4,11 @@ issue on btrfs. Signed-off-by: Chunyan Liu -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.0.0/virtinst/storage.py -@@ -569,6 +569,11 @@ class StorageVolume(_StorageObject): +--- virt-manager-3.2.0.orig/virtinst/storage.py ++++ virt-manager-3.2.0/virtinst/storage.py +@@ -570,6 +570,11 @@ class StorageVolume(_StorageObject): return self._pool_xml.get_disk_type() file_type = property(_get_vol_type) @@ -20,10 +20,10 @@ Index: virt-manager-3.0.0/virtinst/storage.py ################## # 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.0.0/virtinst/support.py +--- virt-manager-3.2.0.orig/virtinst/support.py ++++ virt-manager-3.2.0/virtinst/support.py @@ -269,6 +269,7 @@ class SupportCache: conn_vnc_none_auth = _make(hv_version={"qemu": "2.9.0"}) conn_device_boot_order = _make(hv_version={"qemu": 0, "test": 0}) diff --git a/virtinst-xen-drive-type.patch b/virtinst-xen-drive-type.patch index 52e2a3ea..ecd86222 100644 --- a/virtinst-xen-drive-type.patch +++ b/virtinst-xen-drive-type.patch @@ -2,11 +2,11 @@ Reference: bnc#813082 Virt-manager on Xen doesn't fill in any type thereby defaulting to '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.0.0/virtinst/devices/disk.py -@@ -401,6 +401,10 @@ class DeviceDisk(Device): +--- virt-manager-3.2.0.orig/virtinst/devices/disk.py ++++ virt-manager-3.2.0/virtinst/devices/disk.py +@@ -544,6 +544,10 @@ class DeviceDisk(Device): https://lists.gnu.org/archive/html/qemu-devel/2008-04/msg00675.html """ if self.driver_name != self.DRIVER_NAME_QEMU: diff --git a/virtinst-xenbus-disk-index-fix.patch b/virtinst-xenbus-disk-index-fix.patch index 8324654e..4098d4da 100644 --- a/virtinst-xenbus-disk-index-fix.patch +++ b/virtinst-xenbus-disk-index-fix.patch @@ -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 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.0.0/virtinst/devices/disk.py -@@ -850,6 +850,17 @@ class DeviceDisk(Device): +--- virt-manager-3.2.0.orig/virtinst/devices/disk.py ++++ virt-manager-3.2.0/virtinst/devices/disk.py +@@ -896,6 +896,17 @@ class DeviceDisk(Device): :returns: generated target """ 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.sort() -@@ -857,7 +868,12 @@ class DeviceDisk(Device): +@@ -903,7 +914,12 @@ class DeviceDisk(Device): first_found = None for i in range(maxnode): diff --git a/virtman-append-usr-sbin-to-search-path.patch b/virtman-append-usr-sbin-to-search-path.patch deleted file mode 100644 index e2d52a44..00000000 --- a/virtman-append-usr-sbin-to-search-path.patch +++ /dev/null @@ -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 - diff --git a/virtman-disallow-adding-floppy-disk.patch b/virtman-disallow-adding-floppy-disk.patch index 8d5ad044..ba839ced 100644 --- a/virtman-disallow-adding-floppy-disk.patch +++ b/virtman-disallow-adding-floppy-disk.patch @@ -4,11 +4,11 @@ in this patch anyways to correctly set up a bus if a floppy were 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.0.0/virtManager/addhardware.py -@@ -481,6 +481,9 @@ class vmmAddHardware(vmmGObjectUI): +--- virt-manager-3.2.0.orig/virtManager/addhardware.py ++++ virt-manager-3.2.0/virtManager/addhardware.py +@@ -480,6 +480,9 @@ class vmmAddHardware(vmmGObjectUI): buses = domcaps.devices.disk.get_enum("bus").get_values() else: buses = vmmAddHardware.disk_old_recommended_buses(guest) @@ -18,7 +18,7 @@ Index: virt-manager-3.0.0/virtManager/addhardware.py bus_map = { "disk": ["ide", "sata", "scsi", "sd", "usb", "virtio", "xen"], -@@ -500,6 +503,7 @@ class vmmAddHardware(vmmGObjectUI): +@@ -499,6 +502,7 @@ class vmmAddHardware(vmmGObjectUI): "usb": _("USB"), "virtio": _("VirtIO"), "xen": _("Xen"), @@ -26,7 +26,7 @@ Index: virt-manager-3.0.0/virtManager/addhardware.py } return bus_mappings.get(bus, bus) -@@ -681,8 +685,9 @@ class vmmAddHardware(vmmGObjectUI): +@@ -680,8 +684,9 @@ class vmmAddHardware(vmmGObjectUI): "drive-harddisk", _("Disk device")]) target_model.append([DeviceDisk.DEVICE_CDROM, "media-optical", _("CDROM device")]) diff --git a/virtman-fix-restore-vm-menu-selection.patch b/virtman-fix-restore-vm-menu-selection.patch index 669ab42c..7da0bfb1 100644 --- a/virtman-fix-restore-vm-menu-selection.patch +++ b/virtman-fix-restore-vm-menu-selection.patch @@ -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'. -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.1.0/virtManager/object/domain.py -@@ -1527,7 +1527,8 @@ class vmmDomain(vmmLibvirtObject): +--- virt-manager-3.2.0.orig/virtManager/object/domain.py ++++ virt-manager-3.2.0/virtManager/object/domain.py +@@ -1526,7 +1526,8 @@ class vmmDomain(vmmLibvirtObject): return (self.is_stoppable() or self.status() in [libvirt.VIR_DOMAIN_CRASHED]) def is_runable(self):