The following changes since commit 2afc4e3df80d947dd1bd42ce80278f591b35c74a:
Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2018-06-11'
into staging (2018-06-11 15:31:20 +0100)
are available in the Git repository at:
git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream
for you to fetch changes up to 11c39b5cd966ddc067a1ca0c5392ec9b666c45b7:
nvdimm: make persistence option symbolic (2018-06-11 22:19:57 +0300)
----------------------------------------------------------------
pc: fixes
A couple of fixes to acpi and nvdimm.
Signed-off-by: Michael S. Tsirkin <m...@redhat.com>
----------------------------------------------------------------
Ross Zwisler (2):
hw/i386: Update SSDT table used by "make check"
nvdimm: make persistence option symbolic
docs/nvdimm.txt | 31 ++++++++++++-------------------
include/hw/i386/pc.h | 2 +-
include/hw/mem/nvdimm.h | 3 ++-
hw/acpi/nvdimm.c | 4 ++--
hw/i386/pc.c | 33 ++++++++++++++++-----------------
tests/bios-tables-test.c | 2 +-
tests/acpi-test-data/q35/SSDT.dimmpxm | Bin 685 -> 685 bytes
7 files changed, 34 insertions(+), 41 deletions(-)
