Merge pull request #1496 from wainersm/qemu_5_2-respin

Bump to QEMU 5.2.0 - respin

snap/snapcraft.yaml

@@ -278,7 +278,7 @@ parts:
       chmod +x ${configure_hypervisor}
       # static build. The --prefix, --libdir, --libexecdir, --datadir arguments are
       # based on PREFIX and set by configure-hypervisor.sh
-      echo "$(PREFIX=/snap/${SNAPCRAFT_PROJECT_NAME}/current/usr ${configure_hypervisor} -s qemu) \
+      echo "$(PREFIX=/snap/${SNAPCRAFT_PROJECT_NAME}/current/usr ${configure_hypervisor} -s kata-qemu) \
         --disable-rbd " \
         | xargs ./configure
 
@@ -294,7 +294,6 @@ parts:
       - -usr/bin/qemu-pr-helper
       - -usr/bin/virtfs-proxy-helper
       - -usr/include/
-      - -usr/libexec/
       - -usr/share/applications/
       - -usr/share/icons/
       - -usr/var/

tools/packaging/scripts/configure-hypervisor.sh

@@ -474,6 +474,8 @@ generate_qemu_options() {
 	# On version 5.2.0 onward the Meson build system warns to not use -O3
 	if ! gt_eq "${qemu_version}" "5.2.0" ; then
 		_qemu_cflags+=" -O3"
+	else
+		_qemu_cflags+=" -O2"
 	fi
 
 	# Improve code quality by assuming identical semantics for interposed