nvdimm acpi: clean up nvdimm_build_acpi
To make the code more clearer, we 1) check ram_slots first, and build ssdt & nfit only when it is available 2) use nvdimm_get_plugged_device_list() to check if there is nvdimm device plugged Suggested-by: Igor Mammedov <imammedo@redhat.com> 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> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com>
This commit is contained in:
parent
3e8522e23f
commit
264813cb9d
|
@ -392,12 +392,6 @@ static void nvdimm_build_nfit(AcpiNVDIMMState *state, GArray *table_offsets,
|
||||||
NvdimmFitBuffer *fit_buf = &state->fit_buf;
|
NvdimmFitBuffer *fit_buf = &state->fit_buf;
|
||||||
unsigned int header;
|
unsigned int header;
|
||||||
|
|
||||||
|
|
||||||
/* NVDIMM device is not plugged? */
|
|
||||||
if (!fit_buf->fit->len) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
acpi_add_table(table_offsets, table_data);
|
acpi_add_table(table_offsets, table_data);
|
||||||
|
|
||||||
/* NFIT header. */
|
/* NFIT header. */
|
||||||
|
@ -1275,14 +1269,22 @@ void nvdimm_build_acpi(GArray *table_offsets, GArray *table_data,
|
||||||
BIOSLinker *linker, AcpiNVDIMMState *state,
|
BIOSLinker *linker, AcpiNVDIMMState *state,
|
||||||
uint32_t ram_slots)
|
uint32_t ram_slots)
|
||||||
{
|
{
|
||||||
nvdimm_build_nfit(state, table_offsets, table_data, linker);
|
GSList *device_list;
|
||||||
|
|
||||||
/*
|
/* no nvdimm device can be plugged. */
|
||||||
* NVDIMM device is allowed to be plugged only if there is available
|
if (!ram_slots) {
|
||||||
* slot.
|
return;
|
||||||
*/
|
|
||||||
if (ram_slots) {
|
|
||||||
nvdimm_build_ssdt(table_offsets, table_data, linker, state->dsm_mem,
|
|
||||||
ram_slots);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
nvdimm_build_ssdt(table_offsets, table_data, linker, state->dsm_mem,
|
||||||
|
ram_slots);
|
||||||
|
|
||||||
|
device_list = nvdimm_get_plugged_device_list();
|
||||||
|
/* no NVDIMM device is plugged. */
|
||||||
|
if (!device_list) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
nvdimm_build_nfit(state, table_offsets, table_data, linker);
|
||||||
|
g_slist_free(device_list);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue