From nobody Tue Feb 10 23:54:41 2026 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=1603097569; cv=none; d=zohomail.com; s=zohoarc; b=AtEPABgXrBcVHQmFb6AJyUtGZSx+IhapQM9j0GW2GS5+6DU3PdelamXO1fGiboPU3FxouXWl8lm1Sz8gmLBezedu8SO/vY7Xpo/2lE43v4SttYTsOOf97yxWY5jvrGYyeKb209JBbR+KMIpYNN0dOn3scsFwFny4L/T3t8uU660= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603097569; 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=ZAl0WwX5Z2uf9+Gf8b+4avjmEGhwMIMOZSVooTG0Y0U=; b=g4C92SK71IAEIC0kjm0ROlontjrPG3jEwQGfihfIHvhqptpBA4kyxeF0UIubG6Zhj2pqR9WKsmcTjb6QCxNabuVA8Kp4e+ERIJzfwQPbTxWWn2rN8bqBF5ROg3hlkmaEBED/dcAgxCr9Vt9Y32/ZhRE0iHNpHqj0Tn2eJAGIp8Q= 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 1603097569024269.90012500700357; Mon, 19 Oct 2020 01:52:49 -0700 (PDT) Received: from localhost ([::1]:59458 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kUQuN-0008Vr-VZ for importer@patchew.org; Mon, 19 Oct 2020 04:52:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38162) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kUQqV-0004BL-M8 for qemu-devel@nongnu.org; Mon, 19 Oct 2020 04:48:47 -0400 Received: from us-smtp-delivery-44.mimecast.com ([207.211.30.44]:46608) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kUQqU-0002pl-5r for qemu-devel@nongnu.org; Mon, 19 Oct 2020 04:48:47 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-429-t-NR6bF1NKaOly_2ZnBqUw-1; Mon, 19 Oct 2020 04:48:38 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8F678805F05; Mon, 19 Oct 2020 08:48:36 +0000 (UTC) Received: from bahia.lan (ovpn-112-78.ams2.redhat.com [10.36.112.78]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7CDDF672C6; Mon, 19 Oct 2020 08:48:28 +0000 (UTC) X-MC-Unique: t-NR6bF1NKaOly_2ZnBqUw-1 Subject: [PATCH 3/5] spapr: Use appropriate getter for PC_DIMM_SLOT_PROP From: Greg Kurz To: David Gibson Date: Mon, 19 Oct 2020 10:48:27 +0200 Message-ID: <160309730758.2739814.15821922745424652642.stgit@bahia.lan> In-Reply-To: <160309727218.2739814.14722724927730985344.stgit@bahia.lan> References: <160309727218.2739814.14722724927730985344.stgit@bahia.lan> User-Agent: StGit/0.21 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=groug@kaod.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: kaod.org 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: softfail client-ip=207.211.30.44; envelope-from=groug@kaod.org; helo=us-smtp-delivery-44.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/19 04:48:16 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -11 X-Spam_score: -1.2 X-Spam_bar: - X-Spam_report: (-1.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_SOFTFAIL=0.665 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: Peter Maydell , Vladimir Sementsov-Ogievskiy , "Daniel P. Berrange" , Eduardo Habkost , "Michael S. Tsirkin" , Markus Armbruster , qemu-devel@nongnu.org, qemu-ppc@nongnu.org, Paolo Bonzini , Igor Mammedov , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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 Acked-by: David Gibson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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 115fc52e3b06..1b173861152f 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