From: Mark Cave-Ayland <mark.caveayland@nutanix.com>
Date: Thu, 28 Aug 2025 11:09:53 +0000 (+0100)
Subject: hw/i386/pc_piix.c: remove nvdimm initialisation from pc_init_isa()
X-Git-Tag: v10.2.0-rc1~117^2~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=62f8d562bb86cd7e1a0ce06f191c402a1eeba309;p=thirdparty%2Fqemu.git

hw/i386/pc_piix.c: remove nvdimm initialisation from pc_init_isa()

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

Signed-off-by: Mark Cave-Ayland <mark.caveayland@nutanix.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Xiaoyao Li <xiaoyao.li@intel.com>
Link: https://lore.kernel.org/r/20250828111057.468712-11-mark.caveayland@nutanix.com
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 9a2eee8ab0a..daf63a326b6 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -614,12 +614,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