From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AF5CAC2D0E5 for ; Wed, 25 Mar 2020 19:27:32 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 7428520719 for ; Wed, 25 Mar 2020 19:27:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VleCQCB2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7428520719 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:42070 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHBgZ-0003eJ-Jd for qemu-devel@archiver.kernel.org; Wed, 25 Mar 2020 15:27:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53526) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHBYN-0000QR-D0 for qemu-devel@nongnu.org; Wed, 25 Mar 2020 15:19:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHBYM-00005s-85 for qemu-devel@nongnu.org; Wed, 25 Mar 2020 15:19:03 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:50236) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHBYM-0008WU-1u; Wed, 25 Mar 2020 15:19:02 -0400 Received: by mail-wm1-x342.google.com with SMTP id d198so3846530wmd.0; Wed, 25 Mar 2020 12:19:01 -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=mJWqK5dP/JUjGEuwE5rKgl6cBOxlAe6qQTEyZU8C8W0=; b=VleCQCB2ornO9w/JxmRfcHEknZBnTHp7eX+ggBV84+MqPxxRabg1vxAR5ZLJUiaD8X WRk/rzD7DwTyQqStxRXjvhzX6OZMHkUPsBCJ5RO5HEr42KkKsglR3UCWdso+9PogQgDG RSQoAV09hl8gpLd5dq2pYv3iTJXnJMVHdhscJMPLG3IIxniBxbWovSYQlvHCbr9SJM+a QaYZjJcnjLopmdXcvMU0Ujy56D4j8yMydlmLQghGfciCIbIkKt2zOjhymPs1o9EKrzMe XRa92Pr9y7pvFQfRzjcW7PFyVayrRjJdQ0Zo97j34dCjki13dNHYL7UpELRBNFldy6+u tRpQ== 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=mJWqK5dP/JUjGEuwE5rKgl6cBOxlAe6qQTEyZU8C8W0=; b=kbxkKBJN7BiV9+kPIoBsOoNC5/e2i/iJfc8t7pLROcsEk3dGOks1YzvPKOJDF6r612 ZRWuQ6Em/IAyPh4aa0RWFEpiTgm4fWl8FQpl9wPEoRX4BiJnunURzqgfo13pCgxuqA4P S+N+7iTQg13AiV9YDI/0na2oDEsuiurdErVillegb0NXoml5DzBSs5BaTAhPoDTSDslV sxDk2MULGLZO5CqzrM3o45W+PWP2RP41TRc50rv9mwnf7To0Q5x6Cm/v7NEBD8K0o0NX nItaDCEYWRMRa3HAQ5PWxobuDDNPlcXv2+xGNMzNlT2sl8PvdPfFDdKq0HiJG0W/tZgo uF8g== X-Gm-Message-State: ANhLgQ1vZ0/jXpVA7HPCMsBfgS6whKZsVLPE34APt6lJISVVFxG4tAtY A/I/dLcsH51ndnOxM5POmteUXseT0Ck= X-Google-Smtp-Source: ADFU+vsZJ2kDOybje24dj6jJl/WlOq2ip81mCzO5QWZlbxJukNvoz8idUswBtE/zTlmzkvq1ZJ2ocQ== X-Received: by 2002:a05:600c:2051:: with SMTP id p17mr4738300wmg.153.1585163940694; Wed, 25 Mar 2020 12:19:00 -0700 (PDT) Received: from localhost.localdomain (37.red-83-52-54.dynamicip.rima-tde.net. [83.52.54.37]) by smtp.gmail.com with ESMTPSA id r17sm6345672wrx.46.2020.03.25.12.18.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Mar 2020 12:18:59 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-5.0 09/12] hw/mips/mips_malta: Add missing error-propagation code Date: Wed, 25 Mar 2020 20:18:27 +0100 Message-Id: <20200325191830.16553-10-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200325191830.16553-1-f4bug@amsat.org> References: <20200325191830.16553-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 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: Paul Burton , Sagar Karandikar , "Michael S. Tsirkin" , Jason Wang , Mark Cave-Ayland , Alistair Francis , "Edgar E. Iglesias" , Peter Maydell , Markus Armbruster , Aleksandar Markovic , Palmer Dabbelt , Aleksandar Rikalo , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , Alistair Francis , qemu-arm@nongnu.org, David Gibson , qemu-riscv@nongnu.org, Bastian Koppelmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Andrew Baumann , Jean-Christophe Dubois , qemu-ppc@nongnu.org, Paolo Bonzini , Aurelien Jarno Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Running the coccinelle script produced: $ spatch \ --macro-file scripts/cocci-macro-file.h --include-headers \ --sp-file scripts/coccinelle/object_property_missing_error_propagate.cocci \ --keep-comments --smpl-spacing --dir hw [[manual check required: error_propagate() might be missing in object_property_set_int() hw/mips/mips_malta.c:1193:4]] [[manual check required: error_propagate() might be missing in object_property_set_str() hw/mips/mips_malta.c:1192:4]] Add the missing error_propagate() after manual review by adding a Error* parameter to create_cps(). Signed-off-by: Philippe Mathieu-Daudé --- hw/mips/mips_malta.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index e4c4de1b4e..8d43cfd41b 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -1183,22 +1183,31 @@ static void create_cpu_without_cps(MachineState *ms, } static void create_cps(MachineState *ms, MaltaState *s, - qemu_irq *cbus_irq, qemu_irq *i8259_irq) + qemu_irq *cbus_irq, qemu_irq *i8259_irq, + Error **errp) { Error *err = NULL; sysbus_init_child_obj(OBJECT(s), "cps", OBJECT(&s->cps), sizeof(s->cps), TYPE_MIPS_CPS); object_property_set_str(OBJECT(&s->cps), ms->cpu_type, "cpu-type", &err); + if (err) { + error_propagate(errp, err); + return; + } object_property_set_int(OBJECT(&s->cps), ms->smp.cpus, "num-vp", &err); + if (err) { + error_propagate(errp, err); + return; + } object_property_set_bool(OBJECT(&s->cps), true, "realized", &err); - if (err != NULL) { - error_report("%s", error_get_pretty(err)); - exit(1); + if (err) { + error_propagate(errp, err); + return; } sysbus_mmio_map_overlap(SYS_BUS_DEVICE(&s->cps), 0, 0, 1); *i8259_irq = get_cps_irq(&s->cps, 3); *cbus_irq = NULL; } @@ -1206,9 +1215,9 @@ static void create_cps(MachineState *ms, MaltaState *s, static void mips_create_cpu(MachineState *ms, MaltaState *s, qemu_irq *cbus_irq, qemu_irq *i8259_irq) { if ((ms->smp.cpus > 1) && cpu_supports_cps_smp(ms->cpu_type)) { - create_cps(ms, s, cbus_irq, i8259_irq); + create_cps(ms, s, cbus_irq, i8259_irq, &error_fatal); } else { create_cpu_without_cps(ms, cbus_irq, i8259_irq); } } -- 2.21.1