Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 .gitlab-ci.d/crossbuild-template.yml | 2 +-
 configure                            | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.gitlab-ci.d/crossbuild-template.yml b/.gitlab-ci.d/crossbuild-template.yml
index 10d22dcf6c..87cb8b7518 100644
--- a/.gitlab-ci.d/crossbuild-template.yml
+++ b/.gitlab-ci.d/crossbuild-template.yml
@@ -12,7 +12,7 @@
           mips64-softmmu ppc-softmmu riscv32-softmmu sh4-softmmu
           sparc-softmmu xtensa-softmmu $CROSS_SKIP_TARGETS"
     - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS
-    - if grep -q "EXESUF=.exe" config-host.mak;
+    - if test -f qemu-io.exe;
       then make installer;
       version="$(git describe --match v[0-9]*)";
       mv -v qemu-setup*.exe qemu-setup-${version}.exe;
diff --git a/configure b/configure
index 039467c04b..a4489bc23f 100755
--- a/configure
+++ b/configure
@@ -308,7 +308,6 @@ fortify_source="$default_feature"
 strip_opt="yes"
 mingw32="no"
 gcov="no"
-EXESUF=""
 modules="no"
 module_upgrades="no"
 prefix="/usr/local"
@@ -713,7 +712,6 @@ else
 fi
 
 if test "$mingw32" = "yes" ; then
-  EXESUF=".exe"
   # MinGW needs -mthreads for TLS and macro _MT.
   CONFIGURE_CFLAGS="-mthreads $CONFIGURE_CFLAGS"
   write_c_skeleton;
@@ -3814,7 +3812,6 @@ echo "GLIB_CFLAGS=$glib_cflags" >> $config_host_mak
 echo "GLIB_LIBS=$glib_libs" >> $config_host_mak
 echo "QEMU_LDFLAGS=$QEMU_LDFLAGS" >> $config_host_mak
 echo "LD_I386_EMULATION=$ld_i386_emulation" >> $config_host_mak
-echo "EXESUF=$EXESUF" >> $config_host_mak
 echo "LIBS_QGA=$libs_qga" >> $config_host_mak
 
 if test "$rng_none" = "yes"; then
-- 
2.31.1

On 10/15/21 12:07, Paolo Bonzini wrote:
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  .gitlab-ci.d/crossbuild-template.yml | 2 +-
>  configure                            | 3 ---
>  2 files changed, 1 insertion(+), 4 deletions(-)

Maybe squash in patch #2 or place as #3 mentioning
"the previous commit"?

On 15/10/21 14:38, Philippe Mathieu-Daudé wrote:
> On 10/15/21 12:07, Paolo Bonzini wrote:
>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>> ---
>>   .gitlab-ci.d/crossbuild-template.yml | 2 +-
>>   configure                            | 3 ---
>>   2 files changed, 1 insertion(+), 4 deletions(-)
> 
> Maybe squash in patch #2 or place as #3 mentioning
> "the previous commit"?

Anywhere you place it it's wrong. :)  Squashing in #2 I dislike because 
of the functional change in .gilab-ci.d (in truth, the variable is 
*almost* dead!).  Having the change as #4 makes it survive one patch 
longer than it should, on the other hand having it as #3 separates 
similar changes to "check-block.sh".

What I will actually do in the final submission is not include the TAP 
patch and submit it separately.  Then for this one I can indeed add that 
it was used only in the implementation of check-block.

Paolo

On 10/15/21 15:36, Paolo Bonzini wrote:
> On 15/10/21 14:38, Philippe Mathieu-Daudé wrote:
>> On 10/15/21 12:07, Paolo Bonzini wrote:
>>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>>> ---
>>>   .gitlab-ci.d/crossbuild-template.yml | 2 +-
>>>   configure                            | 3 ---
>>>   2 files changed, 1 insertion(+), 4 deletions(-)
>>
>> Maybe squash in patch #2 or place as #3 mentioning
>> "the previous commit"?
> 
> Anywhere you place it it's wrong. :)  Squashing in #2 I dislike because
> of the functional change in .gilab-ci.d (in truth, the variable is
> *almost* dead!).  Having the change as #4 makes it survive one patch
> longer than it should, on the other hand having it as #3 separates
> similar changes to "check-block.sh".

Indeed.

> What I will actually do in the final submission is not include the TAP
> patch and submit it separately.  Then for this one I can indeed add that
> it was used only in the implementation of check-block.

OK then,
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>