From nobody Mon Nov 17 12:08:26 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1603810120; cv=none; d=zohomail.com; s=zohoarc; b=OQN9qBAxkOlEpE3g0klXOXMns/zSFN8EdSKda1FvqTmdxxR1xQqjLrv1UHQHdVADuTfHC4AatNrbT19+ESaKW1jElWb35CR49qS3jNWFnZ1/oKj8uTZi52mnceA+K7h4fZ459O0V1nDpYNaynoqNO9SZvfyOwFo1iJrnqs/T/FI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603810120; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SLBa8BcvChIDhjPrg7MltA2Yoa5dvt2OSNKHZ6NA608=; b=K0/5uM3mAtLpjGefJ99n6Hy8Ygb395DW1Va2X1neu3CL+snTdF1G+jnfl80jYCB+JzSvnHRWoEPcI26V1tU3i7Eid6z3mhqUipUsBQnsnYssqguXYgyM2s6NdpxVnXOIEhLq6O8nt8vOrltz/asqJtMb8jHEdd8K+AiDMsi5tHk= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1603810119156857.2070104634419; Tue, 27 Oct 2020 07:48:39 -0700 (PDT) Received: from localhost ([::1]:51142 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kXQH8-0005mx-Dx for importer@patchew.org; Tue, 27 Oct 2020 10:48:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42514) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kXPnd-0002CR-B8; Tue, 27 Oct 2020 10:18:09 -0400 Received: from ozlabs.org ([203.11.71.1]:50479) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kXPna-0007bM-D4; Tue, 27 Oct 2020 10:18:08 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 4CLDLp72fdz9shs; Wed, 28 Oct 2020 01:17:54 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1603808274; bh=sqpswRVphi8tlghBAsNJaqC6FpXSR7Yjv1p6rrNCzu8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UQbSxGc0zv3/7+EPbYtbYzshsw1NqRb9RTFM3Ny3cmURWozNVF1Bhmp8Y5uh6BR/W BpPmdfM+y4yUbOHZ9BFeL0mxEWv1xgMYgZnoLokiPnlL+0m8541KOIkk+wHC/8/GT5 c567FQoYost9/AqvEgNgS5TmzAmh07oekZLQXpnw= From: David Gibson To: peter.maydell@linaro.org Subject: [PULL 12/18] spapr: Use appropriate getter for PC_DIMM_SLOT_PROP Date: Wed, 28 Oct 2020 01:17:29 +1100 Message-Id: <20201027141735.728821-13-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201027141735.728821-1-david@gibson.dropbear.id.au> References: <20201027141735.728821-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=203.11.71.1; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/27 10:17:43 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.249, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson , qemu-ppc@nongnu.org, qemu-devel@nongnu.org, groug@kaod.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" From: Greg Kurz The PC_DIMM_SLOT_PROP property is defined as: DEFINE_PROP_INT32(PC_DIMM_SLOT_PROP, PCDIMMDevice, slot, PC_DIMM_UNASSIGNED_SLOT), Use object_property_get_int() instead of object_property_get_uint(). Since spapr_memory_plug() only gets called if pc_dimm_pre_plug() succeeded, we expect to have a valid >=3D 0 slot number, either because the user passed a valid slot number or because pc_dimm_get_free_slot() picked one up for us. Signed-off-by: Greg Kurz Message-Id: <160309730758.2739814.15821922745424652642.stgit@bahia.lan> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: David Gibson --- hw/ppc/spapr.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index b2405599ad..f8856ccf27 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3433,7 +3433,8 @@ static void spapr_memory_plug(HotplugHandler *hotplug= _dev, DeviceState *dev, Error *local_err =3D NULL; SpaprMachineState *ms =3D SPAPR_MACHINE(hotplug_dev); PCDIMMDevice *dimm =3D PC_DIMM(dev); - uint64_t size, addr, slot; + uint64_t size, addr; + int64_t slot; bool is_nvdimm =3D object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM); =20 size =3D memory_device_get_region_size(MEMORY_DEVICE(dev), &error_abor= t); @@ -3450,11 +3451,13 @@ static void spapr_memory_plug(HotplugHandler *hotpl= ug_dev, DeviceState *dev, spapr_ovec_test(ms->ov5_cas, OV5_HP_EVT), &local_err); } else { - slot =3D object_property_get_uint(OBJECT(dimm), - PC_DIMM_SLOT_PROP, &local_err); + slot =3D object_property_get_int(OBJECT(dimm), + PC_DIMM_SLOT_PROP, &local_err); if (local_err) { goto out_unplug; } + /* We should have valid slot number at this point */ + g_assert(slot >=3D 0); spapr_add_nvdimm(dev, slot, &local_err); } =20 --=20 2.26.2