[Qemu-devel] [PATCH for-1.5 7/9] build: disable QOM cast debugging for official releases

[Paolo Bonzini]

QOM cast debugging is useful, but it can have a substantial cost.  We
will add a configure option to toggle it, in the meanwhile let's keep
it disabled in official releases (including -rc).

Replace the old CONFIG_ZERO_MALLOC that had the same rules but has
been unused since we switched to g_malloc/g_free.

Signed-off-by: Paolo Bonzini <address@hidden>
---
 configure | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/configure b/configure
index dd44562..39c7207 100755
--- a/configure
+++ b/configure
@@ -219,8 +219,7 @@ aix="no"
 blobs="yes"
 pkgversion=""
 pie=""
-zero_malloc=""
-qom_cast_debug="yes"
+qom_cast_debug=""
 trace_backend="nop"
 trace_file="trace"
 spice=""
@@ -3390,13 +3389,13 @@ elif test "$debug" = "no" ; then
 fi
 
 
-# Disable zero malloc errors for official releases unless explicitly told to
-# enable/disable
-if test -z "$zero_malloc" ; then
+# Enable QOM casts debugging by default during development unless explicitly
+# told to enable/disable
+if test -z "$qom_cast_debug" ; then
     if test "$z_version" = "50" ; then
-       zero_malloc="no"
+       qom_cast_debug="yes"
     else
-       zero_malloc="yes"
+       qom_cast_debug="no"
     fi
 fi
 
@@ -3911,9 +3910,6 @@ fi
 
 echo "CONFIG_UNAME_RELEASE=\"$uname_release\"" >> $config_host_mak
 
-if test "$zero_malloc" = "yes" ; then
-  echo "CONFIG_ZERO_MALLOC=y" >> $config_host_mak
-fi
 if test "$qom_cast_debug" = "yes" ; then
   echo "CONFIG_QOM_CAST_DEBUG=y" >> $config_host_mak
 fi
-- 
1.8.1.4