[Pkg-libvirt-commits] [Git][libvirt-team/virt-manager][debian/sid] d/patches: backport changes for compatibility with libvirt 10.1.0

[Pino Toscano (@pino)]

Pino Toscano pushed to branch debian/sid at Libvirt Packaging Team / virt-manager


Commits:
b8b86bd2 by Pino Toscano at 2024-04-08T06:39:56+02:00
d/patches: backport changes for compatibility with libvirt 10.1.0

- - - - -


3 changed files:

- debian/patches/series
- + debian/patches/upstream_hostdev-Fix-error-when-mdev-type_id-is-missing.patch
- + debian/patches/upstream_tests-Fix-host-copy-XML-with-libvirt-10.1.0.patch


Changes:

=====================================
debian/patches/series
=====================================
@@ -1,2 +1,4 @@
 upstream_tests-data-refresh-Fedora-tree-URLs-in-virt-install-.patch
 upstream_tests-cli-Adjust-hotplug-test-for-latest-libvirt.patch
+upstream_tests-Fix-host-copy-XML-with-libvirt-10.1.0.patch
+upstream_hostdev-Fix-error-when-mdev-type_id-is-missing.patch


=====================================
debian/patches/upstream_hostdev-Fix-error-when-mdev-type_id-is-missing.patch
=====================================
@@ -0,0 +1,28 @@
+From dce9de481fde5919dca6f75074223af32b48bac1 Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso at redhat.com>
+Date: Sat, 6 Apr 2024 15:54:09 -0400
+Subject: [PATCH] hostdev: Fix error when mdev type_id is missing
+
+Signed-off-by: Cole Robinson <crobinso at redhat.com>
+---
+ virtinst/devices/hostdev.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/virtinst/devices/hostdev.py b/virtinst/devices/hostdev.py
+index cc10e5bf..41f06327 100644
+--- a/virtinst/devices/hostdev.py
++++ b/virtinst/devices/hostdev.py
+@@ -70,8 +70,8 @@ class DeviceHostdev(Device):
+                 self.model = "vfio-ap"
+                 self.managed = "no"
+ 
+-            elif (re.match("^nvidia-[0-9]{2}", nodedev.type_id) or
+-                  re.match("^i915-GVTg_V[0-9]_[0-9]", nodedev.type_id)):
++            elif (re.match("^nvidia-[0-9]{2}", nodedev.type_id or "") or
++                  re.match("^i915-GVTg_V[0-9]_[0-9]", nodedev.type_id or "")):
+                 self.model = "vfio-pci"
+                 self.managed = "yes"
+                 self.display = "off"
+-- 
+2.43.0
+


=====================================
debian/patches/upstream_tests-Fix-host-copy-XML-with-libvirt-10.1.0.patch
=====================================
@@ -0,0 +1,42 @@
+From 8b6db203f726965529567459b302aab1c68c70eb Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso at redhat.com>
+Date: Sat, 6 Apr 2024 15:48:46 -0400
+Subject: [PATCH] tests: Fix host-copy XML with libvirt 10.1.0
+
+New `clusters` changes XML output
+
+Signed-off-by: Cole Robinson <crobinso at redhat.com>
+---
+ tests/data/cli/compare/virt-xml-edit-cpu-host-copy.xml | 2 +-
+ tests/test_cli.py                                      | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/data/cli/compare/virt-xml-edit-cpu-host-copy.xml b/tests/data/cli/compare/virt-xml-edit-cpu-host-copy.xml
+index 6e663a84..e342cf89 100644
+--- a/tests/data/cli/compare/virt-xml-edit-cpu-host-copy.xml
++++ b/tests/data/cli/compare/virt-xml-edit-cpu-host-copy.xml
+@@ -5,7 +5,7 @@
+ -  <cpu mode="custom" match="exact">
+ -    <model fallback="allow">core2duo</model>
+ -    <vendor>Intel</vendor>
+--    <topology sockets="9" dies="1" cores="1" threads="1"/>
++-    <topology sockets="9" dies="1" clusters="1" cores="1" threads="1"/>
+ -    <feature policy="require" name="pbe"/>
+ -    <feature policy="require" name="tm2"/>
+ -    <feature policy="require" name="est"/>
+diff --git a/tests/test_cli.py b/tests/test_cli.py
+index 922de6d6..d9280690 100644
+--- a/tests/test_cli.py
++++ b/tests/test_cli.py
+@@ -1372,7 +1372,7 @@ c.add_compare("--confirm 1 --edit --cpu host-passthrough", "prompt-response", in
+ c.add_compare("--edit --print-diff --qemu-commandline clearxml=yes", "edit-clearxml-qemu-commandline", input_file=(_VIRTXMLDIR + "virtxml-qemu-commandline-clear.xml"))
+ c.add_compare("--print-diff --remove-device --serial 1", "remove-console-dup", input_file=(_VIRTXMLDIR + "virtxml-console-dup.xml"))
+ c.add_compare("--print-diff --define --connect %(URI-KVM-X86)s test --edit --boot uefi", "edit-boot-uefi")
+-c.add_compare("--print-diff --define --connect %(URI-KVM-X86)s test-many-devices --edit --cpu host-copy", "edit-cpu-host-copy")
++c.add_compare("--print-diff --define --connect %(URI-KVM-X86)s test-many-devices --edit --cpu host-copy", "edit-cpu-host-copy", precompare_check="10.1.0")
+ c.add_compare("--connect %(URI-KVM-X86)s test-many-devices --build-xml --disk source.pool=pool-disk,source.volume=sdfg1", "build-pool-logical-disk")
+ c.add_compare("test --add-device --network default --update --confirm", "update-succeed", env={"VIRTXML_TESTSUITE_UPDATE_IGNORE_FAIL": "1", "VIRTINST_TEST_SUITE_INCREMENT_MACADDR": "1"}, input_text="yes\nyes\n")  # test hotplug success
+ c.add_compare("test --add-device --network default --update --confirm --no-define", "update-nodefine-succeed", env={"VIRTXML_TESTSUITE_UPDATE_IGNORE_FAIL": "1"}, input_text="yes\n")  # test hotplug success without define
+-- 
+2.43.0
+



View it on GitLab: https://salsa.debian.org/libvirt-team/virt-manager/-/commit/b8b86bd28af1696615c2149fd836c9a6530af80f

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/virt-manager/-/commit/b8b86bd28af1696615c2149fd836c9a6530af80f
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-libvirt-commits/attachments/20240408/51807a62/attachment-0001.htm>