[Qemu-devel] [PATCH 1/2] configure: remove unused or undefined variables

[Qemu-devel] [PATCH 1/2] configure: remove unused or undefined variables

[marcandre.lureau]

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

Found thanks to shellcheck!

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 configure | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/configure b/configure
index b55dcdd..6a971a2 100755
--- a/configure
+++ b/configure
@@ -3994,7 +3994,6 @@ EOF
 fi
 
 # check for smartcard support
-smartcard_cflags=""
 if test "$smartcard" != "no"; then
     if $pkg_config libcacard; then
         libcacard_cflags=$($pkg_config --cflags libcacard)
@@ -4356,7 +4355,6 @@ fi
 # If we can't selectively disable warning in the code, disable -Werror so that
 # the build doesn't fail anyway.
 
-pragma_disable_unused_but_set=no
 cat > $TMPC << EOF
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
@@ -4791,9 +4789,6 @@ if test "$vnc" = "yes" ; then
     echo "VNC JPEG support  $vnc_jpeg"
     echo "VNC PNG support   $vnc_png"
 fi
-if test -n "$sparc_cpu"; then
-    echo "Target Sparc Arch $sparc_cpu"
-fi
 echo "xen support       $xen"
 if test "$xen" = "yes" ; then
   echo "xen ctrl version  $xen_ctrl_version"
@@ -5285,7 +5280,6 @@ if test "$qom_cast_debug" = "yes" ; then
 fi
 if test "$rbd" = "yes" ; then
   echo "CONFIG_RBD=m" >> $config_host_mak
-  echo "RBD_CFLAGS=$rbd_cflags" >> $config_host_mak
   echo "RBD_LIBS=$rbd_libs" >> $config_host_mak
 fi
 
-- 
2.5.0

[Qemu-devel] [PATCH 2/2] configure: fix trace backend check

[marcandre.lureau]

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

Found thanks to shellcheck!

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 6a971a2..ba57b3f 100755
--- a/configure
+++ b/configure
@@ -4816,7 +4816,7 @@ echo "libcap-ng support $cap_ng"
 echo "vhost-net support $vhost_net"
 echo "vhost-scsi support $vhost_scsi"
 echo "Trace backends    $trace_backends"
-if test "$trace_backend" = "simple"; then
+if have_backend "simple"; then
 echo "Trace output file $trace_file-<pid>"
 fi
 if test "$spice" = "yes"; then
-- 
2.5.0

Re: [Qemu-devel] [PATCH 2/2] configure: fix trace backend check

[Eric Blake]

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

On 12/09/2015 05:47 PM, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
> 
> Found thanks to shellcheck!
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>  configure | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Eric Blake <eblake@redhat.com>

> 
> diff --git a/configure b/configure
> index 6a971a2..ba57b3f 100755
> --- a/configure
> +++ b/configure
> @@ -4816,7 +4816,7 @@ echo "libcap-ng support $cap_ng"
>  echo "vhost-net support $vhost_net"
>  echo "vhost-scsi support $vhost_scsi"
>  echo "Trace backends    $trace_backends"
> -if test "$trace_backend" = "simple"; then
> +if have_backend "simple"; then
>  echo "Trace output file $trace_file-<pid>"
>  fi
>  if test "$spice" = "yes"; then
> 

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]

Re: [Qemu-devel] [PATCH 2/2] configure: fix trace backend check

[Michael Tokarev]

Applied to -trivial, thanks!

/mjt

Re: [Qemu-devel] [PATCH 1/2] configure: remove unused or undefined variables

[Eric Blake]

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

On 12/09/2015 05:47 PM, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
> 
> Found thanks to shellcheck!

When sending two or more patches in a series, it's best to also include
a 0/2 cover letter.  It doesn't matter how trivial the patches are;
series are handled better by the tooling when they have a cover.

> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>  configure | 6 ------
>  1 file changed, 6 deletions(-)
> 

Reviewed-by: Eric Blake <eblake@redhat.com>

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]

Re: [Qemu-devel] [PATCH 1/2] configure: remove unused or undefined variables

[Michael Tokarev]

10.12.2015 03:47, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
> 
> Found thanks to shellcheck!
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>  configure | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/configure b/configure
> index b55dcdd..6a971a2 100755
> --- a/configure
> +++ b/configure
> @@ -3994,7 +3994,6 @@ EOF
>  fi
>  
>  # check for smartcard support
> -smartcard_cflags=""
>  if test "$smartcard" != "no"; then
>      if $pkg_config libcacard; then
>          libcacard_cflags=$($pkg_config --cflags libcacard)
> @@ -4356,7 +4355,6 @@ fi
>  # If we can't selectively disable warning in the code, disable -Werror so that
>  # the build doesn't fail anyway.
>  
> -pragma_disable_unused_but_set=no
>  cat > $TMPC << EOF
>  #pragma GCC diagnostic push
>  #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
> @@ -4791,9 +4789,6 @@ if test "$vnc" = "yes" ; then
>      echo "VNC JPEG support  $vnc_jpeg"
>      echo "VNC PNG support   $vnc_png"
>  fi
> -if test -n "$sparc_cpu"; then
> -    echo "Target Sparc Arch $sparc_cpu"
> -fi
>  echo "xen support       $xen"
>  if test "$xen" = "yes" ; then
>    echo "xen ctrl version  $xen_ctrl_version"
> @@ -5285,7 +5280,6 @@ if test "$qom_cast_debug" = "yes" ; then
>  fi
>  if test "$rbd" = "yes" ; then
>    echo "CONFIG_RBD=m" >> $config_host_mak
> -  echo "RBD_CFLAGS=$rbd_cflags" >> $config_host_mak

RBD_CFLAGS is used in block/Makefile.objs.  We should either
drop that variable from there or actually define rbd_cflags
in configure.  Without either of these, this patch is incomplete.

Thanks,

/mjt

>    echo "RBD_LIBS=$rbd_libs" >> $config_host_mak
>  fi
>  
>