From mboxrd@z Thu Jan 1 00:00:00 1970 From: Igor Mammedov Subject: Re: [PATCH 05/14] nvdimm acpi: clean up nvdimm_build_acpi Date: Wed, 9 Nov 2016 17:39:11 +0100 Message-ID: <20161109173911.2b0a30dd@nial.brq.redhat.com> References: <1478517229-140028-1-git-send-email-guangrong.xiao@linux.intel.com> <1478517229-140028-6-git-send-email-guangrong.xiao@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: pbonzini@redhat.com, gleb@kernel.org, mtosatti@redhat.com, stefanha@redhat.com, mst@redhat.com, rth@twiddle.net, ehabkost@redhat.com, dan.j.williams@intel.com, kvm@vger.kernel.org, qemu-devel@nongnu.org To: Xiao Guangrong Return-path: Received: from mx1.redhat.com ([209.132.183.28]:42202 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932428AbcKIQjP (ORCPT ); Wed, 9 Nov 2016 11:39:15 -0500 In-Reply-To: <1478517229-140028-6-git-send-email-guangrong.xiao@linux.intel.com> Sender: kvm-owner@vger.kernel.org List-ID: On Mon, 7 Nov 2016 19:13:40 +0800 Xiao Guangrong wrote: > 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 > Signed-off-by: Xiao Guangrong > --- Reviewed-by: Igor Mammedov > 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); > }