Message ID | 20200406174743.16956-53-f4bug@amsat.org |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=erhUWpe1; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 48wzYV6rqTz9sR4 for <incoming@patchwork.ozlabs.org>; Tue, 7 Apr 2020 04:27:58 +1000 (AEST) Received: from localhost ([::1]:36722 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1jLWTU-00025G-Tu for incoming@patchwork.ozlabs.org; Mon, 06 Apr 2020 14:27:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36985) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <philippe.mathieu.daude@gmail.com>) id 1jLVrv-0003MW-Tc for qemu-devel@nongnu.org; Mon, 06 Apr 2020 13:49:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <philippe.mathieu.daude@gmail.com>) id 1jLVru-0003hN-Tw for qemu-devel@nongnu.org; Mon, 06 Apr 2020 13:49:07 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:50953) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <philippe.mathieu.daude@gmail.com>) id 1jLVru-0003hD-Nx for qemu-devel@nongnu.org; Mon, 06 Apr 2020 13:49:06 -0400 Received: by mail-wm1-x32e.google.com with SMTP id x25so310806wmc.0 for <qemu-devel@nongnu.org>; Mon, 06 Apr 2020 10:49:06 -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=UhAVvFgdKZItMBK76DLdu4ImD7RTe3y+DxnwlUR9418=; b=erhUWpe1r5OrzZAZS3568gwuSau77naxoYiRUacT+l+Kd6DCznye/Ya6spptunKb5R nGHRssRHsRgTNm+E45sboaWQGaW5v6HVGitSejSPg+9az35wrfxMDIa4xnJ+YXppATQM gQ4cBgIItMRYsL36CwPCgCWNnp0hN+kGZZevMKKAL3o/0alAT33FlXWHvHqTWFc00n1y k59EhsMT1pfUc3vXle36Dvgu7zcwAb417fsQTqk1KmGlsthfabreoYmGcyo3D8udB7ix fbuldLvOj6ezr88zoe/OdCRq7SIAIPcOBH2OJfiWgpK9GXJh7PngkY/34gUB4NqOcpvg wC5w== 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=UhAVvFgdKZItMBK76DLdu4ImD7RTe3y+DxnwlUR9418=; b=gYSFuhepv+bVLM5wn4x6rTgFsUmaQ7jOJE9uhPuYu2ljmuZF92vKIQGSIYqnAym/ym jBVOA7GdG0CpogH0FapnuZGH4bnEMphMUVB0U4hepK1cDAgU9O2TVOpuGoBaVFie6FfW M8ALwGoRyQKrS54+mXZY5YrohOfiaYdvxj4ik3nSp1G3X6ld/805Or50NdV5cURl9LxR GOoVI4Xvh57KSTvwwrBcGtTObvCPal1bDHgSsdimA7yGTQ/SGXldz4zA6x/o+48Cy1qv znd6hI4y58Jyq9JE6vBfT1onj6x7eHVHsefetGNU7oaHEDQwhmFAlDbKbpM8UdQQ/Php 53KQ== X-Gm-Message-State: AGi0Pub5sgulR6XkDNHhxfjY/Mq8I+Demv8FjwYAX0U3AIALYUaLYDoh 0SS4f/j4nURSdMYVXtKpi60o4xBS7N0= X-Google-Smtp-Source: APiQypI5nPOkHdW0N0VZ2hUui5w7DAreNFAdJZUfZNiYnGczZ5nS1YnDDexYYmbQyfMY0c6W6gzJZw== X-Received: by 2002:a1c:7216:: with SMTP id n22mr473022wmc.41.1586195345565; Mon, 06 Apr 2020 10:49:05 -0700 (PDT) Received: from x1w.redhat.com (116.red-83-42-57.dynamicip.rima-tde.net. [83.42.57.116]) by smtp.gmail.com with ESMTPSA id a67sm364880wmc.30.2020.04.06.10.49.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Apr 2020 10:49:05 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org> To: qemu-devel@nongnu.org, Markus Armbruster <armbru@redhat.com> Subject: [PATCH-for-5.1 v2 52/54] hw/mips/boston: Add missing error-propagation code Date: Mon, 6 Apr 2020 19:47:41 +0200 Message-Id: <20200406174743.16956-53-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200406174743.16956-1-f4bug@amsat.org> References: <20200406174743.16956-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::32e X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: Peter Maydell <peter.maydell@linaro.org>, Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>, Paul Burton <pburton@wavecomp.com>, =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= <f4bug@amsat.org>, Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>, Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com>, Aurelien Jarno <aurelien@aurel32.net> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
various: Fix error-propagation with Coccinelle scripts
|
expand
|
diff --git a/hw/mips/boston.c b/hw/mips/boston.c index 98ecd25e8e..2e821ca7d6 100644 --- a/hw/mips/boston.c +++ b/hw/mips/boston.c @@ -426,7 +426,6 @@ static void boston_mach_init(MachineState *machine) { DeviceState *dev; BostonState *s; - Error *err = NULL; MemoryRegion *flash, *ddr_low_alias, *lcd, *platreg; MemoryRegion *sys_mem = get_system_memory(); XilinxPCIEHost *pcie2; @@ -458,19 +457,15 @@ static void boston_mach_init(MachineState *machine) sysbus_init_child_obj(OBJECT(machine), "cps", OBJECT(&s->cps), sizeof(s->cps), TYPE_MIPS_CPS); object_property_set_str(OBJECT(&s->cps), machine->cpu_type, "cpu-type", - &err); - object_property_set_int(OBJECT(&s->cps), machine->smp.cpus, "num-vp", &err); - object_property_set_bool(OBJECT(&s->cps), true, "realized", &err); - - if (err != NULL) { - error_report("%s", error_get_pretty(err)); - exit(1); - } - + &error_fatal); + object_property_set_int(OBJECT(&s->cps), machine->smp.cpus, "num-vp", + &error_fatal); + object_property_set_bool(OBJECT(&s->cps), true, "realized", &error_fatal); sysbus_mmio_map_overlap(SYS_BUS_DEVICE(&s->cps), 0, 0, 1); flash = g_new(MemoryRegion, 1); - memory_region_init_rom(flash, NULL, "boston.flash", 128 * MiB, &err); + memory_region_init_rom(flash, NULL, "boston.flash", 128 * MiB, + &error_fatal); memory_region_add_subregion_overlap(sys_mem, 0x18000000, flash, 0); memory_region_add_subregion_overlap(sys_mem, 0x80000000, machine->ram, 0);