From nobody Mon Nov 17 12:08:25 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=1603809800; cv=none; d=zohomail.com; s=zohoarc; b=LUBQC2wftgowG/JKQ3kR/jkuo3YBPYw0UZ7F/xgwB7oX1J6y67imB6f3vS3pMIGv29KlW6YiW5JZV5iiCiQWmwP9VBUxtfVOYzkEpa23ypjVEyk5R8iJXhvklvw4qPoR4kuNxQDogIkLkecG1DL3ELrjhF92n72gk7m6wAmxkAk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603809800; h=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=LxOd5cNOKBnIUf4uBn45hw4ALb8ccX1A92pOEKbia/g=; b=ix4sHHs9Ufluab9giaJI8vbMR451QtCX/t8GWSnaMzMjhqB5HM3sa0HPpYJz8qzWs7E/EQ55rpJfcQGywqpVmdGU5xzy/4NEmS5Q6voKkQAHCQFxz2lPy4m2M5v7h35wEAq1rDH2RYtDa7lisk+7fZjiql7vPfm/yqjn0Ia6Eik= 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 1603809798951192.4112345105201; Tue, 27 Oct 2020 07:43:18 -0700 (PDT) Received: from localhost ([::1]:36000 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kXQBx-0007kN-VY for importer@patchew.org; Tue, 27 Oct 2020 10:43:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42488) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kXPnc-00029Z-1l; Tue, 27 Oct 2020 10:18:08 -0400 Received: from ozlabs.org ([203.11.71.1]:57891) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kXPna-0007bN-68; Tue, 27 Oct 2020 10:18:07 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 4CLDLq6JM0z9shv; 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=1603808275; bh=X+kMfZmLTIB0C7yJqNGy2oI7Q3ouV2Gt6nNn3T3aoss=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T8RSLp6XPkFRHF5KpSB893Aos3FXCz4/DyqhA2jJwTulT9jtgaGJpU+UlUCrIBpwZ uAqHjNqDwS3sgxAN6tcpF5euOTIGE/svfvpHtF8AD/Fc+AfBCAKvGIQl/AdIRkqEK1 NaOmdPbGGN3WJjuYcqimLod+RGBNe8aU72nOARdg= From: David Gibson To: peter.maydell@linaro.org Subject: [PULL 13/18] spapr: Pass &error_abort when getting some PC DIMM properties Date: Wed, 28 Oct 2020 01:17:30 +1100 Message-Id: <20201027141735.728821-14-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-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: Igor Mammedov , 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" Content-Type: text/plain; charset="utf-8" From: Greg Kurz Both PC_DIMM_SLOT_PROP and PC_DIMM_ADDR_PROP are defined in the default property list of the PC DIMM device class: DEFINE_PROP_UINT64(PC_DIMM_ADDR_PROP, PCDIMMDevice, addr, 0), DEFINE_PROP_INT32(PC_DIMM_SLOT_PROP, PCDIMMDevice, slot, PC_DIMM_UNASSIGNED_SLOT), They should thus be always gettable for both PC DIMMs and NVDIMMs. An error in getting them can only be the result of a programming error. It doesn't make much sense to propagate the error in this case. Abort instead. Signed-off-by: Greg Kurz Message-Id: <160309732180.2739814.7243774674998010907.stgit@bahia.lan> Reviewed-by: Igor Mammedov Signed-off-by: David Gibson --- hw/ppc/spapr.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index f8856ccf27..a5aef7a6ff 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3443,19 +3443,13 @@ static void spapr_memory_plug(HotplugHandler *hotpl= ug_dev, DeviceState *dev, =20 if (!is_nvdimm) { addr =3D object_property_get_uint(OBJECT(dimm), - PC_DIMM_ADDR_PROP, &local_err); - if (local_err) { - goto out_unplug; - } + PC_DIMM_ADDR_PROP, &error_abort); spapr_add_lmbs(dev, addr, size, spapr_ovec_test(ms->ov5_cas, OV5_HP_EVT), &local_err); } else { slot =3D object_property_get_int(OBJECT(dimm), - PC_DIMM_SLOT_PROP, &local_err); - if (local_err) { - goto out_unplug; - } + PC_DIMM_SLOT_PROP, &error_abort); /* We should have valid slot number at this point */ g_assert(slot >=3D 0); spapr_add_nvdimm(dev, slot, &local_err); @@ -3633,7 +3627,6 @@ static void spapr_memory_unplug_request(HotplugHandle= r *hotplug_dev, DeviceState *dev, Error **errp) { SpaprMachineState *spapr =3D SPAPR_MACHINE(hotplug_dev); - Error *local_err =3D NULL; PCDIMMDevice *dimm =3D PC_DIMM(dev); uint32_t nr_lmbs; uint64_t size, addr_start, addr; @@ -3649,11 +3642,7 @@ static void spapr_memory_unplug_request(HotplugHandl= er *hotplug_dev, nr_lmbs =3D size / SPAPR_MEMORY_BLOCK_SIZE; =20 addr_start =3D object_property_get_uint(OBJECT(dimm), PC_DIMM_ADDR_PRO= P, - &local_err); - if (local_err) { - error_propagate(errp, local_err); - return; - } + &error_abort); =20 /* * An existing pending dimm state for this DIMM means that there is an --=20 2.26.2