From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60972) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKfvr-0005pw-UM for qemu-devel@nongnu.org; Mon, 03 Mar 2014 22:22:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WKfvh-0005Q9-Fd for qemu-devel@nongnu.org; Mon, 03 Mar 2014 22:22:15 -0500 Received: from afflict.kos.to ([92.243.29.197]:45236) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKfvh-0005PN-4O for qemu-devel@nongnu.org; Mon, 03 Mar 2014 22:22:05 -0500 From: riku.voipio@linaro.org Date: Tue, 4 Mar 2014 05:22:01 +0200 Message-Id: <1393903321-6352-5-git-send-email-riku.voipio@linaro.org> Subject: [Qemu-devel] [PATCH 4/4] linux-user: remove configure option for setting uname release List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Riku Voipio From: Riku Voipio The --enable-uname-release is rather heavyweight hammer, as it allows providing values less that UNAME_MINIMUM_RELEASE. Also, it affects all built linux-user targets, which in most cases not what you want. Now that we have UNAME_MINIMUM_RELEASE for all linux-user platforms, we can drop --enable-uname-release and the related CONFIG_UNAME_RELEASE define. Users can still override the variable with QEMU_UNAME=2.6.32 or -r command line option. If distributors need to update a minimum version for a specific target, it should be done by updating UNAME_MINIMUM_RELEASE. Signed-off-by: Riku Voipio --- configure | 8 -------- linux-user/main.c | 2 +- linux-user/uname.c | 2 -- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/configure b/configure index 8ad03ea..52804b8 100755 --- a/configure +++ b/configure @@ -267,7 +267,6 @@ softmmu="yes" linux_user="no" bsd_user="no" guest_base="yes" -uname_release="" aix="no" blobs="yes" pkgversion="" @@ -921,8 +920,6 @@ for opt do ;; --disable-pie) pie="no" ;; - --enable-uname-release=*) uname_release="$optarg" - ;; --enable-werror) werror="yes" ;; --disable-werror) werror="no" @@ -1253,7 +1250,6 @@ Advanced options (experts only): --fmod-lib path to FMOD library --fmod-inc path to FMOD includes --oss-lib path to OSS library - --enable-uname-release=R Return R for uname -r in usermode emulation --cpu=CPU Build for host CPU [$cpu] --disable-uuid disable uuid support --enable-uuid enable uuid support @@ -3993,8 +3989,6 @@ echo "xen support $xen" echo "brlapi support $brlapi" echo "bluez support $bluez" echo "Documentation $docs" -[ ! -z "$uname_release" ] && \ -echo "uname -r $uname_release" echo "GUEST_BASE $guest_base" echo "PIE $pie" echo "vde support $vde" @@ -4390,8 +4384,6 @@ if [ "$bsd" = "yes" ] ; then echo "CONFIG_BSD=y" >> $config_host_mak 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 diff --git a/linux-user/main.c b/linux-user/main.c index c19e7fb..0514d7d 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -69,7 +69,7 @@ unsigned long reserved_va; static void usage(void); static const char *interp_prefix = CONFIG_QEMU_INTERP_PREFIX; -const char *qemu_uname_release = CONFIG_UNAME_RELEASE; +const char *qemu_uname_release; /* XXX: on x86 MAP_GROWSDOWN only works if ESP <= address + 32, so we allocate a bigger stack. Need a better solution, for example diff --git a/linux-user/uname.c b/linux-user/uname.c index fa5013e..f5d4c66 100644 --- a/linux-user/uname.c +++ b/linux-user/uname.c @@ -155,7 +155,6 @@ void init_qemu_uname_release(void) * a specific fake version number, we might want to fake a minimum * target kernel version. */ -#ifdef UNAME_MINIMUM_RELEASE struct new_utsname buf; if (qemu_uname_release && *qemu_uname_release) { @@ -169,5 +168,4 @@ void init_qemu_uname_release(void) if (relstr_to_int(buf.release) < relstr_to_int(UNAME_MINIMUM_RELEASE)) { qemu_uname_release = UNAME_MINIMUM_RELEASE; } -#endif } -- 1.8.1.2