From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2CBF3C388F9 for ; Fri, 23 Oct 2020 19:17:01 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6A61520E65 for ; Fri, 23 Oct 2020 19:17:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="EeRqKbcj" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6A61520E65 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:47394 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kW2Yd-0004Sa-9n for qemu-devel@archiver.kernel.org; Fri, 23 Oct 2020 15:16:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58058) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kW2X7-0003q6-JH for qemu-devel@nongnu.org; Fri, 23 Oct 2020 15:15:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:43977) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kW2X6-0006Lq-2Z for qemu-devel@nongnu.org; Fri, 23 Oct 2020 15:15:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603480523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9P/WugInpiDxI82FZZ7oqO3Ss99qjVUoioe3szACTKU=; b=EeRqKbcjkISpr1/obE6K281pqz+kj5nbkR6k466+ckd0/kfm4hPXzF4fJ3e7e0q0mpVQ/R TaYs3PxUBMV9mE/ddii40eirjyAmip8fyIo7cTe5jSHSEo2qacZ8NqKHkx4/Ai/Lntzf1d dBWgftIycHmaNlXO5+JEuDfcfwDxUpc= 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-577-vz8hByLNN3ugcwowuSuGIg-1; Fri, 23 Oct 2020 15:15:19 -0400 X-MC-Unique: vz8hByLNN3ugcwowuSuGIg-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A9E03ADC25; Fri, 23 Oct 2020 19:15:17 +0000 (UTC) Received: from localhost (unknown [10.40.208.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id D689D614F5; Fri, 23 Oct 2020 19:15:10 +0000 (UTC) Date: Fri, 23 Oct 2020 21:15:09 +0200 From: Igor Mammedov To: Greg Kurz Subject: Re: [PATCH 4/5] spapr: Pass &error_abort when getting some PC DIMM properties Message-ID: <20201023211509.5c316c01@redhat.com> In-Reply-To: <160309732180.2739814.7243774674998010907.stgit@bahia.lan> References: <160309727218.2739814.14722724927730985344.stgit@bahia.lan> <160309732180.2739814.7243774674998010907.stgit@bahia.lan> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=imammedo@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=imammedo@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/23 01:44:00 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 , Richard Henderson , David Gibson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Mon, 19 Oct 2020 10:48:41 +0200 Greg Kurz wrote: > 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 Reviewed-by: Igor Mammedov TODO for future, get rid of local_err in spapr_memory_plug() altogether, it should not fail. it needs moving check from spapr_drc_attach() to spapr_memory_pre_plug() time. that will clear up (a bit) road for dropping errp in spapr_memory_plug() > --- > 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 1b173861152f..62f217a6b914 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -3443,19 +3443,13 @@ static void spapr_memory_plug(HotplugHandler *hotplug_dev, DeviceState *dev, > > if (!is_nvdimm) { > addr = 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 = 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 >= 0); > spapr_add_nvdimm(dev, slot, &local_err); > @@ -3634,7 +3628,6 @@ static void spapr_memory_unplug_request(HotplugHandler *hotplug_dev, > DeviceState *dev, Error **errp) > { > SpaprMachineState *spapr = SPAPR_MACHINE(hotplug_dev); > - Error *local_err = NULL; > PCDIMMDevice *dimm = PC_DIMM(dev); > uint32_t nr_lmbs; > uint64_t size, addr_start, addr; > @@ -3650,11 +3643,7 @@ static void spapr_memory_unplug_request(HotplugHandler *hotplug_dev, > nr_lmbs = size / SPAPR_MEMORY_BLOCK_SIZE; > > addr_start = object_property_get_uint(OBJECT(dimm), PC_DIMM_ADDR_PROP, > - &local_err); > - if (local_err) { > - error_propagate(errp, local_err); > - return; > - } > + &error_abort); > > /* > * An existing pending dimm state for this DIMM means that there is an > > >