From patchwork Fri May 2 19:15:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 29579 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f199.google.com (mail-ie0-f199.google.com [209.85.223.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E283C203F3 for ; Fri, 2 May 2014 19:21:19 +0000 (UTC) Received: by mail-ie0-f199.google.com with SMTP id rl12sf26500111iec.6 for ; Fri, 02 May 2014 12:21:19 -0700 (PDT) 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:in-reply-to:references: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=aKAuMRoR8SihNQmD8tB6z2QRM81hV39OiFUBLZsNNkA=; b=L/kxp9b3rpDtytJ8Ir/K41kwwaUq/4vrd86UE1v22Xm5SVrzhMj7NZnHRk5ytbbAfl rYvp4bVUsrou88zyZvNOj1EtDBCNf6NYdc6flieXrQri/Zfj0fQXAGAUxPye6b0bqwQq TZ5UwXQpfN0rwv1rT1CJokqOvdG9IkZBERGfgzk5WFSwQeabpksSM3oalkI9cKIatPbY In1jNNcfvyYjQsyaz2f5UCOSWv3nxWjDZcE6rGIBgMF677rKgEyuE9Qfs0wuP3qxUB4c lF7o4KNuSwOUv/L1HMhhylFqB7Djz04syrdvXe0kOZsV9OcOhxZNUzgi1HTdNFB/Rp/h BFyA== X-Gm-Message-State: ALoCoQm+JX5/c6Mbaj9CgQZIJd0klWaRdYUS9qaJuCOtXKnzPnSz4rzHeEIAcNySBGs0lLoX4nul X-Received: by 10.43.139.66 with SMTP id iv2mr9125257icc.17.1399058479406; Fri, 02 May 2014 12:21:19 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.103.118 with SMTP id x109ls1572947qge.74.gmail; Fri, 02 May 2014 12:21:19 -0700 (PDT) X-Received: by 10.52.249.48 with SMTP id yr16mr829364vdc.62.1399058479271; Fri, 02 May 2014 12:21:19 -0700 (PDT) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id cx8si3161345vec.111.2014.05.02.12.21.19 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 02 May 2014 12:21:19 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.220.173; Received: by mail-vc0-f173.google.com with SMTP id ik5so5799854vcb.4 for ; Fri, 02 May 2014 12:21:19 -0700 (PDT) X-Received: by 10.58.187.9 with SMTP id fo9mr14305524vec.4.1399058479193; Fri, 02 May 2014 12:21:19 -0700 (PDT) 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.221.72 with SMTP id ib8csp126027vcb; Fri, 2 May 2014 12:21:18 -0700 (PDT) X-Received: by 10.224.166.129 with SMTP id m1mr25502020qay.58.1399058478805; Fri, 02 May 2014 12:21:18 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id r97si6442631qga.42.2014.05.02.12.21.18 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 02 May 2014 12:21:18 -0700 (PDT) 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]:45987 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WgJ1K-0007IY-7s for patch@linaro.org; Fri, 02 May 2014 15:21:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33514) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WgIwE-00083Y-Hf for qemu-devel@nongnu.org; Fri, 02 May 2014 15:16:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WgIw5-0000CE-Gp for qemu-devel@nongnu.org; Fri, 02 May 2014 15:16:02 -0400 Received: from afflict.kos.to ([92.243.29.197]:48079) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WgIw5-00009p-4c for qemu-devel@nongnu.org; Fri, 02 May 2014 15:15:53 -0400 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 0FAEC264D2; Fri, 2 May 2014 21:15:51 +0200 (CEST) From: riku.voipio@linaro.org To: qemu-devel@nongnu.org Date: Fri, 2 May 2014 22:15:45 +0300 Message-Id: X-Mailer: git-send-email 1.7.2.5 In-Reply-To: References: 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] [PULL 10/14] 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: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) 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 --enable-uname-release was a 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 is not what user wants. 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 can 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 870c939..8c50d78 100755 --- a/configure +++ b/configure @@ -285,7 +285,6 @@ softmmu="yes" linux_user="no" bsd_user="no" guest_base="yes" -uname_release="" aix="no" blobs="yes" pkgversion="" @@ -945,8 +944,6 @@ for opt do ;; --disable-pie) pie="no" ;; - --enable-uname-release=*) uname_release="$optarg" - ;; --enable-werror) werror="yes" ;; --disable-werror) werror="no" @@ -1295,7 +1292,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 @@ -4128,8 +4124,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" @@ -4544,8 +4538,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 947358a..c38fecf 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 }