]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'remotes/berrange/tags/autofree-pull-request' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 22 Aug 2019 16:57:09 +0000 (17:57 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 22 Aug 2019 16:57:09 +0000 (17:57 +0100)
require newer glib2 to enable autofree'ing of stack variables exiting scope

* Bump minium glib2 version to 2.48
* Convert much of the crypto code to use automatic memory free functions

# gpg: Signature made Thu 22 Aug 2019 11:51:59 BST
# gpg:                using RSA key DAF3A6FDB26B62912D0E8E3FBE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>" [full]
# gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>" [full]
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E  8E3F BE86 EBB4 1510 4FDF

* remotes/berrange/tags/autofree-pull-request:
  crypto: use auto cleanup for many stack variables
  crypto: define cleanup functions for use with g_autoptr
  glib: bump min required glib library version to 2.48

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
1  2 
configure

diff --combined configure
index 293b16f9199bb4851c8f650e85c0d43568b48608,3a020aefd88666edcb68686d4b28d344f52e92ca..e44e454c432a70940a066773a4f20d743bf23862
+++ b/configure
  ##########################################
  # glib support probe
  
- glib_req_ver=2.40
+ glib_req_ver=2.48
  glib_modules=gthread-2.0
  if test "$modules" = yes; then
      glib_modules="$glib_modules gmodule-export-2.0"
@@@ -6129,7 -6129,7 +6129,7 @@@ if [ "$guest_agent" != "no" ]; the
    if [ "$softmmu" = no -a "$want_tools" = no ] ; then
        guest_agent=no
    elif [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" -o "$mingw32" = "yes" ] ; then
 -      tools="qemu-ga $tools"
 +      tools="qemu-ga\$(EXESUF) $tools"
        guest_agent=yes
    elif [ "$guest_agent" != yes ]; then
        guest_agent=no
  if test "$profiler" = "yes" ; then
    echo "CONFIG_PROFILER=y" >> $config_host_mak
  fi
 +if test "$want_tools" = "yes" ; then
 +  echo "CONFIG_TOOLS=y" >> $config_host_mak
 +fi
  if test "$slirp" != "no"; then
    echo "CONFIG_SLIRP=y" >> $config_host_mak
    echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak
@@@ -7363,6 -7360,11 +7363,6 @@@ if test "$sparse" = "yes" ; the
    echo "HOST_CC      := REAL_CC=\"\$(HOST_CC)\" cgcc"  >> $config_host_mak
    echo "QEMU_CFLAGS  += -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-non-pointer-null" >> $config_host_mak
  fi
 -if test "$cross_prefix" != ""; then
 -  echo "AUTOCONF_HOST := --host=${cross_prefix%-}"     >> $config_host_mak
 -else
 -  echo "AUTOCONF_HOST := "                             >> $config_host_mak
 -fi
  echo "LDFLAGS=$LDFLAGS" >> $config_host_mak
  echo "LDFLAGS_NOPIE=$LDFLAGS_NOPIE" >> $config_host_mak
  echo "QEMU_LDFLAGS=$QEMU_LDFLAGS" >> $config_host_mak