From patchwork Fri May 9 15:06:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 29908 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f70.google.com (mail-oa0-f70.google.com [209.85.219.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D813F202FE for ; Fri, 9 May 2014 15:06:46 +0000 (UTC) Received: by mail-oa0-f70.google.com with SMTP id i4sf20607147oah.5 for ; Fri, 09 May 2014 08:06:46 -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:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=B2/mv0CBMuK6xf4ZtbVzTSdBpWuMkqfrurvFHFZff84=; b=Ba1muPysBtZKO6tXR0sFpbVJGAwbavoleOSz5Uupk/ZCsoZ+eZnxCkkXEJKLTiPLJG c0X9IFFu3rDnLGLafVQoe97l1mmEphk2Ucw/PSF2cwRrIpC6KaTzBvayvVD8FbSiV8mI 0rU4KI2XR5M+GExrprQDIlWuvhvXfmPUiwne2m4ilEgXX5ZQePnd1w6SiApgd6dtNe+g HYI+ZaZDfqy6+DVRa/kAIypmQq1L6RwMhLsalDb9E8eFp4QTcalclAmwhCqhZRni137A J1fh886AEjsI82pdeJc3hES4CzoxAdU0sr2nqumyUyDT5KB+jfFIOcbqA1aLILmSZdwR ZVtw== X-Gm-Message-State: ALoCoQl4ATX7KSDJOYvso+k2vnw+ksIC9aZrMAjQeI28MhcLCMsHhydpemzYkDzGFUIq2tqroRc9 X-Received: by 10.42.229.194 with SMTP id jj2mr4799499icb.18.1399648006349; Fri, 09 May 2014 08:06:46 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.104.234 with SMTP id a97ls371527qgf.51.gmail; Fri, 09 May 2014 08:06:46 -0700 (PDT) X-Received: by 10.58.85.65 with SMTP id f1mr8125816vez.20.1399648006147; Fri, 09 May 2014 08:06:46 -0700 (PDT) Received: from mail-ve0-f169.google.com (mail-ve0-f169.google.com [209.85.128.169]) by mx.google.com with ESMTPS id w15si771053vcz.73.2014.05.09.08.06.46 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 09 May 2014 08:06:46 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.169 as permitted sender) client-ip=209.85.128.169; Received: by mail-ve0-f169.google.com with SMTP id jx11so5474868veb.0 for ; Fri, 09 May 2014 08:06:46 -0700 (PDT) X-Received: by 10.52.2.229 with SMTP id 5mr7423629vdx.24.1399648006027; Fri, 09 May 2014 08:06:46 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp88262vcb; Fri, 9 May 2014 08:06:45 -0700 (PDT) X-Received: by 10.194.92.177 with SMTP id cn17mr8989118wjb.18.1399648005241; Fri, 09 May 2014 08:06:45 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id m5si1692116wjx.181.2014.05.09.08.06.44 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 09 May 2014 08:06:45 -0700 (PDT) Received-SPF: none (google.com: pm215@archaic.org.uk does not designate permitted sender hosts) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1WimNl-0005Sr-Lv; Fri, 09 May 2014 16:06:41 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Brad Smith , Riku Voipio , Blue Swirl Subject: [PATCH] bsd-user: Remove reference to CONFIG_UNAME_RELEASE Date: Fri, 9 May 2014 16:06:41 +0100 Message-Id: <1399648001-20980-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.169 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Commit e586822a5 broke the bsd-user build when it removed the CONFIG_UNAME_RELEASE define but forgot to remove the use of it in bsd-user. Fix this in the simplest possible way (bsd-user doesn't make any use at all of the qemu_uname_release variable except to allow it to be pointlessly set by the user, so this is all we need to do.) Signed-off-by: Peter Maydell --- Not even compile tested, since I don't have a BSD system to hand. If somebody would like to provide a Tested-by: then I'll apply it to master... bsd-user/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bsd-user/main.c b/bsd-user/main.c index f81ba55..0f9169d 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -43,7 +43,7 @@ unsigned long reserved_va; #endif static const char *interp_prefix = CONFIG_QEMU_INTERP_PREFIX; -const char *qemu_uname_release = CONFIG_UNAME_RELEASE; +const char *qemu_uname_release; extern char **environ; enum BSDType bsd_type;