aboutsummaryrefslogtreecommitdiff
path: root/hw/core/sysbus.c
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2013-08-24 00:02:27 +0200
committerAndreas Färber <afaerber@suse.de>2013-08-30 21:15:35 +0200
commitfb17dfe0575243a3f60dcefca37fa82ae682f146 (patch)
treee2b1bc60fe8cd608b5655c475793667da9f696ad /hw/core/sysbus.c
parente5f720391e0628131cb6548b3d27be6aa56ae7d4 (diff)
downloadqemu-fb17dfe0575243a3f60dcefca37fa82ae682f146.zip
qemu-fb17dfe0575243a3f60dcefca37fa82ae682f146.tar.gz
qemu-fb17dfe0575243a3f60dcefca37fa82ae682f146.tar.bz2
qdev: Pass size to qbus_create_inplace()
To be passed to object_initialize(). Since commit 39355c3826f5d9a2eb1ce3dc9b4cdd68893769d6 the argument is void*, so drop some superfluous (BusState *) casts or direct parent field usages. Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw/core/sysbus.c')
-rw-r--r--hw/core/sysbus.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/core/sysbus.c b/hw/core/sysbus.c
index 9004d8c..b84cd4a 100644
--- a/hw/core/sysbus.c
+++ b/hw/core/sysbus.c
@@ -276,8 +276,8 @@ static void main_system_bus_create(void)
/* assign main_system_bus before qbus_create_inplace()
* in order to make "if (bus != sysbus_get_default())" work */
main_system_bus = g_malloc0(system_bus_info.instance_size);
- qbus_create_inplace(main_system_bus, TYPE_SYSTEM_BUS, NULL,
- "main-system-bus");
+ qbus_create_inplace(main_system_bus, system_bus_info.instance_size,
+ TYPE_SYSTEM_BUS, NULL, "main-system-bus");
OBJECT(main_system_bus)->free = g_free;
object_property_add_child(container_get(qdev_get_machine(),
"/unattached"),