From patchwork Wed Jun 13 06:57:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 928703 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; 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=gibson.dropbear.id.au Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.b="VVV9QlPw"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 415Hfc1XQpz9s19 for ; Wed, 13 Jun 2018 16:59:04 +1000 (AEST) Received: from localhost ([::1]:60260 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSzkD-0003q3-Ro for incoming@patchwork.ozlabs.org; Wed, 13 Jun 2018 02:59:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34110) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSziX-0002vI-R7 for qemu-devel@nongnu.org; Wed, 13 Jun 2018 02:57:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fSziX-0006WR-1f for qemu-devel@nongnu.org; Wed, 13 Jun 2018 02:57:17 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:45089) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fSziW-0006UB-IL; Wed, 13 Jun 2018 02:57:16 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 415HcT0pjPz9s3C; Wed, 13 Jun 2018 16:57:12 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1528873033; bh=scMHodrsEvLAF619NVIY0xkWrwzTvHqzanOAQ/RLvOo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VVV9QlPwFjUIY3G35CRef0e/j6XH7BMweT7m8rQM55klUGkJrLtAgEWQUw9yzpjrz AFVpFFEZ1pEaKdFkq3hUOZwblOSBL1OibSrJP6/ntsWRWCpycnHNk8kxMufTynbrOG +a6fcbyW4yhRC4YF5VPYUCVYe/ngw2HrfJU0NIg0= From: David Gibson To: groug@kaod.org Date: Wed, 13 Jun 2018 16:57:02 +1000 Message-Id: <20180613065707.30766-3-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180613065707.30766-1-david@gibson.dropbear.id.au> References: <20180613065707.30766-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PATCH 2/7] pnv: Add missing error check during cpu realize() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Gibson , qemu-ppc@nongnu.org, clg@kaod.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" In pnv_core_realize() we call two functions with an Error * parameter in succession, which means if they both cause errors we'll lose the first one. Add an extra test/escape to fix this. Signed-off-by: David Gibson Reviewed-by: Cédric Le Goater --- hw/ppc/pnv_core.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/ppc/pnv_core.c b/hw/ppc/pnv_core.c index 13ad7d9e04..efb68226bb 100644 --- a/hw/ppc/pnv_core.c +++ b/hw/ppc/pnv_core.c @@ -173,6 +173,9 @@ static void pnv_core_realize(DeviceState *dev, Error **errp) snprintf(name, sizeof(name), "thread[%d]", i); object_property_add_child(OBJECT(pc), name, obj, &local_err); + if (local_err) { + goto err; + } object_property_add_alias(obj, "core-pir", OBJECT(pc), "pir", &local_err); if (local_err) {