diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-10-24 16:01:05 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-10-24 16:01:05 +0100 |
| commit | 18e195645aa36da3395d4b0934bcf4f5076e9e1e (patch) | |
| tree | e3ec41dad615fa948a350bfd7def8aa9dccc35d5 /hw | |
| parent | e60b38f445d0ca0c305440b07a23e8f0da73373a (diff) | |
| parent | 86583a07c4a7d55b04db5942a70d176f5299144a (diff) | |
| download | qemu-18e195645aa36da3395d4b0934bcf4f5076e9e1e.zip qemu-18e195645aa36da3395d4b0934bcf4f5076e9e1e.tar.gz qemu-18e195645aa36da3395d4b0934bcf4f5076e9e1e.tar.bz2 | |
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: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/core/Makefile.objs | 3 | ||||
| -rw-r--r-- | hw/core/null-machine.c | 2 | ||||
| -rw-r--r-- | hw/isa/Makefile.objs | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs index b736ce2..a799c83 100644 --- a/hw/core/Makefile.objs +++ b/hw/core/Makefile.objs @@ -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 diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c index cde4d3e..76d3f8e 100644 --- a/hw/core/null-machine.c +++ b/hw/core/null-machine.c @@ -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) { diff --git a/hw/isa/Makefile.objs b/hw/isa/Makefile.objs index 83e06f6..9e106df 100644 --- a/hw/isa/Makefile.objs +++ b/hw/isa/Makefile.objs @@ -1,9 +1,10 @@ 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 |