[Pkg-libvirt-commits] [Git][libvirt-team/virt-manager][debian/sid] d/patches: add fixes from upstream for FTBFS with libvirt 8.1
Pino Toscano (@pino)
gitlab at salsa.debian.org
Sun Apr 24 08:52:02 BST 2022
Pino Toscano pushed to branch debian/sid at Libvirt Packaging Team / virt-manager
Commits:
b8db30e0 by Fabio Fantoni at 2022-04-18T20:24:48+02:00
d/patches: add fixes from upstream for FTBFS with libvirt 8.1
- tests: Drop usage of sgio=unfiltered
- tests: Fix another sgio=filtered case
Closes: #1008358
- - - - -
3 changed files:
- + debian/patches/series
- + debian/patches/upstream_tests-drop-usage-of-sgio-unfiltered.patch
- + debian/patches/upstream_tests-fix-another-sgio-filtered-case.patch
Changes:
=====================================
debian/patches/series
=====================================
@@ -0,0 +1,2 @@
+upstream_tests-drop-usage-of-sgio-unfiltered.patch
+upstream_tests-fix-another-sgio-filtered-case.patch
=====================================
debian/patches/upstream_tests-drop-usage-of-sgio-unfiltered.patch
=====================================
@@ -0,0 +1,56 @@
+From c61074191d0d25ab7cd7830ef90a49a3caefcd09 Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso at redhat.com>
+Date: Wed, 13 Apr 2022 07:00:37 -0400
+Subject: [PATCH] tests: Drop usage of sgio=unfiltered
+
+libvirt 8.1.0+ rejects it, so it breaks the testsuite
+
+Fixes: #382
+
+Signed-off-by: Cole Robinson <crobinso at redhat.com>
+---
+ tests/data/testdriver/testdriver.xml | 2 +-
+ tests/data/xmlparse/change-disk-out.xml | 2 +-
+ tests/test_xmlparse.py | 2 --
+ 3 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/tests/data/testdriver/testdriver.xml b/tests/data/testdriver/testdriver.xml
+index 082ac095b..b213863d9 100644
+--- a/tests/data/testdriver/testdriver.xml
++++ b/tests/data/testdriver/testdriver.xml
+@@ -245,7 +245,7 @@ Foo bar baz & yeah boii < > yeahfoo
+ <shareable/>
+ </disk>
+
+- <disk type='block' device='lun' rawio='no' sgio='unfiltered'>
++ <disk type='block' device='lun' rawio='no'>
+ <driver name='qemu' type='raw'/>
+ <source dev='/dev/szz'>
+ <reservations managed="yes"/>
+diff --git a/tests/data/xmlparse/change-disk-out.xml b/tests/data/xmlparse/change-disk-out.xml
+index 66a70395a..003750fb2 100644
+--- a/tests/data/xmlparse/change-disk-out.xml
++++ b/tests/data/xmlparse/change-disk-out.xml
+@@ -37,7 +37,7 @@
+ <disk type="file" device="floppy">
+ <target dev="fde" bus="fdc"/>
+ </disk>
+- <disk type="block" device="lun" sgio="unfiltered" rawio="yes">
++ <disk type="block" device="lun">
+ <driver name="qemu" type="raw"/>
+ <source dev="/dev/sda"/>
+ <target dev="hdd" bus="scsi"/>
+diff --git a/tests/test_xmlparse.py b/tests/test_xmlparse.py
+index 15ca8f752..1bf0ebe58 100644
+--- a/tests/test_xmlparse.py
++++ b/tests/test_xmlparse.py
+@@ -314,8 +314,6 @@ def _get_disk(target):
+ check = _make_checker(disk)
+ check("type", "block")
+ check("device", "lun")
+- check("sgio", None, "unfiltered")
+- check("rawio", None, "yes")
+
+ disk = _get_disk("sda")
+ check = _make_checker(disk)
+
=====================================
debian/patches/upstream_tests-fix-another-sgio-filtered-case.patch
=====================================
@@ -0,0 +1,37 @@
+From 9ac94ef739687b9eeba37e8b28108269802db280 Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso at redhat.com>
+Date: Wed, 13 Apr 2022 08:16:47 -0400
+Subject: [PATCH] tests: Fix another sgio=filtered case
+
+Signed-off-by: Cole Robinson <crobinso at redhat.com>
+---
+ tests/data/cli/compare/virt-install-many-devices.xml | 2 +-
+ tests/test_cli.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/data/cli/compare/virt-install-many-devices.xml b/tests/data/cli/compare/virt-install-many-devices.xml
+index 4c0024225..db61f5117 100644
+--- a/tests/data/cli/compare/virt-install-many-devices.xml
++++ b/tests/data/cli/compare/virt-install-many-devices.xml
+@@ -249,7 +249,7 @@
+ <source file="/var/lib/libvirt/images/disk.qcow2"/>
+ <target dev="vdc" bus="virtio"/>
+ </disk>
+- <disk type="block" device="lun" sgio="unfiltered" rawio="yes">
++ <disk type="block" device="lun" sgio="filtered" rawio="yes">
+ <driver name="qemu" type="raw"/>
+ <source dev="/pool-iscsi/diskvol1"/>
+ <target dev="sdab" bus="scsi"/>
+diff --git a/tests/test_cli.py b/tests/test_cli.py
+index 8b78a1a78..6a0df7870 100644
+--- a/tests/test_cli.py
++++ b/tests/test_cli.py
+@@ -579,7 +579,7 @@ def add_compare(self, cat, args, compbase, **kwargs):
+ --disk source.file=%(NEWIMG1)s,sparse=false,size=.001,perms=ro,error_policy=enospace,detect_zeroes=unmap,address.type=drive,address.controller=0,address.target=2,address.unit=0
+ --disk device=cdrom,bus=sata,read_bytes_sec=1,read_iops_sec=2,write_bytes_sec=5,write_iops_sec=6,driver.copy_on_read=on,geometry.cyls=16383,geometry.heads=16,geometry.secs=63,geometry.trans=lba,discard=ignore
+ --disk size=1
+---disk /pool-iscsi/diskvol1,total_bytes_sec=10,total_iops_sec=20,bus=scsi,device=lun,sgio=unfiltered,rawio=yes
++--disk /pool-iscsi/diskvol1,total_bytes_sec=10,total_iops_sec=20,bus=scsi,device=lun,sgio=filtered,rawio=yes
+ --disk /pool-dir/iso-vol,seclabel.model=dac,seclabel1.model=selinux,seclabel1.relabel=no,seclabel0.label=foo,bar,baz,iotune.read_bytes_sec=1,iotune.read_iops_sec=2,iotune.write_bytes_sec=5,iotune.write_iops_sec=6
+ --disk /pool-dir/iso-vol,format=qcow2,startup_policy=optional,iotune.total_bytes_sec=10,iotune.total_iops_sec=20,
+ --disk source_pool=pool-rbd-ceph,source_volume=some-rbd-vol,size=.1,driver_type=raw,driver_name=qemu
View it on GitLab: https://salsa.debian.org/libvirt-team/virt-manager/-/commit/b8db30e00024b5a009be5a25fef7e0458f39dcd7
--
View it on GitLab: https://salsa.debian.org/libvirt-team/virt-manager/-/commit/b8db30e00024b5a009be5a25fef7e0458f39dcd7
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/20220424/543fc77c/attachment-0001.htm>
More information about the Pkg-libvirt-commits
mailing list