diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2021-11-19 13:39:19 +0100 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2021-11-19 13:39:19 +0100 |
| commit | d434a47905641433e16ef65356d17090fd6fdcb1 (patch) | |
| tree | 55866a52ae9834d9ffaff0474468fce078ccbac5 | |
| parent | 9c25e1db18d872cbab3f028f93db37931dbc6ae2 (diff) | |
| parent | a443d55c3f7cafa3d5dfb7fe2b5c3cd9d671b61d (diff) | |
| download | qemu-d434a47905641433e16ef65356d17090fd6fdcb1.zip qemu-d434a47905641433e16ef65356d17090fd6fdcb1.tar.gz qemu-d434a47905641433e16ef65356d17090fd6fdcb1.tar.bz2 | |
Merge tag 'pull-ppc-20211119' of https://github.com/legoater/qemu into staging
ppc 6.2 queue:
* fix pmu vmstate
* Fix compile of byte_reverse on new compilers
# gpg: Signature made Fri 19 Nov 2021 12:49:30 PM CET
# gpg: using RSA key A0F66548F04895EBFE6B0B6051A343C7CFFBECA1
# gpg: Good signature from "Cédric Le Goater <clg@kaod.org>" [marginal]
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: A0F6 6548 F048 95EB FE6B 0B60 51A3 43C7 CFFB ECA1
* tag 'pull-ppc-20211119' of https://github.com/legoater/qemu:
tests/tcg/ppc64le: Fix compile flags for byte_reverse
pmu: fix pmu vmstate subsection list
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
| -rw-r--r-- | hw/misc/macio/pmu.c | 1 | ||||
| -rw-r--r-- | tests/tcg/ppc64le/Makefile.target | 12 |
2 files changed, 4 insertions, 9 deletions
diff --git a/hw/misc/macio/pmu.c b/hw/misc/macio/pmu.c index 4ad4f50..eb39c64 100644 --- a/hw/misc/macio/pmu.c +++ b/hw/misc/macio/pmu.c @@ -718,6 +718,7 @@ static const VMStateDescription vmstate_pmu = { }, .subsections = (const VMStateDescription * []) { &vmstate_pmu_adb, + NULL } }; diff --git a/tests/tcg/ppc64le/Makefile.target b/tests/tcg/ppc64le/Makefile.target index 5e65b15..ba2fde5 100644 --- a/tests/tcg/ppc64le/Makefile.target +++ b/tests/tcg/ppc64le/Makefile.target @@ -9,18 +9,12 @@ PPC64LE_TESTS=bcdsub endif bcdsub: CFLAGS += -mpower8-vector -PPC64LE_TESTS += byte_reverse ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_POWER10),) +PPC64LE_TESTS += byte_reverse +endif +byte_reverse: CFLAGS += -mcpu=power10 run-byte_reverse: QEMU_OPTS+=-cpu POWER10 run-plugin-byte_reverse-with-%: QEMU_OPTS+=-cpu POWER10 -else -byte_reverse: - $(call skip-test, "BUILD of $@", "missing compiler support") -run-byte_reverse: - $(call skip-test, "RUN of byte_reverse", "not built") -run-plugin-byte_reverse-with-%: - $(call skip-test, "RUN of byte_reverse ($*)", "not built") -endif PPC64LE_TESTS += signal_save_restore_xer |