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 /include/hw/mem/nvdimm.h | |
| parent | 5eca450b2ec219c4256062bfb5498c726c1ed0a4 (diff) | |
| parent | 11c39b5cd966ddc067a1ca0c5392ec9b666c45b7 (diff) | |
| download | focaccia-qemu-59f3a1c6ac72cad98486c50ae23afe7d0abdde2c.tar.gz focaccia-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 'include/hw/mem/nvdimm.h')
| -rw-r--r-- | include/hw/mem/nvdimm.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/hw/mem/nvdimm.h b/include/hw/mem/nvdimm.h index 3c82751bab..9340631cfc 100644 --- a/include/hw/mem/nvdimm.h +++ b/include/hw/mem/nvdimm.h @@ -138,7 +138,8 @@ struct AcpiNVDIMMState { /* * Platform capabilities, section 5.2.25.9 of ACPI 6.2 Errata A */ - int32_t capabilities; + int32_t persistence; + char *persistence_string; }; typedef struct AcpiNVDIMMState AcpiNVDIMMState; |