Merge ~paelzer/ubuntu/+source/qemu:lp-1913421-exec-run-1936894-microvm-HIRSUTE into ubuntu/+source/qemu:ubuntu/hirsute-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

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

Please review these MPs in depth as the maintscript and edge-case magic has bitten me enough on this :-/

[Dan Streetman (ddstreet)]

abstaining from review per bug 1913421 comment 41

review: Abstain

[Christian Ehrhardt  (paelzer)]

The discussion between Dan and me continued on the bug, I'd ask (and therefore assign for pre-unapproved-review) the SRU-Team to help us by adding a third opinion.

Dan and I are not even battling with strong opposing opinions - there are just multiple ways to do things and it isn't clear how to best-continue so we'd need a tie breaker.

I'd ask/recommend to read comment 41 and all that followed on the bug, if needed to go deeper also the rest of the bug comments and the related Debian PR.
Then adding a 3rd voice/opinion here would really help us.

[Christian Ehrhardt  (paelzer)]

Re-worked according to the bug discussion - thanks to everyone that participated!
Thereby ready for re-review.

[Utkarsh Gupta (utkarsh)]

ba555de08dde5914737f891cadb4e4fc52240639
-> makes sense; all good. +1.

4861307062bc61d42f842575031f45b27fbbd358
-> just a d/ch entry; not a lot can go wrong there, can it? :P

70f2c06bd5ef444232efa8cc3cf8467ae50bfde0
-> fair, we split the `remove` and `purge` actions and the extended
   commit message helps in making things clearer. Whilst purging, we
   remove anything and everything that was there under /run/qemu;
   okay, +1.

f98fb144c9ab8fcdca277d1f8f004f77439fe185
-> Hunk 1: looks good; we're just simply splitting the SAVEMODDIR into
   two bits so as to leverage the latter in the next hunk. +1.
-> Hunk 2: it, afaiui, follows https://bugs.launchpad.net/ubuntu/+source/qemu/+bug/1913421/comments/47.
   Also, the manual tests passed (as noted in the last 2 comments by
   Christian), so +1.

658d3e70f006249e56636fc4cd291e8f596d2817
-> just a d/ch entry; not a lot can go wrong there, can it? :P

review: Approve

[Christian Ehrhardt  (paelzer)]

Here I did the same path unification that was requested in other MPs.

[Christian Ehrhardt  (paelzer)]

All re-verified and uploading to -unapproved now.
Thanks everyone involved.

diff --git a/debian/changelog b/debian/changelog
index d33c1fb..f7983b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+qemu (1:5.2+dfsg-9ubuntu3.2) hirsute; urgency=medium
+
+  * d/rules fix microvm default machine type for a new build system
+    (LP: #1936894) - Thanks to Michael Tokarev for the fix.
+  * enhance loading of old modules post upgrade (LP: #1913421)
+    - d/rules: clear all (current and former) modules on purge
+    - d/rules: test for exec and prepare /var/run/qemu if needed
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 19 Aug 2021 11:25:17 +0200
+
 qemu (1:5.2+dfsg-9ubuntu3.1) hirsute-security; urgency=medium
 
   * SECURITY UPDATE: NULL pointer dereference in MemoryRegionOps object
diff --git a/debian/rules b/debian/rules
index eb8f821..791b0c5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,7 +38,8 @@ enable_linux_user = $(if $(filter qemu-user,${BUILD_PACKAGES}),enable,disable)
 
 FIRMWAREPATH = /usr/share/qemu:/usr/share/seabios:/usr/lib/ipxe/qemu
 PKGVERSION = Debian ${DEB_VERSION}
-SAVEMODDIR = /run/qemu/$(shell echo -n "${PKGVERSION}" | tr --complement '[:alnum:]+-.~' '_')
+SAVEMODBASE = /var/run/qemu
+SAVEMODDIR = ${SAVEMODBASE}/$(shell echo -n "${PKGVERSION}" | tr --complement '[:alnum:]+-.~' '_')
 sysdatadir = debian/qemu-system-data/usr/share/qemu
 
 ALPHAEV67_CROSSPFX = alpha-linux-gnu-
@@ -128,8 +129,9 @@ ifneq ($(filter $(DEB_HOST_ARCH),amd64),)
 	# microvm system
 	rm -rf b/qemu-microvm; mkdir -p b/qemu-microvm
 	cd b/qemu-microvm && \
-		../../configure ${common_configure_opts} --disable-user \
-		--enable-system --enable-kvm \
+		../../configure ${common_configure_opts} \
+		--extra-cflags="$(CFLAGS) $(CPPFLAGS) -DCONFIG_MICROVM_DEFAULT=1" \
+		--disable-user --enable-system --enable-kvm \
 		--disable-linux-user --disable-modules --disable-docs \
 		--disable-libssh --disable-tcmalloc --disable-glusterfs \
 		--disable-seccomp --disable-bzip2 --disable-slirp --disable-vde \
@@ -155,7 +157,6 @@ ifneq ($(filter $(DEB_HOST_ARCH),amd64),)
 		--without-default-devices \
 		$(QEMU_CONFIGURE_OPTIONS) || \
 	 { echo ===== CONFIGURE FAILED ===; tail -n 50 config.log; exit 1; }
-	echo "#define CONFIG_MICROVM_DEFAULT 1" >> b/qemu-microvm/x86_64-softmmu/config-target.h
 endif
 
 ifeq ($(VENDOR),UBUNTU)
@@ -268,9 +269,22 @@ binary-arch:
 
 # save block-extra loadable modules on upgrades
 # other module types for now (5.0) can't be loaded at runtime, only at startup
-	echo 'case $$1 in (upgrade|deconfigure) mkdir -p ${SAVEMODDIR}; cp -p ${libdir}/qemu/block-*.so ${SAVEMODDIR}/;; esac' \
+	echo 'case $$1 in (upgrade|deconfigure)'                \
+	'mkdir -p ${SAVEMODBASE};'                              \
+	'printf "#!/bin/sh\nexit 0\n" > ${SAVEMODBASE}/exec;'   \
+	'chmod +x ${SAVEMODBASE}/exec || true;'                 \
+	'if ! ${SAVEMODBASE}/exec 1>/dev/null 2>&1 && ! findmnt --mountpoint ${SAVEMODBASE} 1>/dev/null; then'                                              \
+	'     mount -t tmpfs --source none --target ${SAVEMODBASE} --options defaults,nosuid,nodev,exec,mode=755 || true; '                 \
+	'fi;'                                                    \
+	'echo "/var/run/qemu is a mountpoint to allow still running qemu binaries of former builds (after package upgrades) to fallback-load modules from there" > ${SAVEMODBASE}/README || true;' \
+	'mkdir -p ${SAVEMODDIR};'                               \
+	'cp -p ${libdir}/qemu/block-*.so ${SAVEMODDIR}/;;'      \
+	'esac'                                                  \
 	  >> debian/qemu-block-extra.prerm.debhelper
-	echo 'case $$1 in (purge|remove) rm -f ${SAVEMODDIR}/block-*.so;; esac' \
+
+	echo 'case $$1 in (remove) rm -f ${SAVEMODDIR}/block-*.so;; esac' \
+	  >> debian/qemu-block-extra.postrm.debhelper
+	echo 'case $$1 in (purge) umount --quiet ${SAVEMODBASE} 1>/dev/null 2>&1 || true; rm -rf "${SAVEMODBASE}" 1>/dev/null 2>&1 || true;; esac' \
 	  >> debian/qemu-block-extra.postrm.debhelper
 
 ifeq (${enable_system},enable)