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=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS 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 BD80DC433E0 for ; Sat, 4 Jul 2020 16:17:03 +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 832C32075D for ; Sat, 4 Jul 2020 16:17:03 +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="RyEf5gQ3" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 832C32075D 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]:60470 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jrkqc-0000DV-RM for qemu-devel@archiver.kernel.org; Sat, 04 Jul 2020 12:17:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48332) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jrkpe-0007gL-5x for qemu-devel@nongnu.org; Sat, 04 Jul 2020 12:16:03 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:41352) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jrkpb-0007de-IA for qemu-devel@nongnu.org; Sat, 04 Jul 2020 12:16:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593879356; 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: in-reply-to:in-reply-to:references:references; bh=hb4i1cdCgkYOktfs1okXB7HXcnOLpc4BXyPTiLK0m6U=; b=RyEf5gQ3Ur0AHTBekbAWt0p/442Ue7W2shV6Xcv81BwZcT3iYcXfgIUEMkoeB/G31uTaPE 5Gy7l5zkGqo07QccpBIHEU0Edd5NAgoYlHkw73Ep8n7mcl9beTzxovExza4LAQnhSPhkXf b7+HvZ9abP0Gr/3kg2KBgE7IiTSVohc= 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-17-DriGMzFBMu6y6JnnSOrGjw-1; Sat, 04 Jul 2020 12:15:54 -0400 X-MC-Unique: DriGMzFBMu6y6JnnSOrGjw-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E9ABF1005510; Sat, 4 Jul 2020 16:15:52 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-143.ams2.redhat.com [10.36.112.143]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B644410013D4; Sat, 4 Jul 2020 16:15:52 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 4062B1138648; Sat, 4 Jul 2020 18:15:51 +0200 (CEST) From: Markus Armbruster To: Vladimir Sementsov-Ogievskiy Subject: Re: [PATCH v2 23/44] qom: Crash more nicely on object_property_get_link() failure References: <20200702155000.3455325-1-armbru@redhat.com> <20200702155000.3455325-24-armbru@redhat.com> <4b6973a2-ef5d-b422-b7bb-39fd62453c0c@virtuozzo.com> Date: Sat, 04 Jul 2020 18:15:51 +0200 In-Reply-To: <4b6973a2-ef5d-b422-b7bb-39fd62453c0c@virtuozzo.com> (Vladimir Sementsov-Ogievskiy's message of "Fri, 3 Jul 2020 18:43:14 +0300") Message-ID: <87tuynl0i0.fsf@dusky.pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Received-SPF: pass client-ip=207.211.31.81; envelope-from=armbru@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/04 08:57:02 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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@linaro.org, berrange@redhat.com, ehabkost@redhat.com, qemu-block@nongnu.org, qemu-devel@nongnu.org, pbonzini@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Vladimir Sementsov-Ogievskiy writes: > 02.07.2020 18:49, Markus Armbruster wrote: >> Pass &error_abort instead of NULL where the returned value is >> dereferenced or asserted to be non-null. Drop a now redundant >> assertion. >> >> Signed-off-by: Markus Armbruster >> --- >> hw/core/platform-bus.c | 6 +++--- >> hw/ppc/spapr_drc.c | 3 ++- >> hw/ppc/spapr_hcall.c | 3 ++- >> hw/ppc/spapr_pci_nvlink2.c | 3 ++- >> ui/vnc.c | 2 +- >> 5 files changed, 10 insertions(+), 7 deletions(-) >> >> diff --git a/hw/core/platform-bus.c b/hw/core/platform-bus.c >> index d494e5cec1..5037ca265e 100644 >> --- a/hw/core/platform-bus.c >> +++ b/hw/core/platform-bus.c >> @@ -22,6 +22,7 @@ >> #include "qemu/osdep.h" >> #include "hw/platform-bus.h" >> #include "hw/qdev-properties.h" >> +#include "qapi/error.h" >> #include "qemu/error-report.h" >> #include "qemu/module.h" >> @@ -63,9 +64,8 @@ hwaddr >> platform_bus_get_mmio_addr(PlatformBusDevice *pbus, SysBusDevice >> *sbdev, >> return -1; >> } >> - parent_mr = object_property_get_link(OBJECT(sbdev_mr), >> "container", NULL); >> - >> - assert(parent_mr); >> + parent_mr = object_property_get_link(OBJECT(sbdev_mr), "container", >> + &error_abort); >> if (parent_mr != pbus_mr_obj) { >> /* MMIO region is not mapped on platform bus */ >> return -1; >> diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c >> index d10193f39e..1f18b79348 100644 >> --- a/hw/ppc/spapr_drc.c >> +++ b/hw/ppc/spapr_drc.c >> @@ -870,7 +870,8 @@ int spapr_dt_drc(void *fdt, int offset, Object *owner, uint32_t drc_type_mask) >> continue; >> } >> - obj = object_property_get_link(root_container, >> prop->name, NULL); >> + obj = object_property_get_link(root_container, prop->name, >> + &error_abort); >> drc = SPAPR_DR_CONNECTOR(obj); >> drck = SPAPR_DR_CONNECTOR_GET_CLASS(drc); >> diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c >> index 0f54988f2e..c1d01228c6 100644 >> --- a/hw/ppc/spapr_hcall.c >> +++ b/hw/ppc/spapr_hcall.c >> @@ -1655,7 +1655,8 @@ static void spapr_handle_transient_dev_before_cas(SpaprMachineState *spapr) >> continue; >> } >> drc = SPAPR_DR_CONNECTOR(object_property_get_link(drc_container, >> - prop->name, NULL)); >> + prop->name, >> + &error_abort)); >> if (spapr_drc_transient(drc)) { >> spapr_drc_reset(drc); >> diff --git a/hw/ppc/spapr_pci_nvlink2.c b/hw/ppc/spapr_pci_nvlink2.c >> index 8332d5694e..dd8cd6db96 100644 >> --- a/hw/ppc/spapr_pci_nvlink2.c >> +++ b/hw/ppc/spapr_pci_nvlink2.c >> @@ -358,7 +358,8 @@ void spapr_phb_nvgpu_ram_populate_dt(SpaprPhbState *sphb, void *fdt) >> for (i = 0; i < sphb->nvgpus->num; ++i) { >> SpaprPhbPciNvGpuSlot *nvslot = &sphb->nvgpus->slots[i]; >> Object *nv_mrobj = object_property_get_link(OBJECT(nvslot->gpdev), >> - "nvlink2-mr[0]", NULL); >> + "nvlink2-mr[0]", >> + &error_abort); >> uint32_t associativity[] = { >> cpu_to_be32(0x4), >> SPAPR_GPU_NUMA_ID, > > the following > uint64_t size = object_property_get_uint(nv_mrobj, "size", NULL); > > is a good candidate for error_abort as well. Mission creep :) We have many, many object_property_get_FOO() and _set_FOO() calls that ignore errors. Probably most of them should abort on error instead. Let's leave that for a future series. > with it or not: > Reviewed-by: Vladimir Sementsov-Ogievskiy Thanks!