[PATCH 0/4] First batch of configure cleanups

[PATCH 0/4] First batch of configure cleanups

[Paolo Bonzini]

After the Meson cleanups from yesterday, here are some
small improvements to configure, mostly removing obsolete
code.

Paolo


Paolo Bonzini (4):
  configure: remove useless code to check for Xen PCI passthrough
  configure: remove variable bogus_os
  configure: accept --enable-slirp
  configure: remove CONFIG_FILEVERSION and CONFIG_PRODUCTVERSION

 configure  | 27 +++------------------------
 version.rc |  4 ++--
 2 files changed, 5 insertions(+), 26 deletions(-)

-- 
2.29.2

[PATCH 1/4] configure: remove useless code to check for Xen PCI passthrough

[Paolo Bonzini]

meson.build is already doing the same check, so remove it from
configure.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 configure | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/configure b/configure
index 708cf365f0..085a5ad7ff 100755
--- a/configure
+++ b/configure
@@ -2879,18 +2879,6 @@ EOF
   fi
 fi
 
-if test "$xen_pci_passthrough" != "disabled"; then
-  if test "$xen" = "enabled" && test "$linux" = "yes"; then
-    xen_pci_passthrough=enabled
-  else
-    if test "$xen_pci_passthrough" = "enabled"; then
-      error_exit "User requested feature Xen PCI Passthrough" \
-          " but this feature requires /sys from Linux"
-    fi
-    xen_pci_passthrough=disabled
-  fi
-fi
-
 ##########################################
 # X11 probe
 if $pkg_config --exists "x11"; then
-- 
2.29.2

[PATCH 2/4] configure: remove variable bogus_os

[Paolo Bonzini]

The condition can be tested also from $targetos, clean up.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 configure | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/configure b/configure
index 085a5ad7ff..18af8207d9 100755
--- a/configure
+++ b/configure
@@ -467,7 +467,6 @@ gettext="auto"
 fuse="auto"
 fuse_lseek="auto"
 
-bogus_os="no"
 malloc_trim="auto"
 
 # parse CC options second
@@ -620,7 +619,6 @@ else
   # might be going to just print the --help text, or it might
   # be the result of a missing compiler.
   targetos='bogus'
-  bogus_os='yes'
 fi
 
 # Some host OSes need non-standard checks for which CPU to use.
@@ -2016,7 +2014,7 @@ if test -z "$werror" ; then
     fi
 fi
 
-if test "$bogus_os" = "yes"; then
+if test "$targetos" = "bogus"; then
     # Now that we know that we're not printing the help and that
     # the compiler works (so the results of the check_defines we used
     # to identify the OS are reliable), if we didn't recognize the
-- 
2.29.2

[PATCH 3/4] configure: accept --enable-slirp

[Paolo Bonzini]

Meson understands -Dslirp=enabled, so there is no reason not to
accept the configure option as well.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 configure | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configure b/configure
index 18af8207d9..568818e72d 100755
--- a/configure
+++ b/configure
@@ -1083,6 +1083,8 @@ for opt do
   ;;
   --disable-slirp) slirp="disabled"
   ;;
+  --enable-slirp) slirp="enabled"
+  ;;
   --enable-slirp=git) slirp="internal"
   ;;
   --enable-slirp=system) slirp="system"
-- 
2.29.2

[PATCH 4/4] configure: remove CONFIG_FILEVERSION and CONFIG_PRODUCTVERSION

[Paolo Bonzini]

version.rc can just use existing preprocessor symbols.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 configure  | 9 ---------
 version.rc | 4 ++--
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/configure b/configure
index 568818e72d..74eebfd692 100755
--- a/configure
+++ b/configure
@@ -5929,15 +5929,6 @@ if test "$bigendian" = "yes" ; then
 fi
 if test "$mingw32" = "yes" ; then
   echo "CONFIG_WIN32=y" >> $config_host_mak
-  rc_version=$(cat $source_path/VERSION)
-  version_major=${rc_version%%.*}
-  rc_version=${rc_version#*.}
-  version_minor=${rc_version%%.*}
-  rc_version=${rc_version#*.}
-  version_subminor=${rc_version%%.*}
-  version_micro=0
-  echo "CONFIG_FILEVERSION=$version_major,$version_minor,$version_subminor,$version_micro" >> $config_host_mak
-  echo "CONFIG_PRODUCTVERSION=$version_major,$version_minor,$version_subminor,$version_micro" >> $config_host_mak
   if test "$guest_agent_with_vss" = "yes" ; then
     echo "CONFIG_QGA_VSS=y" >> $config_host_mak
     echo "QGA_VSS_PROVIDER=$qga_vss_provider" >> $config_host_mak
diff --git a/version.rc b/version.rc
index d8e1569991..0daadbf981 100644
--- a/version.rc
+++ b/version.rc
@@ -2,8 +2,8 @@
 #include "config-host.h"
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION CONFIG_FILEVERSION
-PRODUCTVERSION CONFIG_PRODUCTVERSION
+FILEVERSION QEMU_VERSION_MAJOR,QEMU_VERSION_MINOR,QEMU_VERSION_MICRO,0
+PRODUCTVERSION QEMU_VERSION_MAJOR,QEMU_VERSION_MINOR,QEMU_VERSION_MICRO,0
 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 FILEOS VOS_NT_WINDOWS32
 FILETYPE VFT_APP
-- 
2.29.2

Re: [PATCH 2/4] configure: remove variable bogus_os

[Thomas Huth]

On 17/12/2020 09.50, Paolo Bonzini wrote:
> The condition can be tested also from $targetos, clean up.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  configure | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/configure b/configure
> index 085a5ad7ff..18af8207d9 100755
> --- a/configure
> +++ b/configure
> @@ -467,7 +467,6 @@ gettext="auto"
>  fuse="auto"
>  fuse_lseek="auto"
>  
> -bogus_os="no"
>  malloc_trim="auto"
>  
>  # parse CC options second
> @@ -620,7 +619,6 @@ else
>    # might be going to just print the --help text, or it might
>    # be the result of a missing compiler.
>    targetos='bogus'
> -  bogus_os='yes'
>  fi
>  
>  # Some host OSes need non-standard checks for which CPU to use.
> @@ -2016,7 +2014,7 @@ if test -z "$werror" ; then
>      fi
>  fi
>  
> -if test "$bogus_os" = "yes"; then
> +if test "$targetos" = "bogus"; then
>      # Now that we know that we're not printing the help and that
>      # the compiler works (so the results of the check_defines we used
>      # to identify the OS are reliable), if we didn't recognize the
> 

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH 3/4] configure: accept --enable-slirp

[Thomas Huth]

On 17/12/2020 09.50, Paolo Bonzini wrote:
> Meson understands -Dslirp=enabled, so there is no reason not to
> accept the configure option as well.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  configure | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/configure b/configure
> index 18af8207d9..568818e72d 100755
> --- a/configure
> +++ b/configure
> @@ -1083,6 +1083,8 @@ for opt do
>    ;;
>    --disable-slirp) slirp="disabled"
>    ;;
> +  --enable-slirp) slirp="enabled"
> +  ;;
>    --enable-slirp=git) slirp="internal"
>    ;;
>    --enable-slirp=system) slirp="system"
> 

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH 1/4] configure: remove useless code to check for Xen PCI passthrough

[Marc-André Lureau]

[-- Attachment #1: Type: text/plain, Size: 1103 bytes --]

On Thu, Dec 17, 2020 at 12:51 PM Paolo Bonzini <pbonzini@redhat.com> wrote:

> meson.build is already doing the same check, so remove it from
> configure.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>

---
>  configure | 12 ------------
>  1 file changed, 12 deletions(-)
>
> diff --git a/configure b/configure
> index 708cf365f0..085a5ad7ff 100755
> --- a/configure
> +++ b/configure
> @@ -2879,18 +2879,6 @@ EOF
>    fi
>  fi
>
> -if test "$xen_pci_passthrough" != "disabled"; then
> -  if test "$xen" = "enabled" && test "$linux" = "yes"; then
> -    xen_pci_passthrough=enabled
> -  else
> -    if test "$xen_pci_passthrough" = "enabled"; then
> -      error_exit "User requested feature Xen PCI Passthrough" \
> -          " but this feature requires /sys from Linux"
> -    fi
> -    xen_pci_passthrough=disabled
> -  fi
> -fi
> -
>  ##########################################
>  # X11 probe
>  if $pkg_config --exists "x11"; then
> --
> 2.29.2
>
>
>
>

-- 
Marc-André Lureau

[-- Attachment #2: Type: text/html, Size: 1988 bytes --]

Re: [PATCH 2/4] configure: remove variable bogus_os

[Marc-André Lureau]

[-- Attachment #1: Type: text/plain, Size: 1300 bytes --]

On Thu, Dec 17, 2020 at 12:50 PM Paolo Bonzini <pbonzini@redhat.com> wrote:

> The condition can be tested also from $targetos, clean up.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>

---
>  configure | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/configure b/configure
> index 085a5ad7ff..18af8207d9 100755
> --- a/configure
> +++ b/configure
> @@ -467,7 +467,6 @@ gettext="auto"
>  fuse="auto"
>  fuse_lseek="auto"
>
> -bogus_os="no"
>  malloc_trim="auto"
>
>  # parse CC options second
> @@ -620,7 +619,6 @@ else
>    # might be going to just print the --help text, or it might
>    # be the result of a missing compiler.
>    targetos='bogus'
> -  bogus_os='yes'
>  fi
>
>  # Some host OSes need non-standard checks for which CPU to use.
> @@ -2016,7 +2014,7 @@ if test -z "$werror" ; then
>      fi
>  fi
>
> -if test "$bogus_os" = "yes"; then
> +if test "$targetos" = "bogus"; then
>      # Now that we know that we're not printing the help and that
>      # the compiler works (so the results of the check_defines we used
>      # to identify the OS are reliable), if we didn't recognize the
> --
> 2.29.2
>
>
>
>

-- 
Marc-André Lureau

[-- Attachment #2: Type: text/html, Size: 2205 bytes --]

Re: [PATCH 3/4] configure: accept --enable-slirp

[Marc-André Lureau]

[-- Attachment #1: Type: text/plain, Size: 785 bytes --]

On Thu, Dec 17, 2020 at 12:52 PM Paolo Bonzini <pbonzini@redhat.com> wrote:

> Meson understands -Dslirp=enabled, so there is no reason not to
> accept the configure option as well.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>

---
>  configure | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/configure b/configure
> index 18af8207d9..568818e72d 100755
> --- a/configure
> +++ b/configure
> @@ -1083,6 +1083,8 @@ for opt do
>    ;;
>    --disable-slirp) slirp="disabled"
>    ;;
> +  --enable-slirp) slirp="enabled"
> +  ;;
>    --enable-slirp=git) slirp="internal"
>    ;;
>    --enable-slirp=system) slirp="system"
> --
> 2.29.2
>
>
>
>

-- 
Marc-André Lureau

[-- Attachment #2: Type: text/html, Size: 1560 bytes --]

Re: [PATCH 4/4] configure: remove CONFIG_FILEVERSION and CONFIG_PRODUCTVERSION

[Marc-André Lureau]

[-- Attachment #1: Type: text/plain, Size: 1886 bytes --]

On Thu, Dec 17, 2020 at 12:50 PM Paolo Bonzini <pbonzini@redhat.com> wrote:

> version.rc can just use existing preprocessor symbols.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>

---
>  configure  | 9 ---------
>  version.rc | 4 ++--
>  2 files changed, 2 insertions(+), 11 deletions(-)
>
> diff --git a/configure b/configure
> index 568818e72d..74eebfd692 100755
> --- a/configure
> +++ b/configure
> @@ -5929,15 +5929,6 @@ if test "$bigendian" = "yes" ; then
>  fi
>  if test "$mingw32" = "yes" ; then
>    echo "CONFIG_WIN32=y" >> $config_host_mak
> -  rc_version=$(cat $source_path/VERSION)
> -  version_major=${rc_version%%.*}
> -  rc_version=${rc_version#*.}
> -  version_minor=${rc_version%%.*}
> -  rc_version=${rc_version#*.}
> -  version_subminor=${rc_version%%.*}
> -  version_micro=0
> -  echo
> "CONFIG_FILEVERSION=$version_major,$version_minor,$version_subminor,$version_micro"
> >> $config_host_mak
> -  echo
> "CONFIG_PRODUCTVERSION=$version_major,$version_minor,$version_subminor,$version_micro"
> >> $config_host_mak
>    if test "$guest_agent_with_vss" = "yes" ; then
>      echo "CONFIG_QGA_VSS=y" >> $config_host_mak
>      echo "QGA_VSS_PROVIDER=$qga_vss_provider" >> $config_host_mak
> diff --git a/version.rc b/version.rc
> index d8e1569991..0daadbf981 100644
> --- a/version.rc
> +++ b/version.rc
> @@ -2,8 +2,8 @@
>  #include "config-host.h"
>
>  VS_VERSION_INFO VERSIONINFO
> -FILEVERSION CONFIG_FILEVERSION
> -PRODUCTVERSION CONFIG_PRODUCTVERSION
> +FILEVERSION QEMU_VERSION_MAJOR,QEMU_VERSION_MINOR,QEMU_VERSION_MICRO,0
> +PRODUCTVERSION QEMU_VERSION_MAJOR,QEMU_VERSION_MINOR,QEMU_VERSION_MICRO,0
>  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
>  FILEOS VOS_NT_WINDOWS32
>  FILETYPE VFT_APP
> --
> 2.29.2
>

-- 
Marc-André Lureau

[-- Attachment #2: Type: text/html, Size: 2793 bytes --]