From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50989) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1btOYZ-0005u8-5C for qemu-devel@nongnu.org; Sun, 09 Oct 2016 20:35:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1btOYU-00039Z-Ua for qemu-devel@nongnu.org; Sun, 09 Oct 2016 20:35:02 -0400 Received: from mga14.intel.com ([192.55.52.115]:17994) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1btOYU-00039N-Oh for qemu-devel@nongnu.org; Sun, 09 Oct 2016 20:34:58 -0400 From: Haozhong Zhang Date: Mon, 10 Oct 2016 08:34:18 +0800 Message-Id: <20161010003423.4333-4-haozhong.zhang@intel.com> In-Reply-To: <20161010003423.4333-1-haozhong.zhang@intel.com> References: <20161010003423.4333-1-haozhong.zhang@intel.com> Subject: [Qemu-devel] [RFC QEMU PATCH 3/8] nvdimm acpi: do not use fw_cfg on Xen List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, xen-devel@lists.xensource.com Cc: Xiao Guangrong , Konrad Rzeszutek Wilk , Haozhong Zhang , "Michael S. Tsirkin" , Igor Mammedov No fw_cfg is created when QEMU is used as the device model of Xen. Signed-off-by: Haozhong Zhang --- Cc: Xiao Guangrong Cc: "Michael S. Tsirkin" Cc: Igor Mammedov --- hw/acpi/nvdimm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c index e486128..c9c2a84 100644 --- a/hw/acpi/nvdimm.c +++ b/hw/acpi/nvdimm.c @@ -770,8 +770,11 @@ void nvdimm_init_acpi_state(AcpiNVDIMMState *state, MemoryRegion *io, state->dsm_mem = g_array_new(false, true /* clear */, 1); acpi_data_push(state->dsm_mem, sizeof(NvdimmDsmIn)); - fw_cfg_add_file(fw_cfg, NVDIMM_DSM_MEM_FILE, state->dsm_mem->data, - state->dsm_mem->len); + /* No fw_cfg is used when running on Xen */ + if (fw_cfg) { + fw_cfg_add_file(fw_cfg, NVDIMM_DSM_MEM_FILE, state->dsm_mem->data, + state->dsm_mem->len); + } } #define NVDIMM_COMMON_DSM "NCAL" -- 2.10.1