summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2013-01-25 14:12:28 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2013-02-01 15:53:09 -0600
commit39355c3826f5d9a2eb1ce3dc9b4cdd68893769d6 (patch)
tree9f098b73f5def4436df27a6bde2b09aca242b645
parent013e118247d0f1894f329ad31b8f8a9e279555f3 (diff)
downloadqemu-39355c3826f5d9a2eb1ce3dc9b4cdd68893769d6.tar.gz
qdev: change first argument of qbus_create_inplace to void *
Make it clear that no BUS() macro is needed in the callers (in fact it wouldn't work because the object has not been initialized yet with the right class). Suggested-by: Andreas Faerber <afaerber@suse.de> Acked-by: Andreas F=E4rber <afaerber@suse.de> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--hw/qdev-core.h2
-rw-r--r--hw/qdev.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/hw/qdev-core.h b/hw/qdev-core.h
index d1b8e37d80..2486f36853 100644
--- a/hw/qdev-core.h
+++ b/hw/qdev-core.h
@@ -231,7 +231,7 @@ DeviceState *qdev_find_recursive(BusState *bus, const char *id);
typedef int (qbus_walkerfn)(BusState *bus, void *opaque);
typedef int (qdev_walkerfn)(DeviceState *dev, void *opaque);
-void qbus_create_inplace(BusState *bus, const char *typename,
+void qbus_create_inplace(void *bus, const char *typename,
DeviceState *parent, const char *name);
BusState *qbus_create(const char *typename, DeviceState *parent, const char *name);
/* Returns > 0 if either devfn or busfn skip walk somewhere in cursion,
diff --git a/hw/qdev.c b/hw/qdev.c
index 59dce628fe..b80b082a00 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -428,7 +428,7 @@ static void qbus_realize(BusState *bus, DeviceState *parent, const char *name)
}
}
-void qbus_create_inplace(BusState *bus, const char *typename,
+void qbus_create_inplace(void *bus, const char *typename,
DeviceState *parent, const char *name)
{
object_initialize(bus, typename);