From patchwork Tue Sep 8 16:51:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 53276 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by patches.linaro.org (Postfix) with ESMTPS id B2E6122B05 for ; Tue, 8 Sep 2015 16:52:57 +0000 (UTC) Received: by lagj9 with SMTP id j9sf42812819lag.0 for ; Tue, 08 Sep 2015 09:52:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=JSTVDQClvVn9eYp/BYEfhZRDrm84UeIpwBgfOdvl9zs=; b=HpIfKO7ct6NBXWxVNNtlGns2jTystgnm6vnBGku/YgzvEbiGhIhRO1LVgiF9Mhtsgq gkjEqag1xUB+PZGusJgZOjZ6wlTBnpLIYR3LSw566pERy7ZyvtQ6FzM+Adc9/WSmTmfh 0XjDIg54j63ZS6M2TElyyAqh2nAa8JYTdb+K8jp/TUXFLH7ioN8VS//77gOVY3urLkUi tzmPhIgzWn9xxPwxRBbzW18NvA+Y+htyFhOqaQ1571GaMcZZd0mw3Qe5CUzgqDyWKMFX vXO2Cv44GZJAME9xNDlHtsmk0cYh5iWbK2K7IZf9WcQ9a/OLeQBQIcQoWyJ2FKRFAQbz HSpw== X-Gm-Message-State: ALoCoQnKTKqVNb5STWWXzLCDy2LNAk8kzkfbvwvmwOYZNoJKecyS0TeAcOilBqoizVuUeQHavJz5 X-Received: by 10.112.139.65 with SMTP id qw1mr6876961lbb.24.1441731176700; Tue, 08 Sep 2015 09:52:56 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.2.129 with SMTP id 1ls620528lau.58.gmail; Tue, 08 Sep 2015 09:52:56 -0700 (PDT) X-Received: by 10.112.118.19 with SMTP id ki19mr24032520lbb.108.1441731176540; Tue, 08 Sep 2015 09:52:56 -0700 (PDT) Received: from mail-la0-f47.google.com (mail-la0-f47.google.com. [209.85.215.47]) by mx.google.com with ESMTPS id oc2si3764631lbb.76.2015.09.08.09.52.56 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Sep 2015 09:52:56 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) client-ip=209.85.215.47; Received: by lagj9 with SMTP id j9so74289542lag.2 for ; Tue, 08 Sep 2015 09:52:56 -0700 (PDT) X-Received: by 10.112.169.66 with SMTP id ac2mr22943936lbc.32.1441731176064; Tue, 08 Sep 2015 09:52:56 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp1094828lbq; Tue, 8 Sep 2015 09:52:53 -0700 (PDT) X-Received: by 10.140.232.209 with SMTP id d200mr39405476qhc.68.1441731173914; Tue, 08 Sep 2015 09:52:53 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id e128si4551063qka.21.2015.09.08.09.52.52 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 08 Sep 2015 09:52:53 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:35780 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZZM8a-0003ao-Km for patch@linaro.org; Tue, 08 Sep 2015 12:52:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49097) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZZM7T-0002Sz-Fa for qemu-devel@nongnu.org; Tue, 08 Sep 2015 12:51:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZZM7S-0007n4-Bt for qemu-devel@nongnu.org; Tue, 08 Sep 2015 12:51:43 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:35049) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZZM7S-0007b2-5n for qemu-devel@nongnu.org; Tue, 08 Sep 2015 12:51:42 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1ZZM7I-0001ik-Uf for qemu-devel@nongnu.org; Tue, 08 Sep 2015 17:51:32 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 8 Sep 2015 17:51:31 +0100 Message-Id: <1441731092-6513-20-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1441731092-6513-1-git-send-email-peter.maydell@linaro.org> References: <1441731092-6513-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Subject: [Qemu-devel] [PULL 19/20] xlnx-zynqmp.c: Convert some of the error_propagate() calls to error_abort X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Alistair Francis Convert all of the non-realize error_propagate() calls into error_abort calls as they shouldn't be user visible failure cases. Signed-off-by: Alistair Francis Reviewed-by: Peter Crosthwaite Signed-off-by: Peter Maydell --- hw/arm/xlnx-zynqmp.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index 388baef..6756c74 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -162,12 +162,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) g_free(name); object_property_set_int(OBJECT(&s->apu_cpu[i]), GIC_BASE_ADDR, - "reset-cbar", &err); - if (err) { - error_propagate((errp), (err)); - return; - } - + "reset-cbar", &error_abort); object_property_set_bool(OBJECT(&s->apu_cpu[i]), true, "realized", &err); if (err) { @@ -200,12 +195,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) g_free(name); object_property_set_bool(OBJECT(&s->rpu_cpu[i]), true, "reset-hivecs", - &err); - if (err != NULL) { - error_propagate(errp, err); - return; - } - + &error_abort); object_property_set_bool(OBJECT(&s->rpu_cpu[i]), true, "realized", &err); if (err) {