haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

nvdimm acpi: clean up nvdimm_build_acpi

Browse source 
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:
Xiao Guangrong 2016-11-07 19:13:40 +08:00 committed by Michael S. Tsirkin
parent 3e8522e23f
commit 264813cb9d
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
hw/acpi/nvdimm.c
View file

@ -392,12 +392,6 @@ static void nvdimm_build_nfit(AcpiNVDIMMState *state, GArray *table_offsets,
NvdimmFitBuffer *fit_buf = &state->fit_buf;
unsigned int header;
/* NVDIMM device is not plugged? */
if (!fit_buf->fit->len) {
return;
}
acpi_add_table(table_offsets, table_data);
/* NFIT header. */
@ -1275,14 +1269,22 @@ void nvdimm_build_acpi(GArray *table_offsets, GArray *table_data,
BIOSLinker *linker, AcpiNVDIMMState *state,
uint32_t ram_slots)
{
nvdimm_build_nfit(state, table_offsets, table_data, linker);
GSList *device_list;
/*
* NVDIMM device is allowed to be plugged only if there is available
* slot.
*/
if (ram_slots) {
nvdimm_build_ssdt(table_offsets, table_data, linker, state->dsm_mem,
ram_slots);
/* no nvdimm device can be plugged. */
if (!ram_slots) {
return;
}
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);
}