Commit 18e19564 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2018-10-24' into staging 



- Disable migration-test with TCG on s390x (since there are known problems)
- Small Makefile improvements
- More modern shell scripting changes (use $() instead of ``)
- Add a configure option to disable AVX2

# gpg: Signature made Wed 24 Oct 2018 08:04:33 BST
# gpg:                using RSA key 2ED9D774FE702DB5
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>"
# gpg:                 aka "Thomas Huth <thuth@redhat.com>"
# gpg:                 aka "Thomas Huth <huth@tuxfamily.org>"
# gpg:                 aka "Thomas Huth <th.huth@posteo.de>"
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* remotes/huth-gitlab/tags/pull-request-2018-10-24:
  configure: Provide option to explicitly disable AVX2
  po/Makefile: Modern shell scripting (use $() instead of ``)
  debian-bootstrap.pre: Modern shell scripting (use $() instead of ``)
  configs: Add a CONFIG_SMC37C669 switch for the "smc37c669-superio" device
  hw/core: Move null-machine into the common-obj list
  tests/migration-test: Disable s390x test when running with TCG

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents e60b38f4 86583a07

configure

+9 −2
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ usb_redir="" 
opengl=""

opengl_dmabuf="no"

cpuid_h="no"

avx2_opt="no"

avx2_opt=""

zlib="yes"

capstone=""

lzo=""
@@ -1329,6 +1329,10 @@ for opt do 
  ;;

  --disable-glusterfs) glusterfs="no"

  ;;

  --disable-avx2) avx2_opt="no"

  ;;

  --enable-avx2) avx2_opt="yes"

  ;;

  --enable-glusterfs) glusterfs="yes"

  ;;

  --disable-virtio-blk-data-plane|--enable-virtio-blk-data-plane)
@@ -1703,6 +1707,7 @@ disabled with --disable-FEATURE, default is enabled if available: 
  libxml2         for Parallels image format

  tcmalloc        tcmalloc support

  jemalloc        jemalloc support

  avx2            AVX2 optimization support

  replication     replication support

  vhost-vsock     virtio sockets device support

  opengl          opengl support
@@ -5032,7 +5037,7 @@ fi 
# There is no point enabling this if cpuid.h is not usable,

# since we won't be able to select the new routines.



if test $cpuid_h = yes; then

if test "$cpuid_h" = "yes" -a "$avx2_opt" != "no"; then

  cat > $TMPC << EOF

#pragma GCC push_options

#pragma GCC target("avx2")
@@ -5046,6 +5051,8 @@ int main(int argc, char *argv[]) { return bar(argv[0]); } 
EOF

  if compile_object "" ; then

    avx2_opt="yes"

  else

    avx2_opt="no"

  fi

fi

default-configs/alpha-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -19,3 +19,4 @@ CONFIG_IDE_CMD646=y 
CONFIG_I8259=y

CONFIG_MC146818RTC=y

CONFIG_ISA_TESTDEV=y

CONFIG_SMC37C669=y

hw/core/Makefile.objs

+1 −2
Original line number Diff line number Diff line
@@ -21,5 +21,4 @@ common-obj-$(CONFIG_SOFTMMU) += or-irq.o 
common-obj-$(CONFIG_SOFTMMU) += split-irq.o

common-obj-$(CONFIG_PLATFORM_BUS) += platform-bus.o

common-obj-$(CONFIG_SOFTMMU) += generic-loader.o



obj-$(CONFIG_SOFTMMU) += null-machine.o
 
common-obj-$(CONFIG_SOFTMMU) += null-machine.o

hw/core/null-machine.c

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include "hw/boards.h"

#include "sysemu/sysemu.h"

#include "exec/address-spaces.h"

#include "cpu.h"

#include "qom/cpu.h"



static void machine_none_init(MachineState *mch)

{

hw/isa/Makefile.objs

+2 −1
Original line number Diff line number Diff line 
common-obj-$(CONFIG_ISA_BUS) += isa-bus.o

common-obj-$(CONFIG_ISA_BUS) += isa-superio.o smc37c669-superio.o

common-obj-$(CONFIG_ISA_BUS) += isa-superio.o

common-obj-$(CONFIG_APM) += apm.o

common-obj-$(CONFIG_I82378) += i82378.o

common-obj-$(CONFIG_PC87312) += pc87312.o

common-obj-$(CONFIG_PIIX4) += piix4.o

common-obj-$(CONFIG_VT82C686) += vt82c686.o

common-obj-$(CONFIG_SMC37C669) += smc37c669-superio.o



obj-$(CONFIG_LPC_ICH9) += lpc_ich9.o