From patchwork Fri Sep 11 20:19:20 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 33493 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id 9EE84B70C4 for ; Sat, 12 Sep 2009 06:33:29 +1000 (EST) Received: from localhost ([127.0.0.1]:50785 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MmCoA-0003Vi-PJ for incoming@patchwork.ozlabs.org; Fri, 11 Sep 2009 16:33:26 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MmCam-0003M4-0c for qemu-devel@nongnu.org; Fri, 11 Sep 2009 16:19:36 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MmCag-0003Hi-5X for qemu-devel@nongnu.org; Fri, 11 Sep 2009 16:19:34 -0400 Received: from [199.232.76.173] (port=34685 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MmCag-0003Hb-02 for qemu-devel@nongnu.org; Fri, 11 Sep 2009 16:19:30 -0400 Received: from oxygen.pond.sub.org ([213.239.205.148]:41819) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MmCaf-0005s2-Ev for qemu-devel@nongnu.org; Fri, 11 Sep 2009 16:19:29 -0400 Received: from pike.pond.sub.org (pD9E39C1E.dip.t-dialin.net [217.227.156.30]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 2375C276D54 for ; Fri, 11 Sep 2009 22:19:28 +0200 (CEST) Received: by pike.pond.sub.org (Postfix, from userid 1000) id CA5261009C; Fri, 11 Sep 2009 22:19:21 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 11 Sep 2009 22:19:20 +0200 Message-Id: <66a72b5dfa80db634d573bb5b4d91442be5513d2.1252699478.git.armbru@redhat.com> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: References: X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: [Qemu-devel] [PATCH 5/6] Make isa_create() terminate program on failure X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Callers don't check the return value anyway. Signed-off-by: Markus Armbruster --- hw/isa-bus.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/hw/isa-bus.c b/hw/isa-bus.c index f7e73d2..4d489d2 100644 --- a/hw/isa-bus.c +++ b/hw/isa-bus.c @@ -114,8 +114,8 @@ ISADevice *isa_create(const char *name) DeviceState *dev; if (!isabus) { - fprintf(stderr, "Tried to create isa device %s with no isa bus present.\n", name); - return NULL; + hw_error("Tried to create isa device %s with no isa bus present.\n", + name); } dev = qdev_create(&isabus->qbus, name); return DO_UPCAST(ISADevice, qdev, dev); @@ -126,9 +126,7 @@ ISADevice *isa_create_simple(const char *name) ISADevice *dev; dev = isa_create(name); - if (qdev_init(&dev->qdev) != 0) { - return NULL; - } + qdev_init_nofail(&dev->qdev); return dev; }