diff options
| author | Peter Maydell | 2018-06-12 13:42:15 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-06-12 13:42:15 +0200 |
| commit | 59f3a1c6ac72cad98486c50ae23afe7d0abdde2c (patch) | |
| tree | 6e5c822db69cc71a385e06e93f9a4da009aecb6a /hw/acpi | |
| parent | Merge remote-tracking branch 'remotes/ehabkost/tags/python-next-pull-request'... (diff) | |
| parent | nvdimm: make persistence option symbolic (diff) | |
| download | qemu-59f3a1c6ac72cad98486c50ae23afe7d0abdde2c.tar.gz qemu-59f3a1c6ac72cad98486c50ae23afe7d0abdde2c.tar.xz qemu-59f3a1c6ac72cad98486c50ae23afe7d0abdde2c.zip | |
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 'hw/acpi')
| -rw-r--r-- | hw/acpi/nvdimm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c index 87e4280c71..27eeb6609f 100644 --- a/hw/acpi/nvdimm.c +++ b/hw/acpi/nvdimm.c @@ -404,8 +404,8 @@ static GArray *nvdimm_build_device_structure(AcpiNVDIMMState *state) } g_slist_free(device_list); - if (state->capabilities) { - nvdimm_build_structure_caps(structures, state->capabilities); + if (state->persistence) { + nvdimm_build_structure_caps(structures, state->persistence); } return structures; |