commit 9b024b5f965a3c11aa65435df5b9e8f1cc24d3fa
author Anthony Liguori <aliguori@us.ibm.com> Fri Aug 12 08:06:02 2011 -0500
committer Anthony Liguori <aliguori@us.ibm.com> Fri Aug 12 08:06:02 2011 -0500
tree 952d44ca7f7c2f2333fbcc005d8f49f6dbba988f
parent eecaecedec1eb6a47be370a6023bc220a3d30c85
parent 85d59fef9defc78790c8b6cee833d4a77c22a490

Merge remote-tracking branch 'stefanha/trivial-patches' into staging

cpu-all.h

diff --git a/cpu-all.h b/cpu-all.h
index fa0205c..f5c82cd 100644
--- a/cpu-all.h
+++ b/cpu-all.h
@@ -488,7 +488,7 @@
 
 typedef struct RAMList {
     uint8_t *phys_dirty;
-    QLIST_HEAD(ram, RAMBlock) blocks;
+    QLIST_HEAD(, RAMBlock) blocks;
 } RAMList;
 extern RAMList ram_list;
 

exec.c

diff --git a/exec.c b/exec.c
index be7e4b2..63adb18 100644
--- a/exec.c
+++ b/exec.c
@@ -110,7 +110,7 @@
 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;

hw/qdev.c

diff --git a/hw/qdev.c b/hw/qdev.c
index 6819537..d8114c6 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -111,7 +111,12 @@
 
     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;

hw/scsi-bus.c

diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c
index 0b0344c..d1ef559 100644
--- a/hw/scsi-bus.c
+++ b/hw/scsi-bus.c
@@ -725,7 +725,7 @@
 
 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;