From nobody Tue Nov 4 15:31:25 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 15302180842801014.404331166654; Thu, 28 Jun 2018 13:34:44 -0700 (PDT) Received: from localhost ([::1]:38433 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYdcp-0005uP-Gm for importer@patchew.org; Thu, 28 Jun 2018 16:34:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38134) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYdAk-0007Ki-Qv for qemu-devel@nongnu.org; Thu, 28 Jun 2018 16:05:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fYdAj-0000hH-Qz for qemu-devel@nongnu.org; Thu, 28 Jun 2018 16:05:42 -0400 Received: from mail-wm0-x22f.google.com ([2a00:1450:400c:c09::22f]:55465) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fYdAj-0000fC-Jn for qemu-devel@nongnu.org; Thu, 28 Jun 2018 16:05:41 -0400 Received: by mail-wm0-x22f.google.com with SMTP id v16-v6so11055508wmv.5 for ; Thu, 28 Jun 2018 13:05:41 -0700 (PDT) Received: from 640k.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 127-v6sm6211110wmd.18.2018.06.28.13.05.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jun 2018 13:05:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Xg8VIZVEBTONb3gwCC5sfD3NmTWixaD0hRBlo34Y29o=; b=SZ2HoVP4VezO+qjMgUoEQdBK5zdVbi6aVRo/YpN1gmdIP8jKUHDokuaf6isVN/WdK+ xhJXG1YnZsOrkrX/Fb6fP9n26SQaJrTVv5cGWhUHM1k9YdBfbjHpwXb0M7JPf3hTdo64 wijq1Tcxhw8nbwCGGJ/Y4/D5ZKi/Vpx9ci5HdxStts6yj+hhI75qybeo0lqpvI+NKXuO j8NS8AEjTl4W6EYUzoNAGk4zcrkm3K4dCiDLalZxGI+cvTY5lEOpDYMPDAM+X736AoNA f/n6SvMjsHmWUdURSvRLIQevZBGUA4CjVmSrAGhM1GughFJSF4J6GzbzgTpm66ZPdF7e xGPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=Xg8VIZVEBTONb3gwCC5sfD3NmTWixaD0hRBlo34Y29o=; b=PYanxoCovpVv7rvNWhQd+NK+XJfq2hst3bfpQ1y8O5AgsIkmPn1My2rsjO3Esps6NS 0fqyuJKDgwUb5QC81EGPj6fmdK8hcxaIGU/tuBD2i9P0CL5veIKT3uCWTXLqL5GTHV9+ bz5xgRl/AgiJNXSoIiQm1K3rvJWYL92h/loqd36Z8sJdNx+it5GHIlz6wJsPFQbrVJYU ZlnK81uCqPnFkD22WOleQIMtGX9mZRu1VMvY/gN1fdj0el/dntEquku7rFIYfBOV+kgE OtqkP5KIq73/VYO/8K8YX23SUxhLZ0EaFUgZd2KzL2gZ+9boW9g5A9NicQd4XRvwslbj 1raw== X-Gm-Message-State: APt69E1k+LAbdyfKPOixrWwWfBoRMrocdfINNYoESa73X6fxopX+NFU9 lRamGcAlFLq8cpQDXuthCnlCB91u X-Google-Smtp-Source: AAOMgpc0+vsQE4oAJxajxwN0musuC+3hmVt1E7mSzkZr1YS1bld2lAviFOxYzUbSOGVIp3v99Y46OQ== X-Received: by 2002:a1c:1983:: with SMTP id 125-v6mr9170974wmz.79.1530216340302; Thu, 28 Jun 2018 13:05:40 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 28 Jun 2018 22:04:37 +0200 Message-Id: <1530216310-52873-28-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1530216310-52873-1-git-send-email-pbonzini@redhat.com> References: <1530216310-52873-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::22f Subject: [Qemu-devel] [PULL 27/60] nvdimm: make get_memory_region() perform checks and initialization X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Hildenbrand Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: David Hildenbrand We might get a call to get_memory_region() before the device has been realized. We should return a consistent value, as the return value will e.g. later on be used in the pre_plug handler. To avoid duplicating too much code, factor the initialization and checks out into a helper function. Reviewed-by: Igor Mammedov Reviewed-by: David Gibson Signed-off-by: David Hildenbrand Message-Id: <20180619134141.29478-12-david@redhat.com> Signed-off-by: Paolo Bonzini --- hw/mem/nvdimm.c | 44 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 9 deletions(-) diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c index afd3912..021d1c3 100644 --- a/hw/mem/nvdimm.c +++ b/hw/mem/nvdimm.c @@ -78,20 +78,22 @@ static void nvdimm_finalize(Object *obj) g_free(nvdimm->nvdimm_mr); } =20 -static MemoryRegion *nvdimm_get_memory_region(PCDIMMDevice *dimm, Error **= errp) +static void nvdimm_prepare_memory_region(NVDIMMDevice *nvdimm, Error **err= p) { - NVDIMMDevice *nvdimm =3D NVDIMM(dimm); + PCDIMMDevice *dimm =3D PC_DIMM(nvdimm); + uint64_t align, pmem_size, size; + MemoryRegion *mr; =20 - return nvdimm->nvdimm_mr; -} + g_assert(!nvdimm->nvdimm_mr); =20 -static void nvdimm_realize(PCDIMMDevice *dimm, Error **errp) -{ - MemoryRegion *mr =3D host_memory_backend_get_memory(dimm->hostmem); - NVDIMMDevice *nvdimm =3D NVDIMM(dimm); - uint64_t align, pmem_size, size =3D memory_region_size(mr); + if (!dimm->hostmem) { + error_setg(errp, "'" PC_DIMM_MEMDEV_PROP "' property must be set"); + return; + } =20 + mr =3D host_memory_backend_get_memory(dimm->hostmem); align =3D memory_region_get_alignment(mr); + size =3D memory_region_size(mr); =20 pmem_size =3D size - nvdimm->label_size; nvdimm->label_data =3D memory_region_get_ram_ptr(mr) + pmem_size; @@ -115,6 +117,30 @@ static void nvdimm_realize(PCDIMMDevice *dimm, Error *= *errp) nvdimm->nvdimm_mr->align =3D align; } =20 +static MemoryRegion *nvdimm_get_memory_region(PCDIMMDevice *dimm, Error **= errp) +{ + NVDIMMDevice *nvdimm =3D NVDIMM(dimm); + Error *local_err =3D NULL; + + if (!nvdimm->nvdimm_mr) { + nvdimm_prepare_memory_region(nvdimm, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return NULL; + } + } + return nvdimm->nvdimm_mr; +} + +static void nvdimm_realize(PCDIMMDevice *dimm, Error **errp) +{ + NVDIMMDevice *nvdimm =3D NVDIMM(dimm); + + if (!nvdimm->nvdimm_mr) { + nvdimm_prepare_memory_region(nvdimm, errp); + } +} + /* * the caller should check the input parameters before calling * label read/write functions. --=20 1.8.3.1