diff options
| -rw-r--r-- | cpu-all.h | 2 | ||||
| -rw-r--r-- | exec.c | 2 | ||||
| -rw-r--r-- | hw/qdev.c | 7 | ||||
| -rw-r--r-- | hw/scsi-bus.c | 2 |
4 files changed, 9 insertions, 4 deletions
diff --git a/cpu-all.h b/cpu-all.h index fa0205c28f..f5c82cdebd 100644 --- a/cpu-all.h +++ b/cpu-all.h @@ -488,7 +488,7 @@ typedef struct RAMBlock { typedef struct RAMList { uint8_t *phys_dirty; - QLIST_HEAD(ram, RAMBlock) blocks; + QLIST_HEAD(, RAMBlock) blocks; } RAMList; extern RAMList ram_list; diff --git a/exec.c b/exec.c index be7e4b2451..63adb189e7 100644 --- a/exec.c +++ b/exec.c @@ -110,7 +110,7 @@ static uint8_t *code_gen_ptr; int phys_ram_fd; static int in_migration; -RAMList ram_list = { .blocks = QLIST_HEAD_INITIALIZER(ram_list) }; +RAMList ram_list = { .blocks = QLIST_HEAD_INITIALIZER(ram_list.blocks) }; static MemoryRegion *system_memory; static MemoryRegion *system_io; 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; |