From patchwork Tue Mar 4 03:22:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 25646 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f70.google.com (mail-pa0-f70.google.com [209.85.220.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0D39920E1E for ; Tue, 4 Mar 2014 04:15:06 +0000 (UTC) Received: by mail-pa0-f70.google.com with SMTP id lj1sf45513pab.5 for ; Mon, 03 Mar 2014 20:15:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:cc:subject:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:errors-to:sender :x-original-sender:x-original-authentication-results:mailing-list; bh=0p5H0a/SCPA5OJtz6xcFL6ZzAYW3xdbAtezk79Tt+UY=; b=LDaOXFScerYip/gUrYD0nntxDd+21WobCk2ByZI+Wvu647TSavZ46t31HuKROKK4g0 9GifjI+3mjtw/VNOvhRdn81uV//9oDGw9juT48QTdQhdxDiYJsvMpKN/iYoQJrZgAVyp 6vP2OZetE0cSwsMofJ72X/0Bs0fNPk+DVSYE/H8Sfop+Mubn7AoDD+2DyXv+5bTRVM4S un/MQxuAfI7Jiz7HBpNUCoX6M/N2/7nq0jo7UhujJAyw/eA8ziEFzwsFhVG7l1WWCcYE GkZTH/x+nqCN04qMFu8bOFJw8eclVpE6k/twEX9algqCmiHpPK0ey3smdFbok23GWzeC 4qXQ== X-Gm-Message-State: ALoCoQltQ/n044XBuKdNzq7RuQaOML6W8sRx0z7t4FNNiQiAgQz0FNdSUTFoW6WKQ0lFQzQU2VcO X-Received: by 10.66.222.105 with SMTP id ql9mr1663572pac.9.1393906506041; Mon, 03 Mar 2014 20:15:06 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.109.9 with SMTP id k9ls2410266qgf.78.gmail; Mon, 03 Mar 2014 20:15:05 -0800 (PST) X-Received: by 10.52.30.167 with SMTP id t7mr555481vdh.36.1393906505822; Mon, 03 Mar 2014 20:15:05 -0800 (PST) Received: from mail-ve0-f179.google.com (mail-ve0-f179.google.com [209.85.128.179]) by mx.google.com with ESMTPS id tx7si5503770vcb.8.2014.03.03.20.15.05 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 03 Mar 2014 20:15:05 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.179; Received: by mail-ve0-f179.google.com with SMTP id db12so4969259veb.10 for ; Mon, 03 Mar 2014 20:15:05 -0800 (PST) X-Received: by 10.220.99.7 with SMTP id s7mr19965928vcn.19.1393906454948; Mon, 03 Mar 2014 20:14:14 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.130.193 with SMTP id u1csp100123vcs; Mon, 3 Mar 2014 20:14:14 -0800 (PST) X-Received: by 10.140.42.138 with SMTP id c10mr27409304qga.24.1393906454605; Mon, 03 Mar 2014 20:14:14 -0800 (PST) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id v2si7191098qaf.150.2014.03.03.20.14.14 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 03 Mar 2014 20:14:14 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:42760 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKfwd-0006mb-An for patch@linaro.org; Mon, 03 Mar 2014 22:23:03 -0500 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 Received: from localhost.localdomain (afflict [92.243.29.197]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by afflict.kos.to (Postfix) with ESMTPSA id 0402B26564; Tue, 4 Mar 2014 04:22:03 +0100 (CET) From: riku.voipio@linaro.org To: qemu-devel@nongnu.org Date: Tue, 4 Mar 2014 05:22:01 +0200 Message-Id: <1393903321-6352-5-git-send-email-riku.voipio@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 92.243.29.197 Cc: peter.maydell@linaro.org, Riku Voipio Subject: [Qemu-devel] [PATCH 4/4] linux-user: remove configure option for setting uname release X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: riku.voipio@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 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 }