Merge ~paelzer/ubuntu/+source/qemu:lp-1908331-static-1907656-s390xpci-GROOVY into ubuntu/+source/qemu:ubuntu/groovy-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4389/+packages

[Christian Ehrhardt  (paelzer)]

P.S. I know I need to create proper SRU bug texts, I'll add them before upload once I got to complete the tests and know what to write there.

[Sergio Durigan Junior (sergiodj)]

Reviewing this one.

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP, Christian!

The s390x bits are OK, but I found what seems to be a problem in the hunk that adds "--disable-pie" to the configure flags, so I'm marking this as Needs Fixing. Feel free to upload once this fixed.

review: Needs Fixing

[Christian Ehrhardt  (paelzer)]

Thanks Sergio, that indeed was an issue - Fixed (And period added).
It would have been spotted on testing, but that way it is much better - Thanks.

[Christian Ehrhardt  (paelzer)]

 * [new tag] upload/1%5.0-5ubuntu9.3 -> upload/1%5.0-5ubuntu9.3

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading qemu_5.0-5ubuntu9.3.dsc: done.
  Uploading qemu_5.0-5ubuntu9.3.debian.tar.xz: done.
  Uploading qemu_5.0-5ubuntu9.3_source.buildinfo: done.
  Uploading qemu_5.0-5ubuntu9.3_source.changes: done.
Successfully uploaded packages.

[Christian Ehrhardt  (paelzer)]

Uploaded, setting state to "merged"

diff --git a/debian/changelog b/debian/changelog
index 2d0422d..cb26d31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+qemu (1:5.0-5ubuntu9.3) groovy; urgency=medium
+
+  * d/p/ubuntu/lp-1907656-s390x-s390-virtio-ccw-Reset-PCI-devices-during-subsy:
+    avoid PCI devices to become unavailable on reset (LP: #1907656)
+  * d/rules: fix qemu-user-static to really be static (LP: #1908331)
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 05 Jan 2021 15:46:16 +0100
+
 qemu (1:5.0-5ubuntu9.2) groovy-security; urgency=medium
 
   * SECURITY UPDATE: heap buffer overflow in sdhci_sdma_transfer_multi_blocks()
diff --git a/debian/patches/series b/debian/patches/series
index fed901f..3ddd537 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -98,3 +98,4 @@ ubuntu/CVE-2020-25625.patch
 ubuntu/CVE-2020-25723.patch
 ubuntu/CVE-2020-27616.patch
 ubuntu/CVE-2020-27617.patch
+ubuntu/lp-1907656-s390x-s390-virtio-ccw-Reset-PCI-devices-during-subsy.patch
diff --git a/debian/patches/ubuntu/lp-1907656-s390x-s390-virtio-ccw-Reset-PCI-devices-during-subsy.patch b/debian/patches/ubuntu/lp-1907656-s390x-s390-virtio-ccw-Reset-PCI-devices-during-subsy.patch
new file mode 100644
index 0000000..8fe8fa1
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1907656-s390x-s390-virtio-ccw-Reset-PCI-devices-during-subsy.patch
@@ -0,0 +1,43 @@
+From db08244a3a7ec312dfed3fd9b88e114281215458 Mon Sep 17 00:00:00 2001
+From: Matthew Rosato <[e-mail]>
+Date: Thu, 15 Oct 2020 09:16:07 -0400
+Subject: [PATCH] s390x/s390-virtio-ccw: Reset PCI devices during subsystem
+ reset
+
+Currently, a subsystem reset event leaves PCI devices enabled, causing
+issues post-reset in the guest (an example would be after a kexec).  These
+devices need to be reset during a subsystem reset, allowing them to be
+properly re-enabled afterwards.  Add the S390 PCI host bridge to the list
+of qdevs to be reset during subsystem reset.
+
+Signed-off-by: Matthew Rosato <[e-mail]>
+Reviewed-by: Eric Farman <[e-mail]>
+Acked-by: Halil Pasic <[e-mail]>
+Acked-by: Christian Borntraeger <[e-mail]>
+Cc: [e-mail]
+Message-Id: <[e-mail]>
+Signed-off-by: Cornelia Huck <[e-mail]>
+
+Origin: upstream, https://git.qemu.org/?p=qemu.git;a=commit;h=db08244a3a7ec312dfed3fd9b88e114281215458
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1907656
+Last-Update: 2021-01-05
+
+---
+ hw/s390x/s390-virtio-ccw.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
+index e52182f946..2e900335ea 100644
+--- a/hw/s390x/s390-virtio-ccw.c
++++ b/hw/s390x/s390-virtio-ccw.c
+@@ -101,6 +101,7 @@ static const char *const reset_dev_types[] = {
+     "s390-sclp-event-facility",
+     "s390-flic",
+     "diag288",
++    TYPE_S390_PCI_HOST_BRIDGE,
+ };
+ 
+ static void subsystem_reset(void)
+-- 
+2.30.0
+
diff --git a/debian/rules b/debian/rules
index 87afc09..2d1fa4e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -111,19 +111,6 @@ user_targets = \
 
 endif	# enable_linux_user
 
-ifneq ($(filter $(DEB_HOST_ARCH),i386 x32),)
-# XXX as of 2020-04-29, i386 buildd fails to link -static-pie executable:
-# /usr/bin/ld: /usr/lib/i386-linux-gnu/libc.a(memset_chk-nonshared.o):
-#	unsupported non-PIC call to IFUNC `memset'
-# so disable PIE for qemu-user-static build on i386 for now.
-# On x32 -static-pie fails in different way.
-# On amd64 -static-pie appears to work fine.
-# On other architectures qemu correctly detect that -static-pie is not available
-XXXstaticpie = --disable-pie
-else
-XXXstaticpie =
-endif
-
 b/configure-stamp: configure
 	dh_testdir
 
@@ -215,11 +202,14 @@ endif
 
 ifeq ($(enable_linux_user),enable)
 # do not use debian/configure-opts here, all optional stuff will be enabled
-# automatically, dependencies are already verified in the main build
+# automatically, dependencies are already verified in the main build.
+# By default this would detect linker option --static-pie, but that
+# breaks some use cases of qemu-static builds (LP: #1908331), therefore
+# add --disable-pie to get "real static" builds.
 	rm -rf b/user-static; mkdir b/user-static
 	cd b/user-static && \
 	    ../../configure ${common_configure_opts} \
-		--static ${XXXstaticpie} --disable-system --disable-xen \
+		--static --disable-pie --disable-system --disable-xen \
 		--target-list="$(addsuffix -linux-user,${user_targets})"
 endif
 	touch $@