From patchwork Mon Apr 6 17:47:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1266981 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=F8ja9Qu2; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 48wyyY36S2z9sRR for ; Tue, 7 Apr 2020 04:01:09 +1000 (AEST) Received: from localhost ([::1]:36124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jLW3X-0007xg-98 for incoming@patchwork.ozlabs.org; Mon, 06 Apr 2020 14:01:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36726) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jLVrZ-0002kM-UK for qemu-devel@nongnu.org; Mon, 06 Apr 2020 13:48:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jLVrO-0003Mc-Rg for qemu-devel@nongnu.org; Mon, 06 Apr 2020 13:48:44 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:34488) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jLVrO-0003M2-Ls for qemu-devel@nongnu.org; Mon, 06 Apr 2020 13:48:34 -0400 Received: by mail-wr1-x42c.google.com with SMTP id 65so542897wrl.1 for ; Mon, 06 Apr 2020 10:48:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+bsGyQcFnOKVG+Bd26nlz77NXbYaghgLj/LaGKCq2kg=; b=F8ja9Qu2fuEWoUyu5PPqgzA621ECwiPvYGvFj9QanTVML124/cbNkFFYz1x4dn1Tyj xGLiLK2IHuaR8NZv0BBEtw6WVS1Ob5UT3egtR5czRsDs+l/bg39Nw/AxSYXuk7JIyaAs +C/9A3uFcAHDqZ7sFSHpj21AdzOx0hSNzT+kWcfkTkUT4xyQ8q9QDM1OzgvPuSsYdSLS tI9Y8F2sVffYWuplQbzJ687UsbbU9fhQxSCoZowdzW06jseisLZq4MNXL8oMFT1cSl7I RAFIu7d80RlPP95avzXNhSjkk2qLPHICYPyu3kqeTdhdh9dupbpkawZooRLAFaWsIITp WRhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=+bsGyQcFnOKVG+Bd26nlz77NXbYaghgLj/LaGKCq2kg=; b=qvkbLJDqGIHEoA9AMZeClgOSarOKe7bz4/JPqcLYIK2ycXsqh6gBefSWQqBPGy+fx8 GQpEsmVkuZE4BfEQKByjyzWlfeLhKY6rkC2bIDwPRYnTPtsg8ivSOzxYv6w2ebhYrZzL Fy3mNjfRRgiAug9gjTNC0hVPwsaPgPAy+ObS/iosuRBKaYVFpuFGfdL90vbzeY3ukLrR XDL8NRPcysaSuo3Ts3or1yOz+Z4VRfP2/IHId4Vft05CqG7dzwM8n7IxzlMj3KgHRKtG v7D8G+FRifcsCT3cyG/G7DL2OLcIOSnRt5EJq5T4lXPw2RsvVJBUeHmC9JZqMClIB4LC wiZA== X-Gm-Message-State: AGi0PuYA63XFCfz9dh6EeR1orAjpSBALe87uCoclrRyspsMCBBPuq2/w +yIocd6wg4LUKA9sE+c+06Wky/fWGT8= X-Google-Smtp-Source: APiQypJ+MA+ozQQxEbfMdnMsywDvTlsML4uX/3y31XTgjbuC3dW6JpMXY9TPDpDSwL0c5LusmCaKhQ== X-Received: by 2002:a5d:4e03:: with SMTP id p3mr349359wrt.408.1586195313605; Mon, 06 Apr 2020 10:48:33 -0700 (PDT) Received: from x1w.redhat.com (116.red-83-42-57.dynamicip.rima-tde.net. [83.42.57.116]) by smtp.gmail.com with ESMTPSA id a67sm364880wmc.30.2020.04.06.10.48.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Apr 2020 10:48:33 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Markus Armbruster Subject: [PATCH-for-5.1 v2 35/54] hw/pci-host/pnv_phb3: Add missing error-propagation code Date: Mon, 6 Apr 2020 19:47:24 +0200 Message-Id: <20200406174743.16956-36-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200406174743.16956-1-f4bug@amsat.org> References: <20200406174743.16956-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42c 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 , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Patch created mechanically by running: $ spatch \ --macro-file scripts/cocci-macro-file.h --include-headers \ --sp-file scripts/coccinelle/use-error_propagate-in-realize.cocci \ --keep-comments --smpl-spacing --in-place --dir hw Signed-off-by: Philippe Mathieu-Daudé --- hw/pci-host/pnv_phb3.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/hw/pci-host/pnv_phb3.c b/hw/pci-host/pnv_phb3.c index 57d717ed23..a9029f5a02 100644 --- a/hw/pci-host/pnv_phb3.c +++ b/hw/pci-host/pnv_phb3.c @@ -1008,7 +1008,11 @@ static void pnv_phb3_realize(DeviceState *dev, Error **errp) /* LSI sources */ object_property_set_link(OBJECT(&phb->lsis), OBJECT(pnv), "xics", - &error_abort); + &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } object_property_set_bool(OBJECT(&phb->lsis), true, "realized", &local_err); if (local_err) { error_propagate(errp, local_err); @@ -1023,9 +1027,17 @@ static void pnv_phb3_realize(DeviceState *dev, Error **errp) /* MSI sources */ object_property_set_link(OBJECT(&phb->msis), OBJECT(phb), "phb", - &error_abort); + &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } object_property_set_link(OBJECT(&phb->msis), OBJECT(pnv), "xics", - &error_abort); + &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } object_property_set_bool(OBJECT(&phb->msis), true, "realized", &local_err); if (local_err) { error_propagate(errp, local_err); @@ -1034,7 +1046,11 @@ static void pnv_phb3_realize(DeviceState *dev, Error **errp) /* Power Bus Common Queue */ object_property_set_link(OBJECT(&phb->pbcq), OBJECT(phb), "phb", - &error_abort); + &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } object_property_set_bool(OBJECT(&phb->pbcq), true, "realized", &local_err); if (local_err) { error_propagate(errp, local_err);