Skip to content

Commit

Permalink
Revert seccomp tests that allow it to be used on non-x86 architectures
Browse files Browse the repository at this point in the history
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 896848f)
 * "seccomp: update libseccomp version and remove arch restriction"
   (commit 8e27fc2)

Signed-off-by: Peter Maydell <[email protected]>
Message-id: [email protected]
  • Loading branch information
pm215 committed Apr 13, 2015
1 parent 4d0ecde commit ae6e8ef
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ae6e8ef

Please sign in to comment.