From 6c651516cf9e3fb9d5ba01c578623e2486cdc5cc18240cbe78f188d87a7c81f5 Mon Sep 17 00:00:00 2001
From: Dario Faggioli <dfaggioli@suse.com>
Date: Wed, 22 Dec 2021 13:19:53 +0000
Subject: [PATCH] Accepting request 942112 from
 home:dfaggioli:devel:Virtualization

- Fix testsuite failures by not using modules when building tests
  (and some other, also testsuite related, spec file problems)

OBS-URL: https://build.opensuse.org/request/show/942112
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=683
---
 bundles.tar.xz |  4 ++--
 qemu.changes   |  6 ++++++
 qemu.spec      | 12 +++++++-----
 qemu.spec.in   | 12 +++++++-----
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/bundles.tar.xz b/bundles.tar.xz
index 6e690729..1d9cecb4 100644
--- a/bundles.tar.xz
+++ b/bundles.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:34924e1221d39db283ce02f2e0989a35e3bfb78a6a23f86ca2ce27c74c766542
-size 52064
+oid sha256:1c7bb0acf48f788bbea9ade9b849b5a2024ccef40d2ab9e2682e7412c87bb413
+size 56384
diff --git a/qemu.changes b/qemu.changes
index f627e798..b25310fb 100644
--- a/qemu.changes
+++ b/qemu.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Dec 22 08:51:15 UTC 2021 - Dario Faggioli <dfaggioli@suse.com>
+
+- Fix testsuite failures by not using modules when building tests
+  (and some other, also testsuite related, spec file problems)
+
 -------------------------------------------------------------------
 Tue Dec 21 04:18:07 UTC 2021 - Lin Ma <lma@suse.com>
 
diff --git a/qemu.spec b/qemu.spec
index d8897b68..dfdb462f 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -1278,6 +1278,10 @@ cd %blddir
 %endif
 %if "%flavor" != "testsuite"
 	--disable-qom-cast-debug \
+	--enable-modules \
+	--disable-module-upgrades \
+%else
+	--disable-modules \
 %endif
 	--with-git-submodules=ignore \
 %if "%{name}" != "qemu-linux-user"
@@ -1285,8 +1289,6 @@ cd %blddir
 	--with-default-devices \
 	--enable-system --disable-linux-user \
 	--enable-tools --enable-guest-agent \
-	--enable-modules \
-	--disable-module-upgrades \
 	--enable-slirp=system \
 	--enable-pie \
 	--enable-docs \
@@ -1588,7 +1590,7 @@ make %{?_smp_mflags} -C %srcdir/roms opensbi64-generic CROSS_COMPILE=
 # ------------------------------------------------------------------------
 %if "%{name}" == "qemu-testsuite"
 
-# TODO: Some of these are actually overwritten during the following make's
+# XXX: What's the point of all this, if we need to rebuild everything anyway?!?
 ln -s %_bindir/qemu-img qemu-img
 ln -s %_bindir/qemu-ga qemu-ga
 ln -s %_bindir/qemu-io qemu-io
@@ -1607,8 +1609,8 @@ do
   ln -s %_datadir/qemu/$i pc-bios/$i
 done
 
-for conf in %{_builddir}/%buildsubdir/default-configs/targets/*-softmmu.mak; do
-  arch=`echo "$conf" | sed -e 's|%{_builddir}/%buildsubdir/default-configs/targets/\(.*\)-softmmu.mak|\1|g'`
+for conf in %{_builddir}/%buildsubdir/configs/targets/*-softmmu.mak; do
+  arch=`echo "$conf" | sed -e 's|%{_builddir}/%buildsubdir/configs/targets/\(.*\)-softmmu.mak|\1|g'`
   if $(unlink $arch-softmmu/qemu-system-$arch); then
     ln -s %_bindir/qemu-system-$arch $arch-softmmu/qemu-system-$arch
   fi
diff --git a/qemu.spec.in b/qemu.spec.in
index 140fa094..19ea8d31 100644
--- a/qemu.spec.in
+++ b/qemu.spec.in
@@ -1141,6 +1141,10 @@ cd %blddir
 %endif
 %if "%flavor" != "testsuite"
 	--disable-qom-cast-debug \
+	--enable-modules \
+	--disable-module-upgrades \
+%else
+	--disable-modules \
 %endif
 	--with-git-submodules=ignore \
 %if "%{name}" != "qemu-linux-user"
@@ -1148,8 +1152,6 @@ cd %blddir
 	--with-default-devices \
 	--enable-system --disable-linux-user \
 	--enable-tools --enable-guest-agent \
-	--enable-modules \
-	--disable-module-upgrades \
 	--enable-slirp=system \
 	--enable-pie \
 	--enable-docs \
@@ -1451,7 +1453,7 @@ make %{?_smp_mflags} -C %srcdir/roms opensbi64-generic CROSS_COMPILE=
 # ------------------------------------------------------------------------
 %if "%{name}" == "qemu-testsuite"
 
-# TODO: Some of these are actually overwritten during the following make's
+# XXX: What's the point of all this, if we need to rebuild everything anyway?!?
 ln -s %_bindir/qemu-img qemu-img
 ln -s %_bindir/qemu-ga qemu-ga
 ln -s %_bindir/qemu-io qemu-io
@@ -1470,8 +1472,8 @@ do
   ln -s %_datadir/qemu/$i pc-bios/$i
 done
 
-for conf in %{_builddir}/%buildsubdir/default-configs/targets/*-softmmu.mak; do
-  arch=`echo "$conf" | sed -e 's|%{_builddir}/%buildsubdir/default-configs/targets/\(.*\)-softmmu.mak|\1|g'`
+for conf in %{_builddir}/%buildsubdir/configs/targets/*-softmmu.mak; do
+  arch=`echo "$conf" | sed -e 's|%{_builddir}/%buildsubdir/configs/targets/\(.*\)-softmmu.mak|\1|g'`
   if $(unlink $arch-softmmu/qemu-system-$arch); then
     ln -s %_bindir/qemu-system-$arch $arch-softmmu/qemu-system-$arch
   fi