[v1] hw/i386: separate isapc out from pc_piix

[PATCH 05/12] hw/i386/pc_piix.c: remove nvdimm initialisation from pc_init_isa()

Mark Cave-Ayland posted 12 patches 6 months, 3 weeks ago

Diff against v2 v3 v4 v5 v6 v7
Download mbox

Maintainers: Paolo Bonzini <pbonzini@redhat.com>, Richard Henderson <richard.henderson@linaro.org>, Eduardo Habkost <eduardo@habkost.net>, "Michael S. Tsirkin" <mst@redhat.com>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>

There is a newer version of this series

Expand all Fold all

[PATCH 05/12] hw/i386/pc_piix.c: remove nvdimm initialisation from pc_init_isa()

Posted by Mark Cave-Ayland 6 months, 3 weeks ago

NVDIMMs cannot be used by PCs from a pre-PCI era.

Signed-off-by: Mark Cave-Ayland <mark.caveayland@nutanix.com>
---
 hw/i386/pc_piix.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index a12f63dad6..1e364ddf26 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -557,12 +557,6 @@ static void pc_init_isa(MachineState *machine)
         }
     }
 #endif
-
-    if (machine->nvdimms_state->is_enabled) {
-        nvdimm_init_acpi_state(machine->nvdimms_state, system_io,
-                               x86_nvdimm_acpi_dsmio,
-                               x86ms->fw_cfg, OBJECT(pcms));
-    }
 }
 #endif
 
-- 
2.43.0