From patchwork Tue Oct 6 23:16:01 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 35171 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 ozlabs.org (Postfix) with ESMTPS id 5D844B7EF9 for ; Wed, 7 Oct 2009 10:26:20 +1100 (EST) Received: from localhost ([127.0.0.1]:33527 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MvJQ9-0006Sb-Ci for incoming@patchwork.ozlabs.org; Tue, 06 Oct 2009 19:26:17 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MvJGQ-0003O6-Ns for qemu-devel@nongnu.org; Tue, 06 Oct 2009 19:16:14 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MvJGK-0003L5-Ec for qemu-devel@nongnu.org; Tue, 06 Oct 2009 19:16:13 -0400 Received: from [199.232.76.173] (port=52562 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MvJGK-0003Kz-8j for qemu-devel@nongnu.org; Tue, 06 Oct 2009 19:16:08 -0400 Received: from oxygen.pond.sub.org ([213.239.205.148]:50051) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MvJGJ-0005IG-Mg for qemu-devel@nongnu.org; Tue, 06 Oct 2009 19:16:07 -0400 Received: from pike.pond.sub.org (pD9E3BD77.dip.t-dialin.net [217.227.189.119]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 775092DD2C2 for ; Wed, 7 Oct 2009 01:16:03 +0200 (CEST) Received: by pike.pond.sub.org (Postfix, from userid 1000) id 4DA43100A0; Wed, 7 Oct 2009 01:16:01 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Wed, 7 Oct 2009 01:16:01 +0200 Message-Id: <0a20f6c853f7819bf9161c63c4a004855d2f99c8.1254867902.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 7/7] Clean up test for qdev_init() 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 Some callers test for != 0, some for < 0. Normalize to < 0. Signed-off-by: Markus Armbruster --- hw/fdc.c | 2 +- hw/ide/isa.c | 2 +- hw/ide/qdev.c | 2 +- hw/parallel.c | 2 +- hw/qdev.c | 2 +- hw/serial.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index f1b2f9a..a21e05f 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -1847,7 +1847,7 @@ fdctrl_t *fdctrl_init_isa(DriveInfo **fds) dev = isa_create("isa-fdc"); qdev_prop_set_drive(&dev->qdev, "driveA", fds[0]); qdev_prop_set_drive(&dev->qdev, "driveB", fds[1]); - if (qdev_init(&dev->qdev) != 0) + if (qdev_init(&dev->qdev) < 0) return NULL; return &(DO_UPCAST(fdctrl_isabus_t, busdev, dev)->state); } diff --git a/hw/ide/isa.c b/hw/ide/isa.c index 3205f40..9f0fdd6 100644 --- a/hw/ide/isa.c +++ b/hw/ide/isa.c @@ -85,7 +85,7 @@ int isa_ide_init(int iobase, int iobase2, int isairq, qdev_prop_set_uint32(&dev->qdev, "iobase", iobase); qdev_prop_set_uint32(&dev->qdev, "iobase2", iobase2); qdev_prop_set_uint32(&dev->qdev, "irq", isairq); - if (qdev_init(&dev->qdev) != 0) + if (qdev_init(&dev->qdev) < 0) return -1; s = DO_UPCAST(ISAIDEState, dev, dev); diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c index c562bc6..81e7995 100644 --- a/hw/ide/qdev.c +++ b/hw/ide/qdev.c @@ -85,7 +85,7 @@ IDEDevice *ide_create_drive(IDEBus *bus, int unit, DriveInfo *drive) dev = qdev_create(&bus->qbus, "ide-drive"); qdev_prop_set_uint32(dev, "unit", unit); qdev_prop_set_drive(dev, "drive", drive); - if (qdev_init(dev) != 0) + if (qdev_init(dev) < 0) return NULL; return DO_UPCAST(IDEDevice, qdev, dev); } diff --git a/hw/parallel.c b/hw/parallel.c index 2635edc..92eecb1 100644 --- a/hw/parallel.c +++ b/hw/parallel.c @@ -493,7 +493,7 @@ ParallelState *parallel_init(int index, CharDriverState *chr) qdev_prop_set_uint32(&dev->qdev, "iobase", isa_parallel_io[index]); qdev_prop_set_uint32(&dev->qdev, "irq", 7); qdev_prop_set_chr(&dev->qdev, "chardev", chr); - if (qdev_init(&dev->qdev) != 0) + if (qdev_init(&dev->qdev) < 0) return NULL; return &DO_UPCAST(ISAParallelState, dev, dev)->state; } diff --git a/hw/qdev.c b/hw/qdev.c index ca60923..906e897 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -214,7 +214,7 @@ DeviceState *qdev_device_add(QemuOpts *opts) qdev_free(qdev); return NULL; } - if (qdev_init(qdev) != 0) { + if (qdev_init(qdev) < 0) { qemu_error("Error initializing device %s\n", driver); return NULL; } diff --git a/hw/serial.c b/hw/serial.c index e044923..eb14f11 100644 --- a/hw/serial.c +++ b/hw/serial.c @@ -759,7 +759,7 @@ SerialState *serial_isa_init(int index, CharDriverState *chr) qdev_prop_set_uint32(&dev->qdev, "iobase", isa_serial_io[index]); qdev_prop_set_uint32(&dev->qdev, "irq", isa_serial_irq[index]); qdev_prop_set_chr(&dev->qdev, "chardev", chr); - if (qdev_init(&dev->qdev) != 0) + if (qdev_init(&dev->qdev) < 0) return NULL; return &DO_UPCAST(ISASerialState, dev, dev)->state; }