diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-06-12 12:42:15 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-06-12 12:42:15 +0100 |
| commit | 59f3a1c6ac72cad98486c50ae23afe7d0abdde2c (patch) | |
| tree | 6e5c822db69cc71a385e06e93f9a4da009aecb6a /tests | |
| parent | 5eca450b2ec219c4256062bfb5498c726c1ed0a4 (diff) | |
| parent | 11c39b5cd966ddc067a1ca0c5392ec9b666c45b7 (diff) | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
pc: fixes
A couple of fixes to acpi and nvdimm.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Mon 11 Jun 2018 20:21:03 BST
# gpg: using RSA key 281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>"
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17 0970 C350 3912 AFBE 8E67
# Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA 8A0D 281F 0DB8 D28D 5469
* remotes/mst/tags/for_upstream:
nvdimm: make persistence option symbolic
hw/i386: Update SSDT table used by "make check"
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/acpi-test-data/q35/SSDT.dimmpxm | bin | 685 -> 685 bytes | |||
| -rw-r--r-- | tests/bios-tables-test.c | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/tests/acpi-test-data/q35/SSDT.dimmpxm b/tests/acpi-test-data/q35/SSDT.dimmpxm Binary files differindex 8ba0e67cb7..2d5b721bcf 100644 --- a/tests/acpi-test-data/q35/SSDT.dimmpxm +++ b/tests/acpi-test-data/q35/SSDT.dimmpxm diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 256d463cb8..4e24930c4b 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -830,7 +830,7 @@ static void test_acpi_tcg_dimm_pxm(const char *machine) memset(&data, 0, sizeof(data)); data.machine = machine; data.variant = ".dimmpxm"; - test_acpi_one(" -machine nvdimm=on,nvdimm-cap=3" + test_acpi_one(" -machine nvdimm=on,nvdimm-persistence=cpu" " -smp 4,sockets=4" " -m 128M,slots=3,maxmem=1G" " -numa node,mem=32M,nodeid=0" |