From patchwork Fri Apr 10 12:58:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 47039 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f69.google.com (mail-wg0-f69.google.com [74.125.82.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4DCFD21416 for ; Fri, 10 Apr 2015 12:58:10 +0000 (UTC) Received: by wghm4 with SMTP id m4sf4179318wgh.2 for ; Fri, 10 Apr 2015 05:58:09 -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=fjkzZZErsSj9Zj2PgsQOZIeZkdxKRrNAoLaIPkKnask=; b=YcyN3bpUUMwqVH+xCkaqPhFsA8jMNu4/bQFewmmpLdOOLr+ibwqu4cAUmFsoWyCeYh MZLWXFMHCAT2fFg86vx9TEPTDSjd+yoGYaKfLl3XIwvh4sQGkjxVe0TSwNgVkdU22eY7 0neTO/Y14moRsrjJbFc0L1vDpGAu/ReHYuR914earN4/TKATVH+rWA13R35q0g4k5OsI Mu4SUcFgTKZ0zJhOvgcueDozp2z5vvN5Q+ZeUYsEM/0EetcegBvqAHRsd/i5H57BHW8n /O7FyIy/GBg3ziWppxhFFJry8XSBBdDpF1MXrJVz8XIvhS52g1pMrvPaV8Ce+G1UfEWq h0Pw== X-Gm-Message-State: ALoCoQlJkKtrWXdC49gkhIUxFFjqzFAP4seS5o4ZWXYx8SQ2hFn2+g/s602NmJYvd1OoANcfn4Xp X-Received: by 10.112.93.203 with SMTP id cw11mr298266lbb.0.1428670689452; Fri, 10 Apr 2015 05:58:09 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.37.194 with SMTP id a2ls415058lak.88.gmail; Fri, 10 Apr 2015 05:58:09 -0700 (PDT) X-Received: by 10.112.162.167 with SMTP id yb7mr1328682lbb.121.1428670689241; Fri, 10 Apr 2015 05:58:09 -0700 (PDT) Received: from mail-lb0-f178.google.com (mail-lb0-f178.google.com. [209.85.217.178]) by mx.google.com with ESMTPS id y5si1418919lay.123.2015.04.10.05.58.09 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Apr 2015 05:58:09 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) client-ip=209.85.217.178; Received: by lbbqq2 with SMTP id qq2so12962322lbb.3 for ; Fri, 10 Apr 2015 05:58:09 -0700 (PDT) X-Received: by 10.112.204.6 with SMTP id ku6mr1318901lbc.73.1428670689089; Fri, 10 Apr 2015 05:58:09 -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.112.67.65 with SMTP id l1csp1081919lbt; Fri, 10 Apr 2015 05:58:08 -0700 (PDT) X-Received: by 10.180.37.101 with SMTP id x5mr4789539wij.74.1428670688314; Fri, 10 Apr 2015 05:58:08 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id fq4si2992222wjc.189.2015.04.10.05.58.08 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 10 Apr 2015 05:58:08 -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 1YgYVV-0005zx-5X; Fri, 10 Apr 2015 13:58:01 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= , Eduardo Otubo , Marcus Meissner , Alexander Graf , Riku Voipio , Karl-Philipp Richter , Paul Moore Subject: [PATCH for-2.3] Revert seccomp tests that allow it to be used on non-x86 architectures Date: Fri, 10 Apr 2015 13:58:01 +0100 Message-Id: <1428670681-23032-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.217.178 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: , Unfortunately it turns out that libseccomp 2.2 still does not work correctly on non-x86 architectures; return to the previous configure setup of insisting on libseccomp 2.1 or better and i386/x86_64 and disabling seccomp support in all other situations. This reverts the two commits: * "seccomp: libseccomp version varying according to arch" (commit 896848f0d3e2393905845ef2b244bb2601f9df0c) * "seccomp: update libseccomp version and remove arch restriction" (commit 8e27fc200457e3f2473d0069263774d4ba17bd85) Signed-off-by: Peter Maydell --- With QEMU 2.3 release so close this seems the safest approach. configure | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 8b673fd..6969f6f 100755 --- a/configure +++ b/configure @@ -1848,19 +1848,14 @@ fi # libseccomp check if test "$seccomp" != "no" ; then - if $pkg_config --atleast-version=2.2.0 libseccomp || - (test "$cpu" = "i386" || test "$cpu" = "x86_64" && - $pkg_config --atleast-version=2.1.1 libseccomp); then + if test "$cpu" = "i386" || test "$cpu" = "x86_64" && + $pkg_config --atleast-version=2.1.1 libseccomp; then libs_softmmu="$libs_softmmu `$pkg_config --libs libseccomp`" QEMU_CFLAGS="$QEMU_CFLAGS `$pkg_config --cflags libseccomp`" seccomp="yes" else if test "$seccomp" = "yes"; then - if test "$cpu" = "i386" || test "$cpu" = "x86_64"; then feature_not_found "libseccomp" "Install libseccomp devel >= 2.1.1" - else - feature_not_found "libseccomp" "Install libseccomp devel >= 2.2.0" - fi fi seccomp="no" fi