diff options
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/qdev.c | 7 | ||||
| -rw-r--r-- | hw/scsi-bus.c | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/hw/qdev.c b/hw/qdev.c index 6819537648..d8114c6d93 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -111,7 +111,12 @@ DeviceState *qdev_create(BusState *bus, const char *name) dev = qdev_try_create(bus, name); if (!dev) { - hw_error("Unknown device '%s' for bus '%s'\n", name, bus->info->name); + if (bus) { + hw_error("Unknown device '%s' for bus '%s'\n", name, + bus->info->name); + } else { + hw_error("Unknown device '%s' for default sysbus\n", name); + } } return dev; diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index 0b0344c1fd..d1ef55985d 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -725,7 +725,7 @@ void scsi_device_purge_requests(SCSIDevice *sdev) static char *scsibus_get_fw_dev_path(DeviceState *dev) { - SCSIDevice *d = (SCSIDevice*)dev; + SCSIDevice *d = DO_UPCAST(SCSIDevice, qdev, dev); SCSIBus *bus = scsi_bus_from_device(d); char path[100]; int i; |