as pastebins time out - change #1
diff -Nru libvirt-6.0.0/debian/changelog libvirt-6.0.0/debian/changelog --- libvirt-6.0.0/debian/changelog 2020-02-12 13:20:08.000000000 +0000 +++ libvirt-6.0.0/debian/changelog 2020-03-12 04:12:39.000000000 +0000 @@ -1,3 +1,16 @@ +libvirt (6.0.0-0ubuntu4+riscv64.1) focal; urgency=medium + + * Disable rados storage backend on riscv64, where Ceph doesn't exist yet. + + -- William Grant <email address hidden> Thu, 12 Mar 2020 15:12:39 +1100 + +libvirt (6.0.0-0ubuntu4) focal; urgency=medium + + * d/p/ubuntu/lp-1865425-*: avoid killing the monitor job in + qemuDomainSetTimeAgent (LP: #1865425) + + -- Christian Ehrhardt <email address hidden> Mon, 02 Mar 2020 10:44:22 +0100 + libvirt (6.0.0-0ubuntu3) focal; urgency=medium
* rebuild against libxen-dev 4.11.3 (no change needed) diff -Nru libvirt-6.0.0/debian/control libvirt-6.0.0/debian/control --- libvirt-6.0.0/debian/control 2020-02-12 13:20:08.000000000 +0000 +++ libvirt-6.0.0/debian/control 2020-03-12 04:12:30.000000000 +0000 @@ -50,8 +50,8 @@ libzfslinux-dev [linux-any], po-debconf, # for --with-storage-rados - librbd-dev [linux-any], - librados-dev [linux-any], + librbd-dev [amd64 arm64 armhf i386 ppc64el s390x], + librados-dev [amd64 arm64 armhf i386 ppc64el s390x], # for --with-storage-gluster libglusterfs-dev, # for --with-wireshark-dissector @@ -213,7 +213,7 @@ This package contains the libvirtd storage driver for GlusterFS.
Package: libvirt-daemon-driver-storage-rbd -Architecture: linux-any +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: ${misc:Depends}, ${shlibs:Depends}, diff -Nru libvirt-6.0.0/debian/patches/series libvirt-6.0.0/debian/patches/series --- libvirt-6.0.0/debian/patches/series 2020-02-12 13:20:08.000000000 +0000 +++ libvirt-6.0.0/debian/patches/series 2020-03-02 09:42:59.000000000 +0000 @@ -47,3 +47,4 @@ ubuntu/lp-1861125-qemu_capabilities-Disable-CPU-models-on-old-s390-mac.patch ubuntu/lp-1861125-ubuntu-models.patch ubuntu-aa/apparmor-allow-to-call-vhost-user-gpu.patch +ubuntu/lp-1865425-qemu-end-the-agent-job-in-qemuDomainSetTimeAgent.patch diff -Nru libvirt-6.0.0/debian/patches/ubuntu/lp-1865425-qemu-end-the-agent-job-in-qemuDomainSetTimeAgent.patch libvirt-6.0.0/debian/patches/ubuntu/lp-1865425-qemu-end-the-agent-job-in-qemuDomainSetTimeAgent.patch --- libvirt-6.0.0/debian/patches/ubuntu/lp-1865425-qemu-end-the-agent-job-in-qemuDomainSetTimeAgent.patch 1970-01-01 00:00:00.000000000 +0000 +++ libvirt-6.0.0/debian/patches/ubuntu/lp-1865425-qemu-end-the-agent-job-in-qemuDomainSetTimeAgent.patch 2020-03-02 09:41:21.000000000 +0000 @@ -0,0 +1,41 @@ +From d61f95cf6a6fbd564e104c168d325581acd9cd8d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=A1n=20Tomko?= <email address hidden> +Date: Mon, 20 Jan 2020 07:55:48 +0100 +Subject: [PATCH] qemu: end the agent job in qemuDomainSetTimeAgent +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This function grabs an agent job but ends a monitor job. +End the agent job instead. + +https://bugzilla.redhat.com/show_bug.cgi?id=1792723 + +Signed-off-by: Ján Tomko <email address hidden> +Reported-by: Dan Zheng <email address hidden> +Fixes: e005c95f56fee9ed780be7f8db103d690bd34cbd + +Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=d61f95cf6a6 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1865425 +Last-Update: 2020-03-02 + +--- + src/qemu/qemu_driver.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c +index 7e379fe83a..2f66d7cd9a 100644 +--- a/src/qemu/qemu_driver.c ++++ b/src/qemu/qemu_driver.c +@@ -20464,7 +20464,7 @@ qemuDomainSetTimeAgent(virQEMUDriverPtr driver, + qemuDomainObjExitAgent(vm, agent); + + endjob: +- qemuDomainObjEndJob(driver, vm); ++ qemuDomainObjEndAgentJob(vm); + return ret; + } + +-- +2.25.1 + diff -Nru libvirt-6.0.0/debian/rules libvirt-6.0.0/debian/rules --- libvirt-6.0.0/debian/rules 2020-02-12 13:20:08.000000000 +0000 +++ libvirt-6.0.0/debian/rules 2020-03-12 04:12:07.000000000 +0000 @@ -27,7 +27,11 @@ WITH_STORAGE_LVM = --with-storage-lvm WITH_STORAGE_ISCSI = --with-storage-iscsi WITH_STORAGE_DISK = --with-storage-disk - WITH_STORAGE_RBD = --with-storage-rbd + ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 arm64 armhf i386 ppc64el s390x)) + WITH_STORAGE_RBD = --with-storage-rbd + else + WITH_STORAGE_RBD = --without-storage-rbd + endif WITH_STORAGE_ZFS = --with-storage-zfs WITH_STORAGE_GLUSTER = --with-storage-gluster WITH_UDEV = --with-udev
as pastebins time out - change #1
diff -Nru libvirt- 6.0.0/debian/ changelog libvirt- 6.0.0/debian/ changelog 6.0.0/debian/ changelog 2020-02-12 13:20:08.000000000 +0000 6.0.0/debian/ changelog 2020-03-12 04:12:39.000000000 +0000 0ubuntu4+ riscv64. 1) focal; urgency=medium lp-1865425- *: avoid killing the monitor job in meAgent (LP: #1865425)
--- libvirt-
+++ libvirt-
@@ -1,3 +1,16 @@
+libvirt (6.0.0-
+
+ * Disable rados storage backend on riscv64, where Ceph doesn't exist yet.
+
+ -- William Grant <email address hidden> Thu, 12 Mar 2020 15:12:39 +1100
+
+libvirt (6.0.0-0ubuntu4) focal; urgency=medium
+
+ * d/p/ubuntu/
+ qemuDomainSetTi
+
+ -- Christian Ehrhardt <email address hidden> Mon, 02 Mar 2020 10:44:22 +0100
+
libvirt (6.0.0-0ubuntu3) focal; urgency=medium
* rebuild against libxen-dev 4.11.3 (no change needed) 6.0.0/debian/ control libvirt- 6.0.0/debian/ control 6.0.0/debian/ control 2020-02-12 13:20:08.000000000 +0000 6.0.0/debian/ control 2020-03-12 04:12:30.000000000 +0000 storage- rados storage- gluster wireshark- dissector
diff -Nru libvirt-
--- libvirt-
+++ libvirt-
@@ -50,8 +50,8 @@
libzfslinux-dev [linux-any],
po-debconf,
# for --with-
- librbd-dev [linux-any],
- librados-dev [linux-any],
+ librbd-dev [amd64 arm64 armhf i386 ppc64el s390x],
+ librados-dev [amd64 arm64 armhf i386 ppc64el s390x],
# for --with-
libglusterfs-dev,
# for --with-
@@ -213,7 +213,7 @@
This package contains the libvirtd storage driver for GlusterFS.
Package: libvirt- daemon- driver- storage- rbd Depends} , 6.0.0/debian/ patches/ series libvirt- 6.0.0/debian/ patches/ series 6.0.0/debian/ patches/ series 2020-02-12 13:20:08.000000000 +0000 6.0.0/debian/ patches/ series 2020-03-02 09:42:59.000000000 +0000 lp-1861125- qemu_capabiliti es-Disable- CPU-models- on-old- s390-mac. patch lp-1861125- ubuntu- models. patch aa/apparmor- allow-to- call-vhost- user-gpu. patch lp-1865425- qemu-end- the-agent- job-in- qemuDomainSetTi meAgent. patch 6.0.0/debian/ patches/ ubuntu/ lp-1865425- qemu-end- the-agent- job-in- qemuDomainSetTi meAgent. patch libvirt- 6.0.0/debian/ patches/ ubuntu/ lp-1865425- qemu-end- the-agent- job-in- qemuDomainSetTi meAgent. patch 6.0.0/debian/ patches/ ubuntu/ lp-1865425- qemu-end- the-agent- job-in- qemuDomainSetTi meAgent. patch 1970-01-01 00:00:00.000000000 +0000 6.0.0/debian/ patches/ ubuntu/ lp-1865425- qemu-end- the-agent- job-in- qemuDomainSetTi meAgent. patch 2020-03-02 09:41:21.000000000 +0000 64e104c168d3255 81acd9cd8d Mon Sep 17 00:00:00 2001 q?J=C3= A1n=20Tomko? = <email address hidden> meAgent Transfer- Encoding: 8bit /bugzilla. redhat. com/show_ bug.cgi? id=1792723 d780be7f8db103d 690bd34cbd /libvirt. org/git/ ?p=libvirt. git;a=commit; h=d61f95cf6a6 /bugs.launchpad .net/bugs/ 1865425 qemu_driver. c | 2 +- qemu_driver. c b/src/qemu/ qemu_driver. c .2f66d7cd9a 100644 qemu_driver. c qemu_driver. c meAgent( virQEMUDriverPt r driver, itAgent( vm, agent); dJob(driver, vm); dAgentJob( vm); 6.0.0/debian/ rules libvirt- 6.0.0/debian/ rules 6.0.0/debian/ rules 2020-02-12 13:20:08.000000000 +0000 6.0.0/debian/ rules 2020-03-12 04:12:07.000000000 +0000 STORAGE_ ISCSI = --with- storage- iscsi STORAGE_ DISK = --with-storage-disk storage- rbd STORAGE_ GLUSTER = --with- storage- gluster
-Architecture: linux-any
+Architecture: amd64 arm64 armhf i386 ppc64el s390x
Depends:
${misc:Depends},
${shlibs:
diff -Nru libvirt-
--- libvirt-
+++ libvirt-
@@ -47,3 +47,4 @@
ubuntu/
ubuntu/
ubuntu-
+ubuntu/
diff -Nru libvirt-
--- libvirt-
+++ libvirt-
@@ -0,0 +1,41 @@
+From d61f95cf6a6fbd5
+From: =?UTF-8?
+Date: Mon, 20 Jan 2020 07:55:48 +0100
+Subject: [PATCH] qemu: end the agent job in qemuDomainSetTi
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-
+
+This function grabs an agent job but ends a monitor job.
+End the agent job instead.
+
+https:/
+
+Signed-off-by: Ján Tomko <email address hidden>
+Reported-by: Dan Zheng <email address hidden>
+Fixes: e005c95f56fee9e
+
+Origin: upstream, https:/
+Bug-Ubuntu: https:/
+Last-Update: 2020-03-02
+
+---
+ src/qemu/
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/qemu/
+index 7e379fe83a.
+--- a/src/qemu/
++++ b/src/qemu/
+@@ -20464,7 +20464,7 @@ qemuDomainSetTi
+ qemuDomainObjEx
+
+ endjob:
+- qemuDomainObjEn
++ qemuDomainObjEn
+ return ret;
+ }
+
+--
+2.25.1
+
diff -Nru libvirt-
--- libvirt-
+++ libvirt-
@@ -27,7 +27,11 @@
WITH_STORAGE_LVM = --with-storage-lvm
WITH_
WITH_
- WITH_STORAGE_RBD = --with-storage-rbd
+ ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 arm64 armhf i386 ppc64el s390x))
+ WITH_STORAGE_RBD = --with-storage-rbd
+ else
+ WITH_STORAGE_RBD = --without-
+ endif
WITH_STORAGE_ZFS = --with-storage-zfs
WITH_
WITH_UDEV = --with-udev