Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package virt-manager for openSUSE:Factory checked in at 2026-01-09 17:03:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virt-manager (Old) and /work/SRC/openSUSE:Factory/.virt-manager.new.1928 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virt-manager" Fri Jan 9 17:03:06 2026 rev:284 rq:1326011 version:5.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/virt-manager/virt-manager.changes 2025-12-11 18:32:26.935071893 +0100 +++ /work/SRC/openSUSE:Factory/.virt-manager.new.1928/virt-manager.changes 2026-01-09 17:03:33.112097570 +0100 @@ -1,0 +2,18 @@ +Wed Jan 7 13:32:03 MST 2026 - [email protected] + +- Upstream features and bug fixes (bsc#1027942) (jsc#PED-14625) + 003-virtinst-cloudinit-include-empty-meta-data-file.patch + 009-avoid-NoneType-pixbuf.patch + 012-virtManager-wrapped-details-hw-panel-with-GtkScrolledWindow.patch + 013-virtinst-interface-add-support-for-backend.hostname-and-backend.fqdn.patch + 014-virtinst-add-support-for-acpi-generic-initiator.patch + 015-virtinst-add-support-for-pcihole64.patch + 017-maint-use-constants-instead-of-strings-for-boot-devices.patch + 018-virtinst-rework-get_boot_order.patch + 019-virtinst-guest-introduce-can_use_device_boot_order.patch + 020-virtinst-remove-legacy-attribute-from-set_boot_order-get_boot_order.patch + 021-installer-add-support-to-use-device-boot-order.patch + 024-virtinst-Fix-XDG_DATA_HOME-handling.patch +- Dropped virtinst-fix-XDG_DATA_HOME-handling.patch + +------------------------------------------------------------------- Old: ---- virtinst-fix-XDG_DATA_HOME-handling.patch New: ---- 003-virtinst-cloudinit-include-empty-meta-data-file.patch 009-avoid-NoneType-pixbuf.patch 012-virtManager-wrapped-details-hw-panel-with-GtkScrolledWindow.patch 013-virtinst-interface-add-support-for-backend.hostname-and-backend.fqdn.patch 014-virtinst-add-support-for-acpi-generic-initiator.patch 015-virtinst-add-support-for-pcihole64.patch 017-maint-use-constants-instead-of-strings-for-boot-devices.patch 018-virtinst-rework-get_boot_order.patch 019-virtinst-guest-introduce-can_use_device_boot_order.patch 020-virtinst-remove-legacy-attribute-from-set_boot_order-get_boot_order.patch 021-installer-add-support-to-use-device-boot-order.patch 024-virtinst-Fix-XDG_DATA_HOME-handling.patch ----------(Old B)---------- Old: 024-virtinst-Fix-XDG_DATA_HOME-handling.patch - Dropped virtinst-fix-XDG_DATA_HOME-handling.patch ----------(Old E)---------- ----------(New B)---------- New:- Upstream features and bug fixes (bsc#1027942) (jsc#PED-14625) 003-virtinst-cloudinit-include-empty-meta-data-file.patch 009-avoid-NoneType-pixbuf.patch New: 003-virtinst-cloudinit-include-empty-meta-data-file.patch 009-avoid-NoneType-pixbuf.patch 012-virtManager-wrapped-details-hw-panel-with-GtkScrolledWindow.patch New: 009-avoid-NoneType-pixbuf.patch 012-virtManager-wrapped-details-hw-panel-with-GtkScrolledWindow.patch 013-virtinst-interface-add-support-for-backend.hostname-and-backend.fqdn.patch New: 012-virtManager-wrapped-details-hw-panel-with-GtkScrolledWindow.patch 013-virtinst-interface-add-support-for-backend.hostname-and-backend.fqdn.patch 014-virtinst-add-support-for-acpi-generic-initiator.patch New: 013-virtinst-interface-add-support-for-backend.hostname-and-backend.fqdn.patch 014-virtinst-add-support-for-acpi-generic-initiator.patch 015-virtinst-add-support-for-pcihole64.patch New: 014-virtinst-add-support-for-acpi-generic-initiator.patch 015-virtinst-add-support-for-pcihole64.patch 017-maint-use-constants-instead-of-strings-for-boot-devices.patch New: 015-virtinst-add-support-for-pcihole64.patch 017-maint-use-constants-instead-of-strings-for-boot-devices.patch 018-virtinst-rework-get_boot_order.patch New: 017-maint-use-constants-instead-of-strings-for-boot-devices.patch 018-virtinst-rework-get_boot_order.patch 019-virtinst-guest-introduce-can_use_device_boot_order.patch New: 018-virtinst-rework-get_boot_order.patch 019-virtinst-guest-introduce-can_use_device_boot_order.patch 020-virtinst-remove-legacy-attribute-from-set_boot_order-get_boot_order.patch New: 019-virtinst-guest-introduce-can_use_device_boot_order.patch 020-virtinst-remove-legacy-attribute-from-set_boot_order-get_boot_order.patch 021-installer-add-support-to-use-device-boot-order.patch New: 020-virtinst-remove-legacy-attribute-from-set_boot_order-get_boot_order.patch 021-installer-add-support-to-use-device-boot-order.patch 024-virtinst-Fix-XDG_DATA_HOME-handling.patch New: 021-installer-add-support-to-use-device-boot-order.patch 024-virtinst-Fix-XDG_DATA_HOME-handling.patch - Dropped virtinst-fix-XDG_DATA_HOME-handling.patch ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-manager.spec ++++++ --- /var/tmp/diff_new_pack.WtY6yB/_old 2026-01-09 17:03:35.492196312 +0100 +++ /var/tmp/diff_new_pack.WtY6yB/_new 2026-01-09 17:03:35.496196478 +0100 @@ -1,7 +1,7 @@ # # spec file for package virt-manager # -# Copyright (c) 2025 SUSE LLC and contributors +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -49,6 +49,18 @@ Source2: virt-install.desktop Source3: virt-manager-supportconfig # Upstream Patches +Patch1: 003-virtinst-cloudinit-include-empty-meta-data-file.patch +Patch2: 009-avoid-NoneType-pixbuf.patch +Patch3: 012-virtManager-wrapped-details-hw-panel-with-GtkScrolledWindow.patch +Patch4: 013-virtinst-interface-add-support-for-backend.hostname-and-backend.fqdn.patch +Patch5: 014-virtinst-add-support-for-acpi-generic-initiator.patch +Patch6: 015-virtinst-add-support-for-pcihole64.patch +Patch7: 017-maint-use-constants-instead-of-strings-for-boot-devices.patch +Patch8: 018-virtinst-rework-get_boot_order.patch +Patch9: 019-virtinst-guest-introduce-can_use_device_boot_order.patch +Patch10: 020-virtinst-remove-legacy-attribute-from-set_boot_order-get_boot_order.patch +Patch11: 021-installer-add-support-to-use-device-boot-order.patch +Patch12: 024-virtinst-Fix-XDG_DATA_HOME-handling.patch # SUSE Only Patch150: virtman-desktop.patch Patch151: virtman-kvm.patch @@ -70,7 +82,6 @@ Patch225: virtinst-add-caasp-support.patch Patch226: virtinst-add-sle15-detection-support.patch Patch227: virtinst-media-detection.patch -Patch228: virtinst-fix-XDG_DATA_HOME-handling.patch # Bug Fixes Patch251: virtman-increase-setKeepAlive-count.patch Patch252: virtman-allow-destroy-from-shutdown-menu-of-crashed-vm.patch ++++++ 003-virtinst-cloudinit-include-empty-meta-data-file.patch ++++++ Subject: virtinst: cloudinit: include empty meta-data file From: Pavel Hrdina [email protected] Mon Sep 29 16:14:35 2025 +0200 Date: Wed Oct 1 06:38:27 2025 -0400: Git: ea71cf9a8a4161ce6e19eacf5f0d86d40ab74f23 Refactor creation of cloud-init config files introduced a bug where we stopped including empty meta-data file. Introduced-by: 5b2d0997a1d2d213b17c227169da64e2fa7d09a6 Fixes: https://github.com/virt-manager/virt-manager/issues/975 Signed-off-by: Pavel Hrdina <[email protected]> diff --git a/virtinst/install/cloudinit.py b/virtinst/install/cloudinit.py index 3f565f399..b2378fbfa 100644 --- a/virtinst/install/cloudinit.py +++ b/virtinst/install/cloudinit.py @@ -36,7 +36,7 @@ class _CloudInitConfig: def _create_file(self): content = self._content() - if not content: + if content is None: return None fileobj = tempfile.NamedTemporaryFile( ++++++ 009-avoid-NoneType-pixbuf.patch ++++++ Subject: Calling loader.close() before pixbuf assignment to avoid NoneType pixbuf From: ropbear [email protected] Fri Oct 31 17:41:15 2025 -0400 Date: Tue Nov 11 08:48:15 2025 +0100: Git: f907ede75bbcfd87cc49f18d0da3e0bfec3d29f8 In the case loader.close() has more parsing to do, get_pixbuf() can return a NoneType which causes issues in the snapshot view. Calling loader.close() before this allows for proper cleanup before calling get_pixbuf(). https://docs.gtk.org/gdk-pixbuf/method.PixbufLoader.close.html https://docs.gtk.org/gdk-pixbuf/method.PixbufLoader.get_pixbuf.html diff --git a/virtManager/details/snapshots.py b/virtManager/details/snapshots.py index 0d413a98d..f2b229f5e 100644 --- a/virtManager/details/snapshots.py +++ b/virtManager/details/snapshots.py @@ -32,8 +32,8 @@ mimemap = { def _make_screenshot_pixbuf(mime, sdata): loader = GdkPixbuf.PixbufLoader.new_with_mime_type(mime) loader.write(sdata) - pixbuf = loader.get_pixbuf() loader.close() + pixbuf = loader.get_pixbuf() maxsize = 450 ++++++ 012-virtManager-wrapped-details-hw-panel-with-GtkScrolledWindow.patch ++++++ ++++ 8537 lines (skipped) ++++++ 013-virtinst-interface-add-support-for-backend.hostname-and-backend.fqdn.patch ++++++ Subject: virtinst: interface: add support for backend.hostname and backend.fqdn From: Pavel Hrdina [email protected] Fri Nov 21 10:11:34 2025 +0100 Date: Fri Nov 21 10:18:56 2025 +0100: Git: d57e2e738f37444a48c1e762ee63114583d6348f Signed-off-by: Pavel Hrdina <[email protected]> diff --git a/tests/data/cli/compare/virt-install-many-devices.xml b/tests/data/cli/compare/virt-install-many-devices.xml index 9b8b3c6ba..5edca096d 100644 --- a/tests/data/cli/compare/virt-install-many-devices.xml +++ b/tests/data/cli/compare/virt-install-many-devices.xml @@ -680,6 +680,11 @@ <range start="5000" end="6000" to="5"/> </portForward> </interface> + <interface type="user"> + <backend type="passt" hostname="test" fqdn="test.example.com"/> + <mac address="00:11:22:33:44:55"/> + <model type="virtio"/> + </interface> <interface type="hostdev"> <mac address="00:11:22:33:44:55"/> <model type="virtio"/> diff --git a/tests/test_cli.py b/tests/test_cli.py index b371e604b..741f1b4c2 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -675,6 +675,7 @@ source.reservations.managed=no,source.reservations.source.type=unix,source.reser --network passt,portForward=8080 --network passt,portForward0=7000-8000/udp,portForward1=127.0.0.1:2222:22 --network passt,portForward0=2001:db8:ac10:fd01::1:10:3000-4000:30,portForward1=127.0.0.1:5000-6000:5 +--network passt,backend.hostname=test,backend.fqdn=test.example.com --network type=hostdev,source.address.type=pci,source.address.domain=0x0,source.address.bus=0x00,source.address.slot=0x07,source.address.function=0x0 --network hostdev=pci_0000_00_09_0 --network hostdev=0:0:4.0 diff --git a/virtinst/cli.py b/virtinst/cli.py index 1203b0c8d..ed97e8809 100644 --- a/virtinst/cli.py +++ b/virtinst/cli.py @@ -4272,6 +4272,8 @@ class ParserNetwork(VirtCLIParser): # Standard XML options cls.add_arg("type", "type", cb=cls.set_type_cb) cls.add_arg("backend.type", "backend.type") + cls.add_arg("backend.hostname", "backend.hostname") + cls.add_arg("backend.fqdn", "backend.fqdn") cls.add_arg("backend.logFile", "backend.logFile") cls.add_arg("trustGuestRxFilters", "trustGuestRxFilters", is_onoff=True) diff --git a/virtinst/devices/interface.py b/virtinst/devices/interface.py index 333b92eca..9d82ab586 100644 --- a/virtinst/devices/interface.py +++ b/virtinst/devices/interface.py @@ -132,6 +132,8 @@ class _Backend(XMLBuilder): XML_NAME = "backend" type = XMLProperty("./@type") + hostname = XMLProperty("./@hostname") + fqdn = XMLProperty("./@fqdn") logFile = XMLProperty("./@logFile", do_abspath=True) ++++++ 014-virtinst-add-support-for-acpi-generic-initiator.patch ++++++ Subject: virtinst: add support for acpi-generic-initiator From: Nathan Chen [email protected] Thu Oct 23 20:42:55 2025 -0700 Date: Fri Nov 21 10:43:04 2025 +0100: Git: 53df7b496b6fd0c1194608987d0de800da1e1c54 A minimal config to enable acpi-generic-initiator would be $ virt-install ...args... --hostdev net_00_1c_25_10_b1_e4,acpi.nodeset=0,2-4 Signed-off-by: Nathan Chen <[email protected]> diff --git a/tests/data/cli/compare/virt-install-many-devices.xml b/tests/data/cli/compare/virt-install-many-devices.xml index 5edca096d..83d0b948c 100644 --- a/tests/data/cli/compare/virt-install-many-devices.xml +++ b/tests/data/cli/compare/virt-install-many-devices.xml @@ -891,6 +891,7 @@ <address domain="0" bus="0" slot="25" function="0"/> </source> <rom bar="off"/> + <acpi nodeset="0,2"/> <boot order="4"/> </hostdev> <hostdev mode="subsystem" type="usb" managed="yes"> @@ -942,6 +943,7 @@ <address bus="0" target="0" unit="0"/> </source> <rom bar="on"/> + <acpi nodeset="0-2"/> </hostdev> <hostdev mode="subsystem" type="usb" managed="yes"> <source> diff --git a/tests/test_cli.py b/tests/test_cli.py index 741f1b4c2..da4fd3f45 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -741,7 +741,7 @@ source.reservations.managed=no,source.reservations.source.type=unix,source.reser --console pty,target_type=virtio ---hostdev net_00_1c_25_10_b1_e4,boot_order=4,rom_bar=off +--hostdev net_00_1c_25_10_b1_e4,boot_order=4,rom_bar=off,acpi.nodeset=0,2 --host-device usb_device_781_5151_2004453082054CA1BEEE --host-device 001.003 --hostdev 15:0.1 @@ -749,7 +749,7 @@ source.reservations.managed=no,source.reservations.source.type=unix,source.reser --hostdev 0:15:0.3,address.type=pci,address.zpci.uid=0xffff,address.zpci.fid=0xffffffff --host-device 0x062a:0x0001,driver_name=vfio --host-device 0483:2016 ---host-device pci_8086_2829_scsi_host_scsi_device_lun0,rom.bar=on +--host-device pci_8086_2829_scsi_host_scsi_device_lun0,rom.bar=on,acpi.nodeset=0-2 --hostdev usb_5_20 --hostdev usb_5_21 --hostdev wlan0,type=net --hostdev /dev/vdz,type=storage diff --git a/virtinst/cli.py b/virtinst/cli.py index ed97e8809..c9cb3fcfe 100644 --- a/virtinst/cli.py +++ b/virtinst/cli.py @@ -5284,6 +5284,7 @@ class ParserHostdev(VirtCLIParser): cls.add_arg("name", None, cb=cls.set_name_cb, lookup_cb=cls.name_lookup_cb) cls.add_arg("driver.name", "driver_name") cls.add_arg("rom.bar", "rom_bar", is_onoff=True) + cls.add_arg("acpi.nodeset", "acpi_nodeset", can_comma=True) cls.add_arg("source.startupPolicy", "startup_policy") diff --git a/virtinst/devices/hostdev.py b/virtinst/devices/hostdev.py index be9bf3eaf..43d5322f3 100644 --- a/virtinst/devices/hostdev.py +++ b/virtinst/devices/hostdev.py @@ -128,6 +128,7 @@ class DeviceHostdev(Device): driver_name = XMLProperty("./driver/@name") rom_bar = XMLProperty("./rom/@bar", is_onoff=True) + acpi_nodeset = XMLProperty("./acpi/@nodeset") # type=scsi handling scsi_adapter = XMLProperty("./source/adapter/@name") ++++++ 015-virtinst-add-support-for-pcihole64.patch ++++++ Subject: virtinst: add support for pcihole64 From: Nathan Chen [email protected] Fri Oct 24 21:39:45 2025 +0000 Date: Fri Nov 21 10:47:37 2025 +0100: Git: 411f019f81a03ca99c8fa480c8af0974e7d4179a A minimal config to specify high MMIO region size would be $ virt-install ...args... --controller pci,index=0,model=pcie-root,pcihole64=4294967296,pcihole64.unit=KiB Signed-off-by: Nathan Chen <[email protected]> diff --git a/tests/data/cli/compare/virt-install-many-devices.xml b/tests/data/cli/compare/virt-install-many-devices.xml index 83d0b948c..ddfbbe058 100644 --- a/tests/data/cli/compare/virt-install-many-devices.xml +++ b/tests/data/cli/compare/virt-install-many-devices.xml @@ -485,6 +485,7 @@ </controller> <controller type="pci" index="1" model="pci-root"> <target index="1"/> + <pcihole64 unit="KiB">4294967296</pcihole64> </controller> <controller type="pci" index="2" model="pci-bridge"> <target chassisNr="1" memReserve="8196"/> diff --git a/tests/test_cli.py b/tests/test_cli.py index da4fd3f45..99f4a59dc 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -703,7 +703,7 @@ source.reservations.managed=no,source.reservations.source.type=unix,source.reser --controller scsi,,model=virtio-scsi,driver_queues=4,driver.queues=4,driver.iothread=2,vectors=15 --controller xenbus,maxGrantFrames=64 --controller pci,index=0,model=pcie-root-port,target.chassis=1,target.port=1,target.hotplug=off ---controller pci,index=1,model=pci-root,target.index=1 +--controller pci,index=1,model=pci-root,target.index=1,pcihole64=4294967296,pcihole64.unit=KiB --controller pci,index=2,model=pci-bridge,target.chassisNr=1,target.memReserve=8196 --controller pci,index=3,model=pci-expander-bus,target.busNr=252,target.node=1 --controller usb3 diff --git a/virtinst/cli.py b/virtinst/cli.py index c9cb3fcfe..b1499ef67 100644 --- a/virtinst/cli.py +++ b/virtinst/cli.py @@ -4492,6 +4492,8 @@ class ParserController(VirtCLIParser): cls.add_arg("target.index", "target_index") cls.add_arg("target.node", "target_node") cls.add_arg("target.memReserve", "target_memReserve") + cls.add_arg("pcihole64", "pcihole64") + cls.add_arg("pcihole64.unit", "pcihole64_unit") cls.add_arg("address", None, lookup_cb=None, cb=cls.set_address_cb) cls.add_arg("num_pcie_root_ports", None, lookup_cb=None, cb=cls.noset_cb) diff --git a/virtinst/devices/controller.py b/virtinst/devices/controller.py index 754bcd666..f3c4ce61d 100644 --- a/virtinst/devices/controller.py +++ b/virtinst/devices/controller.py @@ -91,6 +91,8 @@ class DeviceController(Device): target_index = XMLProperty("./target/@index", is_int=True) target_node = XMLProperty("./target/node", is_int=True) target_memReserve = XMLProperty("./target/@memReserve", is_int=True) + pcihole64 = XMLProperty("./pcihole64", is_int=True) + pcihole64_unit = XMLProperty("./pcihole64/@unit") def _get_attached_disk_devices(self, guest): ret = [] ++++++ 017-maint-use-constants-instead-of-strings-for-boot-devices.patch ++++++ Subject: maint: use constants instead of strings for boot devices From: Pavel Hrdina [email protected] Fri Oct 17 16:32:33 2025 +0200 Date: Thu Dec 4 16:55:51 2025 +0100: Git: 161fb1baaff45f260b278e9df900293ab12da820 Signed-off-by: Pavel Hrdina <[email protected]> diff --git a/virtManager/details/details.py b/virtManager/details/details.py index 22a44719c..6cadf8bf0 100644 --- a/virtManager/details/details.py +++ b/virtManager/details/details.py @@ -2274,10 +2274,22 @@ class vmmDetails(vmmGObjectUI): def _make_boot_rows(self): if not self.vm.can_use_device_boot_order(): return [ - ["hd", _("Hard Disk"), "drive-harddisk", False, True], - ["cdrom", _("CDROM"), "media-optical", False, True], - ["network", _("Network (PXE)"), "network-idle", False, True], - ["fd", _("Floppy"), "media-floppy", False, True], + [ + virtinst.DomainOs.BOOT_DEVICE_HARDDISK, + _("Hard Disk"), + "drive-harddisk", + False, + True, + ], + [virtinst.DomainOs.BOOT_DEVICE_CDROM, _("CDROM"), "media-optical", False, True], + [ + virtinst.DomainOs.BOOT_DEVICE_NETWORK, + _("Network (PXE)"), + "network-idle", + False, + True, + ], + [virtinst.DomainOs.BOOT_DEVICE_FLOPPY, _("Floppy"), "media-floppy", False, True], ] ret = [] diff --git a/virtinst/cli.py b/virtinst/cli.py index b1499ef67..346043287 100644 --- a/virtinst/cli.py +++ b/virtinst/cli.py @@ -29,6 +29,7 @@ from .devices import ( DeviceHostdev, DeviceInterface, ) +from .domain import DomainOs from .guest import Guest from .logger import log, reset_logging from .nodedev import NodeDevice @@ -3214,10 +3215,10 @@ class ParserBoot(VirtCLIParser): # This is simply so the boot options are advertised with --boot help, # actual processing is handled by _parse - cls.add_arg("hd", None, lookup_cb=None, cb=cls.noset_cb) - cls.add_arg("cdrom", None, lookup_cb=None, cb=cls.noset_cb) - cls.add_arg("fd", None, lookup_cb=None, cb=cls.noset_cb) - cls.add_arg("network", None, lookup_cb=None, cb=cls.noset_cb) + cls.add_arg(DomainOs.BOOT_DEVICE_HARDDISK, None, lookup_cb=None, cb=cls.noset_cb) + cls.add_arg(DomainOs.BOOT_DEVICE_CDROM, None, lookup_cb=None, cb=cls.noset_cb) + cls.add_arg(DomainOs.BOOT_DEVICE_FLOPPY, None, lookup_cb=None, cb=cls.noset_cb) + cls.add_arg(DomainOs.BOOT_DEVICE_NETWORK, None, lookup_cb=None, cb=cls.noset_cb) cls.add_arg( "refresh-machine-type", diff --git a/virtinst/guest.py b/virtinst/guest.py index 54754d49a..b790a9c8d 100644 --- a/virtinst/guest.py +++ b/virtinst/guest.py @@ -469,13 +469,13 @@ class Guest(XMLBuilder): break for b in boot_order: - if b == "network" and net: + if b == DomainOs.BOOT_DEVICE_NETWORK and net: ret.append(net.get_xml_id()) - elif b == "hd" and disk: + elif b == DomainOs.BOOT_DEVICE_HARDDISK and disk: ret.append(disk.get_xml_id()) - elif b == "cdrom" and cdrom: + elif b == DomainOs.BOOT_DEVICE_CDROM and cdrom: ret.append(cdrom.get_xml_id()) - elif b == "fd" and floppy: + elif b == DomainOs.BOOT_DEVICE_FLOPPY and floppy: ret.append(floppy.get_xml_id()) return ret diff --git a/virtinst/install/installer.py b/virtinst/install/installer.py index 96250f61b..a507c3c7c 100644 --- a/virtinst/install/installer.py +++ b/virtinst/install/installer.py @@ -87,7 +87,7 @@ class Installer: if cdrom: cdrom = InstallerTreeMedia.validate_path(self.conn, cdrom) self._cdrom = cdrom - self._install_bootdev = "cdrom" + self._install_bootdev = DomainOs.BOOT_DEVICE_CDROM elif location or location_kernel or location_initrd or install_kernel or install_initrd: self._treemedia = InstallerTreeMedia( self.conn, @@ -226,7 +226,7 @@ class Installer: # windows virtio installs, and booting local disk from PXE) for disk in guest.devices.disk: if disk.device == disk.DEVICE_DISK: - bootdev = "hd" + bootdev = DomainOs.BOOT_DEVICE_HARDDISK if bootdev not in bootorder: bootorder.append(bootdev) break diff --git a/virtinst/virtinstall.py b/virtinst/virtinstall.py index 612f19a52..5e22931de 100644 --- a/virtinst/virtinstall.py +++ b/virtinst/virtinstall.py @@ -439,7 +439,7 @@ def build_installer(options, guest, installdata): if options.livecd: no_install = True elif options.pxe: - install_bootdev = "network" + install_bootdev = virtinst.DomainOs.BOOT_DEVICE_NETWORK elif installdata.is_set: pass elif options.xmlonly: ++++++ 018-virtinst-rework-get_boot_order.patch ++++++ Subject: virtinst: rework get_boot_order From: Pavel Hrdina [email protected] Thu Oct 30 15:38:26 2025 +0100 Date: Thu Dec 4 16:55:51 2025 +0100: Git: 25670b2ee8a31f4d66c75a5bd7f27bc742d1e545 Signed-off-by: Pavel Hrdina <[email protected]> diff --git a/virtinst/guest.py b/virtinst/guest.py index b790a9c8d..a9fbecaec 100644 --- a/virtinst/guest.py +++ b/virtinst/guest.py @@ -439,15 +439,11 @@ class Guest(XMLBuilder): # Bootorder helpers # ##################### - def _get_old_boot_order(self): - return self.os.bootorder - - def _convert_old_boot_order(self): + def _convert_old_boot_order(self, boot_order): """Converts the old boot order (e.g. <boot dev='hd'/>) into the per-device boot order format. """ - boot_order = self._get_old_boot_order() ret = [] disk = None cdrom = None @@ -486,18 +482,13 @@ class Guest(XMLBuilder): continue order.append((dev.get_xml_id(), dev.boot.order)) - if not order: - # No devices individually marked bootable, convert traditional - # boot XML to fine grained - return self._convert_old_boot_order() - order.sort(key=lambda p: p[1]) return [p[0] for p in order] def get_boot_order(self, legacy=False): if legacy: - return self._get_old_boot_order() - return self._get_device_boot_order() + return self.os.bootorder + return self._get_device_boot_order() or self._convert_old_boot_order(self.os.bootorder) def _set_device_boot_order(self, boot_order): """Sets the new device boot order for the domain""" ++++++ 019-virtinst-guest-introduce-can_use_device_boot_order.patch ++++++ Subject: virtinst: guest: introduce can_use_device_boot_order From: Pavel Hrdina [email protected] Tue Dec 2 21:39:14 2025 +0100 Date: Thu Dec 4 16:55:51 2025 +0100: Git: 3a25792d90d53ad81bfb4835a146d047a39ef1e5 Signed-off-by: Pavel Hrdina <[email protected]> diff --git a/virtManager/object/domain.py b/virtManager/object/domain.py index 6fc4f45ce..b8273ba7d 100644 --- a/virtManager/object/domain.py +++ b/virtManager/object/domain.py @@ -1396,7 +1396,7 @@ class vmmDomain(vmmLibvirtObject): def can_use_device_boot_order(self): # Return 'True' if guest can use new style boot device ordering - return self.conn.support.conn_device_boot_order() + return self.get_xmlobj().can_use_device_boot_order() def get_bootable_devices(self): # redirdev can also be marked bootable, but it should be rarely diff --git a/virtinst/guest.py b/virtinst/guest.py index a9fbecaec..d13049be0 100644 --- a/virtinst/guest.py +++ b/virtinst/guest.py @@ -475,6 +475,9 @@ class Guest(XMLBuilder): ret.append(floppy.get_xml_id()) return ret + def can_use_device_boot_order(self): + return self.conn.support.conn_device_boot_order() + def _get_device_boot_order(self): order = [] for dev in self.get_bootable_devices(): ++++++ 020-virtinst-remove-legacy-attribute-from-set_boot_order-get_boot_order.patch ++++++ Subject: virtinst: remove legacy attribute from set_boot_order/get_boot_order From: Pavel Hrdina [email protected] Wed Dec 3 15:30:49 2025 +0100 Date: Thu Dec 4 16:55:51 2025 +0100: Git: 3985b0746f79d108bab66a21b28e1ecf6e4c415f Only tests used manual value for the attribute, otherwise we always used what was detected by conn_device_boot_order() function. Remove that attribute and update tests to use unittest.mock.patch where needed. Signed-off-by: Pavel Hrdina <[email protected]> diff --git a/tests/test_xmlparse.py b/tests/test_xmlparse.py index 052850437..6e641f33f 100644 --- a/tests/test_xmlparse.py +++ b/tests/test_xmlparse.py @@ -3,6 +3,8 @@ # This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. +import unittest + import pytest import virtinst @@ -652,7 +654,8 @@ def testGuestBootorder(): guest, outfile = _get_test_content(kvmconn, "bootorder") assert guest.get_boot_order() == ["./devices/disk[1]"] - assert guest.get_boot_order(legacy=True) == ["hd"] + with unittest.mock.patch("virtinst.Guest.can_use_device_boot_order", return_value=False): + assert guest.get_boot_order() == ["hd"] legacy_order = ["hd", "fd", "cdrom", "network"] dev_order = [ @@ -661,13 +664,15 @@ def testGuestBootorder(): "./devices/disk[2]", "./devices/interface[1]", ] - guest.set_boot_order(legacy_order, legacy=True) + with unittest.mock.patch("virtinst.Guest.can_use_device_boot_order", return_value=False): + guest.set_boot_order(legacy_order) + assert guest.get_boot_order() == legacy_order assert guest.get_boot_order() == dev_order - assert guest.get_boot_order(legacy=True) == legacy_order guest.set_boot_order(dev_order) assert guest.get_boot_order() == dev_order - assert guest.get_boot_order(legacy=True) == [] + with unittest.mock.patch("virtinst.Guest.can_use_device_boot_order", return_value=False): + assert guest.get_boot_order() == [] _alter_compare(kvmconn, guest.get_xml(), outfile) diff --git a/virtManager/object/domain.py b/virtManager/object/domain.py index b8273ba7d..3e005c0f6 100644 --- a/virtManager/object/domain.py +++ b/virtManager/object/domain.py @@ -762,8 +762,7 @@ class vmmDomain(vmmLibvirtObject): guest = self._make_xmlobj_to_define() if boot_order != _SENTINEL: - legacy = not self.can_use_device_boot_order() - guest.set_boot_order(boot_order, legacy=legacy) + guest.set_boot_order(boot_order) if boot_menu != _SENTINEL: guest.os.bootmenu_enable = bool(boot_menu) @@ -1372,8 +1371,7 @@ class vmmDomain(vmmLibvirtObject): return self.get_xmlobj().description def get_boot_order(self): - legacy = not self.can_use_device_boot_order() - return self.xmlobj.get_boot_order(legacy=legacy) + return self.xmlobj.get_boot_order() def get_boot_menu(self): guest = self.get_xmlobj() diff --git a/virtinst/guest.py b/virtinst/guest.py index d13049be0..3f9eb0079 100644 --- a/virtinst/guest.py +++ b/virtinst/guest.py @@ -488,10 +488,10 @@ class Guest(XMLBuilder): order.sort(key=lambda p: p[1]) return [p[0] for p in order] - def get_boot_order(self, legacy=False): - if legacy: - return self.os.bootorder - return self._get_device_boot_order() or self._convert_old_boot_order(self.os.bootorder) + def get_boot_order(self): + if self.can_use_device_boot_order(): + return self._get_device_boot_order() or self._convert_old_boot_order(self.os.bootorder) + return self.os.bootorder def _set_device_boot_order(self, boot_order): """Sets the new device boot order for the domain""" @@ -506,12 +506,12 @@ class Guest(XMLBuilder): for boot_idx, dev_xml_id in enumerate(boot_order, 1): dev_map[dev_xml_id].boot.order = boot_idx - def set_boot_order(self, boot_order, legacy=False): + def set_boot_order(self, boot_order): """Modifies the boot order""" - if legacy: - self.os.bootorder = boot_order - else: + if self.can_use_device_boot_order(): self._set_device_boot_order(boot_order) + else: + self.os.bootorder = boot_order def reorder_boot_order(self, dev, boot_index): """Sets boot order of `dev` to `boot_index` ++++++ 021-installer-add-support-to-use-device-boot-order.patch ++++++ ++++ 2458 lines (skipped) ++++++ 024-virtinst-Fix-XDG_DATA_HOME-handling.patch ++++++ Subject: virtinst: Fix XDG_DATA_HOME handling From: Callum Farmer [email protected] Wed Nov 19 13:38:22 2025 +0000 Date: Thu Dec 11 09:43:06 2025 +0100: Git: 35ad9057fef319046ad1348097e2f813a52a9021 The default value of XDG_DATA_HOME should be ~/.local/share. It will not by default contain libvirt at the end of the path, so subsequently append libvirt after retrieving the value of XDG_DATA_HOME Signed-off-by: Callum Farmer <[email protected]> diff --git a/virtinst/connection.py b/virtinst/connection.py index f2fcdd0c3..b565f1b41 100644 --- a/virtinst/connection.py +++ b/virtinst/connection.py @@ -186,7 +186,8 @@ class VirtinstConnection: def get_libvirt_data_root_dir(self): if self.is_privileged(): return "/var/lib/libvirt" - return os.environ.get("XDG_DATA_HOME", os.path.expanduser("~/.local/share/libvirt")) + path = os.environ.get("XDG_DATA_HOME", os.path.expanduser("~/.local/share")) + return os.path.join(path, "libvirt") #################### # Polling routines # ++++++ virtinst-pvgrub2-bootloader.patch ++++++ --- /var/tmp/diff_new_pack.WtY6yB/_old 2026-01-09 17:03:36.272228673 +0100 +++ /var/tmp/diff_new_pack.WtY6yB/_new 2026-01-09 17:03:36.292229503 +0100 @@ -6,7 +6,7 @@ =================================================================== --- virt-manager-5.1.0.orig/virtinst/install/installer.py +++ virt-manager-5.1.0/virtinst/install/installer.py -@@ -241,7 +241,8 @@ class Installer: +@@ -240,7 +240,8 @@ class Installer: def _alter_treemedia_bootconfig(self, guest): if not self._treemedia: ++++++ virtinst-s390x-disable-graphics.patch ++++++ --- /var/tmp/diff_new_pack.WtY6yB/_old 2026-01-09 17:03:36.324230831 +0100 +++ /var/tmp/diff_new_pack.WtY6yB/_new 2026-01-09 17:03:36.332231162 +0100 @@ -16,7 +16,7 @@ self.skip_default_rng = False self.skip_default_tpm = False self.skip_default_input = False -@@ -1195,7 +1198,7 @@ class Guest(XMLBuilder): +@@ -1192,7 +1195,7 @@ class Guest(XMLBuilder): self.add_device(dev) def _add_default_video_device(self): ++++++ virtinst-set-cache-mode-unsafe-for-install.patch ++++++ --- /var/tmp/diff_new_pack.WtY6yB/_old 2026-01-09 17:03:36.372232822 +0100 +++ /var/tmp/diff_new_pack.WtY6yB/_new 2026-01-09 17:03:36.380233154 +0100 @@ -42,9 +42,9 @@ --- virt-manager-5.1.0.orig/tests/data/cli/compare/virt-install-cdrom-url.xml +++ virt-manager-5.1.0/tests/data/cli/compare/virt-install-cdrom-url.xml @@ -24,6 +24,7 @@ - </source> <target dev="hda" bus="ide"/> <readonly/> + <boot order="1"/> + <driver cache="unsafe"/> </disk> <controller type="usb" model="ich9-ehci1"/> @@ -53,7 +53,7 @@ =================================================================== --- virt-manager-5.1.0.orig/tests/data/cli/compare/virt-install-memory-hotplug.xml +++ virt-manager-5.1.0/tests/data/cli/compare/virt-install-memory-hotplug.xml -@@ -35,7 +35,7 @@ +@@ -33,7 +33,7 @@ <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type="file" device="disk"> @@ -61,15 +61,15 @@ + <driver name="qemu" type="qcow2" discard="unmap" cache="unsafe"/> <source file="/var/lib/libvirt/images/fedora.qcow2"/> <target dev="vda" bus="virtio"/> - </disk> + <boot order="2"/> Index: virt-manager-5.1.0/tests/data/cli/compare/virt-install-cdrom-double.xml =================================================================== --- virt-manager-5.1.0.orig/tests/data/cli/compare/virt-install-cdrom-double.xml +++ virt-manager-5.1.0/tests/data/cli/compare/virt-install-cdrom-double.xml -@@ -22,6 +22,7 @@ - <disk type="file" device="disk"> +@@ -21,6 +21,7 @@ <source file="/var/lib/libvirt/images/vm1.qcow2"/> <target dev="hda" bus="ide"/> + <boot order="2"/> + <driver cache="unsafe"/> </disk> <disk type="file" device="cdrom"> @@ -150,7 +150,7 @@ =================================================================== --- virt-manager-5.1.0.orig/tests/data/cli/compare/virt-install-osinfo-multiple-short-id.xml +++ virt-manager-5.1.0/tests/data/cli/compare/virt-install-osinfo-multiple-short-id.xml -@@ -31,7 +31,7 @@ +@@ -29,7 +29,7 @@ <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type="file" device="disk"> @@ -158,7 +158,7 @@ + <driver name="qemu" type="qcow2" cache="unsafe"/> <source file="/pool-dir/testvol1.img"/> <target dev="vda" bus="virtio"/> - </disk> + <boot order="2"/> Index: virt-manager-5.1.0/tests/data/cli/compare/virt-install-osinfo-url-with-disk.xml =================================================================== --- virt-manager-5.1.0.orig/tests/data/cli/compare/virt-install-osinfo-url-with-disk.xml @@ -176,7 +176,7 @@ =================================================================== --- virt-manager-5.1.0.orig/tests/data/cli/compare/virt-install-osinfo-win7-unattended.xml +++ virt-manager-5.1.0/tests/data/cli/compare/virt-install-osinfo-win7-unattended.xml -@@ -45,7 +45,7 @@ +@@ -44,7 +44,7 @@ <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type="file" device="cdrom"> @@ -189,10 +189,10 @@ =================================================================== --- virt-manager-5.1.0.orig/tests/data/cli/compare/virt-install-osvariant-defaults-pxe.xml +++ virt-manager-5.1.0/tests/data/cli/compare/virt-install-osvariant-defaults-pxe.xml -@@ -28,6 +28,7 @@ - <disk type="file" device="disk"> +@@ -27,6 +27,7 @@ <source file="/var/lib/libvirt/images/fedora26.qcow2"/> <target dev="hda" bus="ide"/> + <boot order="2"/> + <driver cache="unsafe"/> </disk> <controller type="usb" model="ich9-ehci1"/> @@ -214,7 +214,7 @@ =================================================================== --- virt-manager-5.1.0.orig/tests/data/cli/compare/virt-install-reinstall-pxe.xml +++ virt-manager-5.1.0/tests/data/cli/compare/virt-install-reinstall-pxe.xml -@@ -21,7 +21,7 @@ +@@ -19,7 +19,7 @@ <devices> <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <disk type="file" device="disk"> @@ -227,10 +227,10 @@ =================================================================== --- virt-manager-5.1.0.orig/tests/data/cli/compare/virt-install-w2k3-cdrom.xml +++ virt-manager-5.1.0/tests/data/cli/compare/virt-install-w2k3-cdrom.xml -@@ -30,6 +30,7 @@ - <disk type="file" device="disk"> +@@ -29,6 +29,7 @@ <source file="/pool-dir/testvol1.img"/> <target dev="hda" bus="ide"/> + <boot order="2"/> + <driver cache="unsafe"/> </disk> <disk type="file" device="cdrom"> @@ -239,7 +239,7 @@ =================================================================== --- virt-manager-5.1.0.orig/tests/data/cli/compare/virt-install-aarch64-cdrom.xml +++ virt-manager-5.1.0/tests/data/cli/compare/virt-install-aarch64-cdrom.xml -@@ -26,7 +26,7 @@ +@@ -24,7 +24,7 @@ <devices> <emulator>/usr/bin/qemu-system-aarch64</emulator> <disk type="file" device="disk"> @@ -247,12 +247,12 @@ + <driver name="qemu" type="qcow2" cache="unsafe"/> <source file="/pool-dir/testvol1.img"/> <target dev="vda" bus="virtio"/> - </disk> + <boot order="2"/> Index: virt-manager-5.1.0/tests/data/cli/compare/virt-install-cdrom-centos-label.xml =================================================================== --- virt-manager-5.1.0.orig/tests/data/cli/compare/virt-install-cdrom-centos-label.xml +++ virt-manager-5.1.0/tests/data/cli/compare/virt-install-cdrom-centos-label.xml -@@ -32,7 +32,7 @@ +@@ -30,7 +30,7 @@ <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type="file" device="disk"> @@ -260,12 +260,12 @@ + <driver name="qemu" type="qcow2" cache="unsafe"/> <source file="/pool-dir/testvol1.img"/> <target dev="vda" bus="virtio"/> - </disk> + <boot order="2"/> Index: virt-manager-5.1.0/tests/data/cli/compare/virt-install-kvm-centos7.xml =================================================================== --- virt-manager-5.1.0.orig/tests/data/cli/compare/virt-install-kvm-centos7.xml +++ virt-manager-5.1.0/tests/data/cli/compare/virt-install-kvm-centos7.xml -@@ -32,7 +32,7 @@ +@@ -30,7 +30,7 @@ <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type="file" device="disk"> @@ -273,12 +273,12 @@ + <driver name="qemu" type="qcow2" cache="unsafe"/> <source file="/pool-dir/testvol1.img"/> <target dev="vda" bus="virtio"/> - </disk> + <boot order="2"/> Index: virt-manager-5.1.0/tests/data/cli/compare/virt-install-kvm-cpu-default-fallback.xml =================================================================== --- virt-manager-5.1.0.orig/tests/data/cli/compare/virt-install-kvm-cpu-default-fallback.xml +++ virt-manager-5.1.0/tests/data/cli/compare/virt-install-kvm-cpu-default-fallback.xml -@@ -34,7 +34,7 @@ +@@ -32,7 +32,7 @@ <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type="file" device="disk"> @@ -286,12 +286,12 @@ + <driver name="qemu" type="qcow2" cache="unsafe"/> <source file="/pool-dir/testvol1.img"/> <target dev="vda" bus="virtio"/> - </disk> + <boot order="2"/> Index: virt-manager-5.1.0/tests/data/cli/compare/virt-install-kvm-cpu-hostmodel-fallback.xml =================================================================== --- virt-manager-5.1.0.orig/tests/data/cli/compare/virt-install-kvm-cpu-hostmodel-fallback.xml +++ virt-manager-5.1.0/tests/data/cli/compare/virt-install-kvm-cpu-hostmodel-fallback.xml -@@ -32,7 +32,7 @@ +@@ -30,7 +30,7 @@ <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type="file" device="disk"> @@ -299,7 +299,7 @@ + <driver name="qemu" type="qcow2" cache="unsafe"/> <source file="/pool-dir/testvol1.img"/> <target dev="vda" bus="virtio"/> - </disk> + <boot order="2"/> Index: virt-manager-5.1.0/tests/data/cli/compare/virt-install-kvm-fedoralatest-url.xml =================================================================== --- virt-manager-5.1.0.orig/tests/data/cli/compare/virt-install-kvm-fedoralatest-url.xml @@ -317,7 +317,7 @@ =================================================================== --- virt-manager-5.1.0.orig/tests/data/cli/compare/virt-install-kvm-rhel5.xml +++ virt-manager-5.1.0/tests/data/cli/compare/virt-install-kvm-rhel5.xml -@@ -32,7 +32,7 @@ +@@ -30,7 +30,7 @@ <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type="file" device="disk"> @@ -325,7 +325,7 @@ + <driver name="qemu" type="qcow2" cache="unsafe"/> <source file="/pool-dir/testvol1.img"/> <target dev="hda" bus="ide"/> - </disk> + <boot order="2"/> Index: virt-manager-5.1.0/tests/data/cli/compare/virt-install-kvm-rhel6.xml =================================================================== --- virt-manager-5.1.0.orig/tests/data/cli/compare/virt-install-kvm-rhel6.xml @@ -356,7 +356,7 @@ =================================================================== --- virt-manager-5.1.0.orig/tests/data/cli/compare/virt-install-kvm-session-defaults.xml +++ virt-manager-5.1.0/tests/data/cli/compare/virt-install-kvm-session-defaults.xml -@@ -32,7 +32,7 @@ +@@ -30,7 +30,7 @@ <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type="file" device="disk"> @@ -364,12 +364,12 @@ + <driver name="qemu" type="qcow2" discard="unmap" cache="unsafe"/> <source file="/tmp/.local/share/libvirt/images/fedora21.qcow2"/> <target dev="vda" bus="virtio"/> - </disk> + <boot order="2"/> Index: virt-manager-5.1.0/tests/data/cli/compare/virt-install-kvm-win10.xml =================================================================== --- virt-manager-5.1.0.orig/tests/data/cli/compare/virt-install-kvm-win10.xml +++ virt-manager-5.1.0/tests/data/cli/compare/virt-install-kvm-win10.xml -@@ -47,7 +47,7 @@ +@@ -45,7 +45,7 @@ <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type="file" device="disk"> @@ -377,12 +377,12 @@ + <driver name="qemu" type="qcow2" cache="unsafe"/> <source file="/pool-dir/testvol1.img"/> <target dev="sda" bus="sata"/> - </disk> + <boot order="2"/> Index: virt-manager-5.1.0/tests/data/cli/compare/virt-install-kvm-win2k3-cdrom.xml =================================================================== --- virt-manager-5.1.0.orig/tests/data/cli/compare/virt-install-kvm-win2k3-cdrom.xml +++ virt-manager-5.1.0/tests/data/cli/compare/virt-install-kvm-win2k3-cdrom.xml -@@ -47,7 +47,7 @@ +@@ -45,7 +45,7 @@ <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type="file" device="disk"> @@ -390,12 +390,12 @@ + <driver name="qemu" type="qcow2" cache="unsafe"/> <source file="/pool-dir/testvol1.img"/> <target dev="hda" bus="ide"/> - </disk> + <boot order="2"/> Index: virt-manager-5.1.0/tests/data/cli/compare/virt-install-linux2020.xml =================================================================== --- virt-manager-5.1.0.orig/tests/data/cli/compare/virt-install-linux2020.xml +++ virt-manager-5.1.0/tests/data/cli/compare/virt-install-linux2020.xml -@@ -32,7 +32,7 @@ +@@ -30,7 +30,7 @@ <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type="file" device="disk"> @@ -403,7 +403,7 @@ + <driver name="qemu" type="qcow2" discard="unmap" cache="unsafe"/> <source file="/var/lib/libvirt/images/linux2020.qcow2"/> <target dev="vda" bus="virtio"/> - </disk> + <boot order="2"/> Index: virt-manager-5.1.0/tests/data/cli/compare/virt-install-location-iso.xml =================================================================== --- virt-manager-5.1.0.orig/tests/data/cli/compare/virt-install-location-iso.xml @@ -447,7 +447,7 @@ =================================================================== --- virt-manager-5.1.0.orig/tests/data/cli/compare/virt-install-q35-defaults.xml +++ virt-manager-5.1.0/tests/data/cli/compare/virt-install-q35-defaults.xml -@@ -27,7 +27,7 @@ +@@ -25,7 +25,7 @@ <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type="file" device="disk"> @@ -455,15 +455,15 @@ + <driver name="qemu" type="qcow2" cache="unsafe"/> <source file="/pool-dir/testvol1.img"/> <target dev="sda" bus="sata"/> - </disk> + <boot order="2"/> Index: virt-manager-5.1.0/tests/data/cli/compare/virt-install-remote-storage.xml =================================================================== --- virt-manager-5.1.0.orig/tests/data/cli/compare/virt-install-remote-storage.xml +++ virt-manager-5.1.0/tests/data/cli/compare/virt-install-remote-storage.xml -@@ -22,6 +22,7 @@ - <disk type="file" device="disk"> +@@ -21,6 +21,7 @@ <source file="/foo/bar/baz"/> <target dev="hda" bus="ide"/> + <boot order="2"/> + <driver cache="unsafe"/> </disk> <disk type="block" device="disk"> @@ -473,9 +473,9 @@ --- virt-manager-5.1.0.orig/tests/data/cli/compare/virt-install-unattended-remote-cdrom.xml +++ virt-manager-5.1.0/tests/data/cli/compare/virt-install-unattended-remote-cdrom.xml @@ -27,6 +27,7 @@ - <source file="/pool-dir/testvol1.img"/> <target dev="hda" bus="ide"/> <readonly/> + <boot order="1"/> + <driver cache="unsafe"/> </disk> <controller type="usb" model="ich9-ehci1"/> @@ -484,7 +484,7 @@ =================================================================== --- virt-manager-5.1.0.orig/tests/data/cli/compare/virt-install-win7-uefi.xml +++ virt-manager-5.1.0/tests/data/cli/compare/virt-install-win7-uefi.xml -@@ -49,7 +49,7 @@ +@@ -47,7 +47,7 @@ <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type="file" device="disk"> @@ -492,7 +492,7 @@ + <driver name="qemu" type="qcow2" cache="unsafe"/> <source file="/pool-dir/testvol1.img"/> <target dev="sda" bus="sata"/> - </disk> + <boot order="2"/> Index: virt-manager-5.1.0/tests/data/cli/compare/virt-install-xen-pv.xml =================================================================== --- virt-manager-5.1.0.orig/tests/data/cli/compare/virt-install-xen-pv.xml ++++++ virtinst-set-default-nic.patch ++++++ --- /var/tmp/diff_new_pack.WtY6yB/_old 2026-01-09 17:03:36.444235809 +0100 +++ /var/tmp/diff_new_pack.WtY6yB/_new 2026-01-09 17:03:36.456236307 +0100 @@ -5,7 +5,7 @@ =================================================================== --- virt-manager-5.1.0.orig/virtinst/devices/interface.py +++ virt-manager-5.1.0/virtinst/devices/interface.py -@@ -370,6 +370,9 @@ class DeviceInterface(Device): +@@ -372,6 +372,9 @@ class DeviceInterface(Device): return "e1000e" if not guest.os.is_x86(): return None ++++++ virtinst-set-qemu-emulator.patch ++++++ --- /var/tmp/diff_new_pack.WtY6yB/_old 2026-01-09 17:03:36.500238132 +0100 +++ /var/tmp/diff_new_pack.WtY6yB/_new 2026-01-09 17:03:36.516238797 +0100 @@ -5,7 +5,7 @@ =================================================================== --- virt-manager-5.1.0.orig/virtinst/guest.py +++ virt-manager-5.1.0/virtinst/guest.py -@@ -1036,6 +1036,10 @@ class Guest(XMLBuilder): +@@ -1033,6 +1033,10 @@ class Guest(XMLBuilder): self._add_default_tpm() self.clock.set_defaults(self) ++++++ virtinst-smbios-unsupported-for-xenpv.patch ++++++ --- /var/tmp/diff_new_pack.WtY6yB/_old 2026-01-09 17:03:36.580241452 +0100 +++ /var/tmp/diff_new_pack.WtY6yB/_new 2026-01-09 17:03:36.608242613 +0100 @@ -4,7 +4,7 @@ =================================================================== --- virt-manager-5.1.0.orig/virtinst/guest.py +++ virt-manager-5.1.0/virtinst/guest.py -@@ -788,6 +788,8 @@ class Guest(XMLBuilder): +@@ -785,6 +785,8 @@ class Guest(XMLBuilder): if wants_default_type and self.conn.is_qemu() and self.os.is_x86() and self.type != "kvm": log.warning("KVM acceleration not available, using '%s'", self.type) # pragma: no cover ++++++ virtman-add-launch-security-support.patch ++++++ --- /var/tmp/diff_new_pack.WtY6yB/_old 2026-01-09 17:03:36.740248090 +0100 +++ /var/tmp/diff_new_pack.WtY6yB/_new 2026-01-09 17:03:36.752248587 +0100 @@ -7,8 +7,8 @@ =================================================================== --- virt-manager-5.1.0.orig/ui/details.ui +++ virt-manager-5.1.0/ui/details.ui -@@ -1927,7 +1927,20 @@ - </packing> +@@ -2908,7 +2908,20 @@ + <placeholder/> </child> <child> - <placeholder/> @@ -50,7 +50,7 @@ # Columns in hw list model -@@ -413,6 +414,7 @@ class vmmDetails(vmmGObjectUI): +@@ -416,6 +417,7 @@ class vmmDetails(vmmGObjectUI): "on_mem_maxmem_changed": _e(EDIT_MEM), "on_mem_memory_changed": self._curmem_changed_cb, "on_mem_shared_access_toggled": _e(EDIT_MEM_SHARED), @@ -58,7 +58,7 @@ "on_boot_list_changed": self._boot_list_changed_cb, "on_boot_moveup_clicked": self._boot_moveup_clicked_cb, "on_boot_movedown_clicked": self._boot_movedown_clicked_cb, -@@ -1481,6 +1483,9 @@ class vmmDetails(vmmGObjectUI): +@@ -1484,6 +1486,9 @@ class vmmDetails(vmmGObjectUI): if self._edited(EDIT_MEM_SHARED): kwargs["mem_shared"] = self.widget("shared-memory").get_active() @@ -68,7 +68,7 @@ return self._change_config(self.vm.define_memory, kwargs, hotplug_args=hotplug_args) def _apply_boot_options(self): -@@ -1970,6 +1975,14 @@ class vmmDetails(vmmGObjectUI): +@@ -1973,6 +1978,14 @@ class vmmDetails(vmmGObjectUI): curmem.set_value(int(round(vm_cur_mem))) maxmem.set_value(int(round(vm_max_mem))) @@ -115,7 +115,7 @@ self._redefine_xmlobj(guest) -@@ -1371,6 +1383,9 @@ class vmmDomain(vmmLibvirtObject): +@@ -1370,6 +1382,9 @@ class vmmDomain(vmmLibvirtObject): def get_description(self): return self.get_xmlobj().description @@ -123,8 +123,8 @@ + return self.get_xmlobj().launchSecurity.type + def get_boot_order(self): - legacy = not self.can_use_device_boot_order() - return self.xmlobj.get_boot_order(legacy=legacy) + return self.xmlobj.get_boot_order() + Index: virt-manager-5.1.0/virtinst/domcapabilities.py =================================================================== --- virt-manager-5.1.0.orig/virtinst/domcapabilities.py ++++++ virtman-add-tooltip-to-firmware.patch ++++++ --- /var/tmp/diff_new_pack.WtY6yB/_old 2026-01-09 17:03:36.784249915 +0100 +++ /var/tmp/diff_new_pack.WtY6yB/_new 2026-01-09 17:03:36.804250745 +0100 @@ -17,7 +17,7 @@ from gi.repository import Gtk import libvirt -@@ -395,7 +399,7 @@ class vmmDetails(vmmGObjectUI): +@@ -398,7 +402,7 @@ class vmmDetails(vmmGObjectUI): "on_overview_name_changed": _e(EDIT_NAME), "on_overview_title_changed": _e(EDIT_TITLE), "on_machine_type_changed": _e(EDIT_MACHTYPE), @@ -26,7 +26,7 @@ "on_overview_chipset_changed": _e(EDIT_MACHTYPE), "on_details_inspection_refresh_clicked": self._inspection_refresh_clicked_cb, "on_cpu_vcpus_changed": self._config_vcpus_changed_cb, -@@ -1073,6 +1077,52 @@ class vmmDetails(vmmGObjectUI): +@@ -1076,6 +1080,52 @@ class vmmDetails(vmmGObjectUI): self.storage_browser.set_browse_reason(reason) self.storage_browser.show(self.topwin) ++++++ virtman-fix-inspection-apps-window.patch ++++++ --- /var/tmp/diff_new_pack.WtY6yB/_old 2026-01-09 17:03:36.960257217 +0100 +++ /var/tmp/diff_new_pack.WtY6yB/_new 2026-01-09 17:03:36.972257715 +0100 @@ -1,10 +1,10 @@ References: bsc#1213790 -Index: virt-manager-4.1.0/ui/details.ui +Index: virt-manager-5.1.0/ui/details.ui =================================================================== ---- virt-manager-4.1.0.orig/ui/details.ui -+++ virt-manager-4.1.0/ui/details.ui -@@ -810,7 +810,7 @@ +--- virt-manager-5.1.0.orig/ui/details.ui ++++ virt-manager-5.1.0/ui/details.ui +@@ -780,7 +780,7 @@ </child> </object> <packing> ++++++ virtman-fix-restore-vm-menu-selection.patch ++++++ --- /var/tmp/diff_new_pack.WtY6yB/_old 2026-01-09 17:03:37.008259209 +0100 +++ /var/tmp/diff_new_pack.WtY6yB/_new 2026-01-09 17:03:37.016259540 +0100 @@ -7,7 +7,7 @@ =================================================================== --- virt-manager-5.1.0.orig/virtManager/object/domain.py +++ virt-manager-5.1.0/virtManager/object/domain.py -@@ -1686,7 +1686,7 @@ class vmmDomain(vmmLibvirtObject): +@@ -1684,7 +1684,7 @@ class vmmDomain(vmmLibvirtObject): return self.is_stoppable() or self.status() in [libvirt.VIR_DOMAIN_CRASHED] def is_runable(self):
