From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50966) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1btOYR-0005qH-O7 for qemu-devel@nongnu.org; Sun, 09 Oct 2016 20:34:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1btOYN-000366-H3 for qemu-devel@nongnu.org; Sun, 09 Oct 2016 20:34:54 -0400 Received: from mga06.intel.com ([134.134.136.31]:59044) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1btOYN-00035w-BH for qemu-devel@nongnu.org; Sun, 09 Oct 2016 20:34:51 -0400 From: Haozhong Zhang Date: Mon, 10 Oct 2016 08:34:16 +0800 Message-Id: <20161010003423.4333-2-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 1/8] nvdimm: do not initialize label_data if label_size is zero 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 When memory-backend-xen is used, the label_data pointer can not be got via memory_region_get_ram_ptr(). We will use other functions to get label_data once we introduce NVDIMM label support to Xen. Signed-off-by: Haozhong Zhang --- Cc: Xiao Guangrong Cc: "Michael S. Tsirkin" Cc: Igor Mammedov --- hw/mem/nvdimm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c index 7895805..d25993b 100644 --- a/hw/mem/nvdimm.c +++ b/hw/mem/nvdimm.c @@ -87,7 +87,9 @@ static void nvdimm_realize(PCDIMMDevice *dimm, Error **errp) align = memory_region_get_alignment(mr); pmem_size = size - nvdimm->label_size; - nvdimm->label_data = memory_region_get_ram_ptr(mr) + pmem_size; + if (nvdimm->label_size) { + nvdimm->label_data = memory_region_get_ram_ptr(mr) + pmem_size; + } pmem_size = QEMU_ALIGN_DOWN(pmem_size, align); if (size <= nvdimm->label_size || !pmem_size) { -- 2.10.1