diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2009-12-09 12:59:36 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-12-12 08:17:26 -0600 |
| commit | d7b81937161232f0cfdefbbbc151bf43d1404aae (patch) | |
| tree | 87d634d61e3cd141c0c8fa0d9e8394832974cf1d /configure | |
| parent | 2e51813417d2a60f0fa2e0e5a4707b47440b4361 (diff) | |
Do not abort on qemu_malloc(0) in production builds
qemu_malloc() does not allow size=0 to be passed in and aborts on this behavior.
Unfortunately, there is good reason to believe that within qemu, there are a
number of, so far, undetected places that assume size=0 can be safely passed.
Since we do not want to abort unnecessarily in production builds, return
qemu_malloc(1) whenever the version file indicates that this is a production
build.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
(cherry picked from commit 20ff6c8066eb5346b9e066851cf8a1e0564a0f1a)
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 18 |
1 files changed, 17 insertions, 1 deletions
@@ -256,6 +256,7 @@ blobs="yes" pkgversion="" check_utests="no" user_pie="no" +zero_malloc="" # OS specific if check_define __linux__ ; then @@ -1792,8 +1793,9 @@ 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 - z_version=`cut -f3 -d. $source_path/VERSION` if test "$z_version" = "50" -a \ "$linux" = "yes" ; then werror="yes" @@ -1802,6 +1804,16 @@ if test -z "$werror" ; 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 + if test "$werror" = "yes" ; then QEMU_CFLAGS="-Werror $QEMU_CFLAGS" fi @@ -2109,6 +2121,10 @@ 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 + # USB host support case "$usb" in linux) |