[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 21/34] nvdimm acpi: clean up nvdimm_build_acpi
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v2 21/34] nvdimm acpi: clean up nvdimm_build_acpi |
Date: |
Fri, 11 Nov 2016 20:11:03 +0200 |
From: Xiao Guangrong <address@hidden>
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 <address@hidden>
Signed-off-by: Xiao Guangrong <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
---
hw/acpi/nvdimm.c | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c
index 5156565..65eb6c9 100644
--- a/hw/acpi/nvdimm.c
+++ b/hw/acpi/nvdimm.c
@@ -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);
}
--
MST
- [Qemu-devel] [PULL v2 12/34] intel_iommu: fix incorrect assert, (continued)
- [Qemu-devel] [PULL v2 12/34] intel_iommu: fix incorrect assert, Michael S. Tsirkin, 2016/11/11
- [Qemu-devel] [PULL v2 10/34] virtio-crypto: tag as not hotpluggable and migration, Michael S. Tsirkin, 2016/11/11
- [Qemu-devel] [PULL v2 13/34] acpi: fix DMAR device scope for IOAPIC, Michael S. Tsirkin, 2016/11/11
- [Qemu-devel] [PULL v2 15/34] virtio-net: mark VIRTIO_NET_F_GSO as legacy, Michael S. Tsirkin, 2016/11/11
- [Qemu-devel] [PULL v2 14/34] virtio: allow per-device-class legacy features, Michael S. Tsirkin, 2016/11/11
- [Qemu-devel] [PULL v2 16/34] vhost: migration blocker only if shared log is used, Michael S. Tsirkin, 2016/11/11
- [Qemu-devel] [PULL v2 17/34] qdev: hotplug: drop HotplugHandler.post_plug callback, Michael S. Tsirkin, 2016/11/11
- [Qemu-devel] [PULL v2 18/34] nvdimm acpi: drop the lock of fit buffer, Michael S. Tsirkin, 2016/11/11
- [Qemu-devel] [PULL v2 19/34] pc: memhp: move nvdimm hotplug out of memory hotplug, Michael S. Tsirkin, 2016/11/11
- [Qemu-devel] [PULL v2 20/34] pc: memhp: stop handling nvdimm hotplug in pc_dimm_unplug, Michael S. Tsirkin, 2016/11/11
- [Qemu-devel] [PULL v2 21/34] nvdimm acpi: clean up nvdimm_build_acpi,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL v2 22/34] docs: improve the doc of Read FIT method, Michael S. Tsirkin, 2016/11/11
- [Qemu-devel] [PULL v2 23/34] nvdimm acpi: rename nvdimm_plugged_device_list, Michael S. Tsirkin, 2016/11/11
- [Qemu-devel] [PULL v2 24/34] nvdimm acpi: cleanup nvdimm_build_fit, Michael S. Tsirkin, 2016/11/11
- [Qemu-devel] [PULL v2 25/34] nvdimm acpi: rename nvdimm_acpi_hotplug, Michael S. Tsirkin, 2016/11/11
- [Qemu-devel] [PULL v2 26/34] nvdimm acpi: define DSM return codes, Michael S. Tsirkin, 2016/11/11
- [Qemu-devel] [PULL v2 28/34] nvdimm acpi: rename nvdimm_dsm_reserved_root, Michael S. Tsirkin, 2016/11/11
- [Qemu-devel] [PULL v2 27/34] nvdimm acpi: fix two comments, Michael S. Tsirkin, 2016/11/11
- [Qemu-devel] [PULL v2 29/34] nvdimm acpi: use aml_name_decl to define named object, Michael S. Tsirkin, 2016/11/11
- [Qemu-devel] [PULL v2 30/34] nvdimm acpi: introduce NVDIMM_DSM_MEMORY_SIZE, Michael S. Tsirkin, 2016/11/11
- [Qemu-devel] [PULL v2 33/34] virtio: drop virtio_queue_get_ring_{size, addr}(), Michael S. Tsirkin, 2016/11/11