| Message ID | 1465398683-3152-1-git-send-email-thuth@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 08/06/2016 17:11, Thomas Huth wrote: > CONFIG_ZERO_MALLOC was only used in qemu-malloc.c and > this file has been removed with the following commit: > > 41a748265f4879b52b0e87ff9c93bed975163886 > Remove qemu_malloc/qemu_free > > So we don't need this configuration setting anymore. > This patch also removes the z_version variable, since > this is now also not needed anymore. > > Signed-off-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Laurent Vivier <lvivier@redhat.com> > --- > configure | 16 ---------------- > 1 file changed, 16 deletions(-) > > diff --git a/configure b/configure > index 4627d2c..316297b 100755 > --- a/configure > +++ b/configure > @@ -270,7 +270,6 @@ aix="no" > blobs="yes" > pkgversion="" > pie="" > -zero_malloc="" > qom_cast_debug="yes" > trace_backends="log" > trace_file="trace" > @@ -1389,8 +1388,6 @@ fi > > # Consult white-list to determine whether to enable werror > # by default. Only enable by default for git builds > -z_version=$(cut -f3 -d. $source_path/VERSION) > - > if test -z "$werror" ; then > if test -d "$source_path/.git" -a \ > "$linux" = "yes" ; then > @@ -4575,16 +4572,6 @@ if test "$libnfs" != "no" ; then > fi > fi > > -# Disable zero malloc errors for official releases unless explicitly told to > -# enable/disable > -if test -z "$zero_malloc" ; then > - if test "$z_version" = "50" ; then > - zero_malloc="no" > - else > - zero_malloc="yes" > - fi > -fi > - > # Now we've finished running tests it's OK to add -Werror to the compiler flags > if test "$werror" = "yes"; then > QEMU_CFLAGS="-Werror $QEMU_CFLAGS" > @@ -5346,9 +5333,6 @@ if [ "$bsd" = "yes" ] ; then > echo "CONFIG_BSD=y" >> $config_host_mak > fi > > -if test "$zero_malloc" = "yes" ; then > - echo "CONFIG_ZERO_MALLOC=y" >> $config_host_mak > -fi > if test "$localtime_r" = "yes" ; then > echo "CONFIG_LOCALTIME_R=y" >> $config_host_mak > fi >
diff --git a/configure b/configure index 4627d2c..316297b 100755 --- a/configure +++ b/configure @@ -270,7 +270,6 @@ aix="no" blobs="yes" pkgversion="" pie="" -zero_malloc="" qom_cast_debug="yes" trace_backends="log" trace_file="trace" @@ -1389,8 +1388,6 @@ fi # Consult white-list to determine whether to enable werror # by default. Only enable by default for git builds -z_version=$(cut -f3 -d. $source_path/VERSION) - if test -z "$werror" ; then if test -d "$source_path/.git" -a \ "$linux" = "yes" ; then @@ -4575,16 +4572,6 @@ if test "$libnfs" != "no" ; then fi fi -# Disable zero malloc errors for official releases unless explicitly told to -# enable/disable -if test -z "$zero_malloc" ; then - if test "$z_version" = "50" ; then - zero_malloc="no" - else - zero_malloc="yes" - fi -fi - # Now we've finished running tests it's OK to add -Werror to the compiler flags if test "$werror" = "yes"; then QEMU_CFLAGS="-Werror $QEMU_CFLAGS" @@ -5346,9 +5333,6 @@ if [ "$bsd" = "yes" ] ; then echo "CONFIG_BSD=y" >> $config_host_mak fi -if test "$zero_malloc" = "yes" ; then - echo "CONFIG_ZERO_MALLOC=y" >> $config_host_mak -fi if test "$localtime_r" = "yes" ; then echo "CONFIG_LOCALTIME_R=y" >> $config_host_mak fi
CONFIG_ZERO_MALLOC was only used in qemu-malloc.c and this file has been removed with the following commit: 41a748265f4879b52b0e87ff9c93bed975163886 Remove qemu_malloc/qemu_free So we don't need this configuration setting anymore. This patch also removes the z_version variable, since this is now also not needed anymore. Signed-off-by: Thomas Huth <thuth@redhat.com> --- configure | 16 ---------------- 1 file changed, 16 deletions(-)