Revision 3f66aa9c hw/isa-bus.c

b/hw/isa-bus.c
114 114
    DeviceState *dev;
115 115

  
116 116
    if (!isabus) {
117
        fprintf(stderr, "Tried to create isa device %s with no isa bus present.\n", name);
118
        return NULL;
117
        hw_error("Tried to create isa device %s with no isa bus present.\n",
118
                 name);
119 119
    }
120 120
    dev = qdev_create(&isabus->qbus, name);
121 121
    return DO_UPCAST(ISADevice, qdev, dev);
......
126 126
    ISADevice *dev;
127 127

  
128 128
    dev = isa_create(name);
129
    if (qdev_init(&dev->qdev) != 0) {
130
        return NULL;
131
    }
129
    qdev_init_nofail(&dev->qdev);
132 130
    return dev;
133 131
}
134 132

  

Also available in: Unified diff