diff options
| author | Markus Armbruster <armbru@redhat.com> | 2009-10-07 01:16:01 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-10-07 08:54:55 -0500 |
| commit | 5c17ca2505197c56d0097c66a4e5bda4d6f32fb6 (patch) | |
| tree | 011adae1a2f9ce724c92629bd99b78507a7d97ec | |
| parent | dde8bbb44de41ea68f9bede0a6a778ce046b2bcf (diff) | |
Clean up test for qdev_init() failure
Some callers test for != 0, some for < 0. Normalize to < 0.
Patchworks-ID: 35171
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | hw/fdc.c | 2 | ||||
| -rw-r--r-- | hw/ide/isa.c | 2 | ||||
| -rw-r--r-- | hw/ide/qdev.c | 2 | ||||
| -rw-r--r-- | hw/parallel.c | 2 | ||||
| -rw-r--r-- | hw/qdev.c | 2 | ||||
| -rw-r--r-- | hw/serial.c | 2 |
6 files changed, 6 insertions, 6 deletions
@@ -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 3205f40b3b..9f0fdd6498 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 c562bc61a6..81e79950db 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 2635edcaf7..92eecb1528 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; } @@ -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 e044923101..eb14f11ba1 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; } |