From nobody Fri Dec 19 04:32:17 2025 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1585575593; cv=none; d=zohomail.com; s=zohoarc; b=TkmNRPpL0WqGQMZdyC6wPkmo1VtMywEXoDBHEAR/o7YaPtnxN6yN/je0OkF5u0nmcbZAjHNsTh7HxYj9XhKLRI+rn5WPR8UQVfIjyZx42fXPvasVQ+EgOzQeU4dyyrJPXrNFzq4n+yt94M7mz9RM3JUc1B8WnIytFhaerW5IgvM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585575593; h=Content-Type:Content-Transfer-Encoding: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=GXWYkaSAnVpJmlpHK48UeIW7/97jzoeF9/dNiAzNhNU=; b=KClviKKVRN6COtPZJ+1CI4h5oeFXGCWvyAF9l/+TRBXV7Pu7MKmNz2b2LkLrtDsA7yu9u8guKMTh/Y8oaklNWZdDmC1Jk1QCJq7lI2pdN9THfwRReSWqSqS5gYMVXyEQKf9ksacQ0zpUSzW01QYm/mCk6oHTCqhPDve5euaO5SU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1585575593097702.9652482727029; Mon, 30 Mar 2020 06:39:53 -0700 (PDT) Received: from localhost ([::1]:50124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jIudr-0000H6-UB for importer@patchew.org; Mon, 30 Mar 2020 09:39:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49510) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jIub4-0004QU-ED for qemu-devel@nongnu.org; Mon, 30 Mar 2020 09:36:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jIub3-0001CK-8p for qemu-devel@nongnu.org; Mon, 30 Mar 2020 09:36:58 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:46759) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jIub3-0001B8-2e for qemu-devel@nongnu.org; Mon, 30 Mar 2020 09:36:57 -0400 Received: by mail-wr1-x42f.google.com with SMTP id j17so21587757wru.13 for ; Mon, 30 Mar 2020 06:36:57 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id o14sm20756504wmh.22.2020.03.30.06.36.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Mar 2020 06:36:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=GXWYkaSAnVpJmlpHK48UeIW7/97jzoeF9/dNiAzNhNU=; b=MOHpox2aNNfqHmLQcs5JQy+RQPfI+uvXj/+gD0u/7VbNJ4G9bwyZN/94jF1oJ+KN1+ 9QpsKscJ8IDRHqU77L4mu76zb+dfxLf2Ud+H8+s0wufM9WwfuZXcyboAXYmMBwM2zCc4 WNZtkR7/XYydHhFDH7JOAt1GAoQ35k0elvNoQWF362554I3Z969vyV2/gmEpqhnMfXop f1Uz1shzg19EGucVD4Xut9BPY6Eu3mfbX78KibVcex0ndGaqQ4hRpUwbgRoQ+aTe7ET9 XaW9iiMXltC9kp/U00ObiL0CY8wq+D1uljUHvy3eZfVoIxsqma0CeEyKAs+YHV4TrFlK wKXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GXWYkaSAnVpJmlpHK48UeIW7/97jzoeF9/dNiAzNhNU=; b=Y5LTtc8CZWlhmB/KrNOCDMq1bQPU0Ry3ZloDWU6qboJdNtDqrNw7dCg8SPCmkrbBmx H8JTFxNsfs39FpUDq/UDclbyH+WZ3ICc9IPDoUMxyV9/8n4+4P/GEe+Hvh7kKLem0KiM 7qbqdsqIUsicre9Bd28VfvQKKbVqhRtUuOlVdV6ED3RqKvYMkFn8KS7eEfmeD79TEjZu KXk8vtjmmlfoKsfxcV8giyCaRJJgZWZsN/csQ1g6fuJzK2qbh4ALQeHjNIyz84iFt2wH rFvdawQ01rhwl15bGRgUqT0aQu4PJ61F9XcHoGQvHGULoie5DiJSrFrQWSBSMaPrxcUx hfgQ== X-Gm-Message-State: ANhLgQ03xmFl7+f8Y8XQDdk9Q+ADv1gSeYOXeSycXxP4znFxkefwyNGG d09lH2+r35QkWu1Wij9hRhE1JA/CiMS+7w== X-Google-Smtp-Source: ADFU+vusPuAI1+O1zTHUYSvKB3lH7QyizZ6VcupLZd9RggDMou7flc7L3LuzXoPgA+/tfAOuABZ+zw== X-Received: by 2002:a05:6000:1090:: with SMTP id y16mr14159275wrw.281.1585575415844; Mon, 30 Mar 2020 06:36:55 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 5/6] hw/arm/xlnx-zynqmp.c: Add missing error-propagation code Date: Mon, 30 Mar 2020 14:36:47 +0100 Message-Id: <20200330133648.22297-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200330133648.22297-1-peter.maydell@linaro.org> References: <20200330133648.22297-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42f 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) In some places in xlnx_zynqmp_realize() we were putting an error into our local Error*, but forgetting to check for failure and pass it back to the caller. Add the missing code. Signed-off-by: Peter Maydell Reviewed-by: Edgar E. Iglesias Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis Message-id: 20200324134947.15384-3-peter.maydell@linaro.org --- hw/arm/xlnx-zynqmp.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index a13dbeeacec..b84d153d56a 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -530,8 +530,20 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Erro= r **errp) * - eMMC Specification Version 4.51 */ object_property_set_uint(sdhci, 3, "sd-spec-version", &err); + if (err) { + error_propagate(errp, err); + return; + } object_property_set_uint(sdhci, SDHCI_CAPABILITIES, "capareg", &er= r); + if (err) { + error_propagate(errp, err); + return; + } object_property_set_uint(sdhci, UHS_I, "uhs", &err); + if (err) { + error_propagate(errp, err); + return; + } object_property_set_bool(sdhci, true, "realized", &err); if (err) { error_propagate(errp, err); @@ -551,6 +563,10 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Erro= r **errp) gchar *bus_name; =20 object_property_set_bool(OBJECT(&s->spi[i]), true, "realized", &er= r); + if (err) { + error_propagate(errp, err); + return; + } =20 sysbus_mmio_map(SYS_BUS_DEVICE(&s->spi[i]), 0, spi_addr[i]); sysbus_connect_irq(SYS_BUS_DEVICE(&s->spi[i]), 0, @@ -565,6 +581,10 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Erro= r **errp) } =20 object_property_set_bool(OBJECT(&s->qspi), true, "realized", &err); + if (err) { + error_propagate(errp, err); + return; + } sysbus_mmio_map(SYS_BUS_DEVICE(&s->qspi), 0, QSPI_ADDR); sysbus_mmio_map(SYS_BUS_DEVICE(&s->qspi), 1, LQSPI_ADDR); sysbus_connect_irq(SYS_BUS_DEVICE(&s->qspi), 0, gic_spi[QSPI_IRQ]); @@ -619,6 +639,10 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Erro= r **errp) =20 for (i =3D 0; i < XLNX_ZYNQMP_NUM_GDMA_CH; i++) { object_property_set_uint(OBJECT(&s->gdma[i]), 128, "bus-width", &e= rr); + if (err) { + error_propagate(errp, err); + return; + } object_property_set_bool(OBJECT(&s->gdma[i]), true, "realized", &e= rr); if (err) { error_propagate(errp, err); --=20 2.20.1