From patchwork Mon May 10 19:08:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 433169 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3129139jao; Mon, 10 May 2021 12:14:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzA28/f1MVZ01FGsgruyS7NERlAeg6NDXOQc89z8+NnJ4WyEbPL9OLMH354zLKy5cqlSLaJ X-Received: by 2002:a5e:c00e:: with SMTP id u14mr16269589iol.106.1620674076802; Mon, 10 May 2021 12:14:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620674076; cv=none; d=google.com; s=arc-20160816; b=iBtRktTswlF5LtpMcmnfhBqvqGpObTV4WyUdRYhhySDczNjuhnuUaIJ0ez3/9pkHPE MIzg/0bcHjBEOzJgdhHrHhis1IkrI/FzN5tnJGQEsmHscFdJGTNC+9GMu2MmFTRMiyTi VHKpnEXeE2gw1iZR3VPnK4C1z5XCqh4JDC48apktKS22gGi6MOZOc5CGRLI1Za30IqYK Ex0h6TMfqot346P2K2SBuJ25t5UQD9WgHnbonMIyxBflgRSo//jk45yGvgBWq/z9QgC2 tS3V6hJydb48RmNDBM3GG9v94+9rNttGmSStroVhkemDgh2sSY9UFijgCH0WpjalGklb VuLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=NPiCr7uH0qLtwDI+9ztTOX0+Iqb2mkfB6dk1TyXG9m0=; b=kOQBxe7rWEW0gdWKewYsMG2tz82tK83gE9EVL3KAIHzty+FGYBk4d10Y+OGRUUAyeB b0btcWJhmo5qqDqpXlpwFopKm04LgU+LdODIcv8M5E4r14Bzi6rrz1OXilwuf2OS84zF ZkAxHn67RJ8GUppQSyLTmh5/sUIwOgH6As1Yf9NiErrt0PHEXFdBRC/Ekify4Imb3tFn Dd6JVRp+idL9OR7HhPdykaqOtnvXJ2fk95myywOcLnldnyWmEV3/PXX8tHrmUI4bqHQj /mDxEIStalTQjBOUcyXC3+q+G3XSy5GqrYVq3ng4aeqtrzB2qWgAzhbJ4m9HsBDYj8yR K+6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Llstzy4h; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x5si18255116ilu.59.2021.05.10.12.14.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 May 2021 12:14:36 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Llstzy4h; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:43718 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgBMS-00087z-8r for patch@linaro.org; Mon, 10 May 2021 15:14:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37388) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgBH7-0000eb-6x for qemu-devel@nongnu.org; Mon, 10 May 2021 15:09:05 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:35416) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lgBGv-0004z2-Kr for qemu-devel@nongnu.org; Mon, 10 May 2021 15:09:04 -0400 Received: by mail-wm1-x330.google.com with SMTP id j3-20020a05600c4843b02901484662c4ebso11777237wmo.0 for ; Mon, 10 May 2021 12:08:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NPiCr7uH0qLtwDI+9ztTOX0+Iqb2mkfB6dk1TyXG9m0=; b=Llstzy4hz+XPmQglsXp8FkpP3SeHzPdjnGiVeOq/SmM8UZCUceRTFAC68VGbzOLG9S kzknCIjehHiWSrPlLaiaJNMrc2jYVv10e7ULmsLqqc0TKJ30tbBQkyTOLss+4JQvXYoA 6OAIUv6n59galPeby0+21y+IRapEC1j+SNaN0Dt4bilzCKYQSe2VgEadpQqM+Wl+YitL r7szuSFT9tuQLBycq2tdi+qU2lgTXuvDkQol6VLXkvIVfa3CfdPxCrwApXobg/Kuu3bE Jqk/tZIpiU09XeTc//radvDZp1sCtCmTl7SXQhz9vjr8wBwoXPdsTdn4jwIfAV5GjVNN qCIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NPiCr7uH0qLtwDI+9ztTOX0+Iqb2mkfB6dk1TyXG9m0=; b=h0HveUi0sYbY7ia8xdreqR8EcZvx8u0Qv8ySai7I8XorwuFA5hqcqF8a6+t0ukPFgP eKCSY6x1GTbbRaVzNeA4biYgETlCwTKr8nP77+tWVXVRaU+TYjAR97p4AvoZOpufWXa7 UfBj4adyVxrT7gutnW4l+i0Gw95M6EVXmDgG9INh94IpxFoaCbEFCpubGFEb1IjmZjfL nmHSufZGlFLNH9BXMXwzLlX4J3bv2IGfcyfljSogwap1FYjl1kJvrWloLArMjic9UzRq rYhNnmgyIjrbF95VV1RWfhlVXhhr/m4rrjmK2uQVqLPdrKKVnfYqoMIc9soLbaay3X/z DeuA== X-Gm-Message-State: AOAM533qHl2dMabWqpt6dQ1hec+T154h4dJVMlsQLwU6OMBgWakuCaPW hoFT3Q2mOaeT9/uNMgZq3mJsBQ== X-Received: by 2002:a7b:c092:: with SMTP id r18mr24640288wmh.51.1620673732103; Mon, 10 May 2021 12:08:52 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id t23sm463892wmj.31.2021.05.10.12.08.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 12:08:51 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 4/6] hw/arm/armsse: Convert armsse_realize() to use ERRP_GUARD Date: Mon, 10 May 2021 20:08:42 +0100 Message-Id: <20210510190844.17799-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210510190844.17799-1-peter.maydell@linaro.org> References: <20210510190844.17799-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x330.google.com 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: Kumar Gala , Jimmy Brisson , Kevin Townsend , Devaraj Ranganna Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Convert armsse_realize() to use ERRP_GUARD(), following the rules in include/qapi/error.h. Signed-off-by: Peter Maydell --- We'll be adding a new error check in the next patch, so do this first to avoid adding more uses of legacy error_propagate(). --- hw/arm/armsse.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.20.1 Reviewed-by: Richard Henderson diff --git a/hw/arm/armsse.c b/hw/arm/armsse.c index 1729f09c7cb..be5aa1f113a 100644 --- a/hw/arm/armsse.c +++ b/hw/arm/armsse.c @@ -913,7 +913,6 @@ static void armsse_realize(DeviceState *dev, Error **errp) const ARMSSEDeviceInfo *devinfo; int i; MemoryRegion *mr; - Error *err = NULL; SysBusDevice *sbd_apb_ppc0; SysBusDevice *sbd_secctl; DeviceState *dev_apb_ppc0; @@ -922,6 +921,8 @@ static void armsse_realize(DeviceState *dev, Error **errp) DeviceState *dev_splitter; uint32_t addr_width_max; + ERRP_GUARD(); + if (!s->board_memory) { error_setg(errp, "memory property was not set"); return; @@ -1151,10 +1152,9 @@ static void armsse_realize(DeviceState *dev, Error **errp) uint32_t sram_bank_size = 1 << s->sram_addr_width; memory_region_init_ram(&s->sram[i], NULL, ramname, - sram_bank_size, &err); + sram_bank_size, errp); g_free(ramname); - if (err) { - error_propagate(errp, err); + if (*errp) { return; } object_property_set_link(OBJECT(&s->mpc[i]), "downstream",