From 39355c3826f5d9a2eb1ce3dc9b4cdd68893769d6 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 25 Jan 2013 14:12:28 +0100 Subject: 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 Acked-by: Andreas F=E4rber Signed-off-by: Paolo Bonzini Signed-off-by: Anthony Liguori --- hw/qdev-core.h | 2 +- hw/qdev.c | 2 +- 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); -- cgit v1.2.1