diff options
| author | Xiao Guangrong <guangrong.xiao@linux.intel.com> | 2016-03-05 00:00:32 +0800 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2016-03-11 16:59:11 +0200 |
| commit | 5fe79386ba3cdc86fd808dde301bfc5bb7e9bded (patch) | |
| tree | e7a34f6f571a257bc39b6323dc2b4aa7f27017b2 /hw/i386/acpi-build.c | |
| parent | b63283d7c37ab1d08ee48ce34978fa2e95b27b7b (diff) | |
| download | focaccia-qemu-5fe79386ba3cdc86fd808dde301bfc5bb7e9bded.tar.gz focaccia-qemu-5fe79386ba3cdc86fd808dde301bfc5bb7e9bded.zip | |
nvdimm acpi: initialize the resource used by NVDIMM ACPI
32 bits IO port starting from 0x0a18 in guest is reserved for NVDIMM ACPI emulation. The table, NVDIMM_DSM_MEM_FILE, will be patched into NVDIMM ACPI binary code OSPM uses this port to tell QEMU the final address of the DSM memory and notify QEMU to emulate the DSM method Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/i386/acpi-build.c')
| -rw-r--r-- | hw/i386/acpi-build.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 0e32395604..9ff3f5c94f 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -39,7 +39,6 @@ #include "hw/isa/isa.h" #include "hw/block/fdc.h" #include "hw/acpi/memory_hotplug.h" -#include "hw/mem/nvdimm.h" #include "sysemu/tpm.h" #include "hw/acpi/tpm.h" #include "sysemu/tpm_backend.h" @@ -2659,13 +2658,6 @@ static bool acpi_has_iommu(void) return intel_iommu && !ambiguous; } -static bool acpi_has_nvdimm(void) -{ - PCMachineState *pcms = PC_MACHINE(qdev_get_machine()); - - return pcms->nvdimm; -} - static void acpi_build(AcpiBuildTables *tables) { @@ -2750,7 +2742,7 @@ void acpi_build(AcpiBuildTables *tables) build_dmar_q35(tables_blob, tables->linker); } - if (acpi_has_nvdimm()) { + if (pcms->acpi_nvdimm_state.is_enabled) { nvdimm_build_acpi(table_offsets, tables_blob, tables->linker); } |