Commit 8185d216 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Andreas Färber
Browse files

qdev: Move SysBus initialization to sysbus.c 



TYPE_SYSTEM_BUS will be local to hw/sysbus.c, so move existing references
to main_system_bus and system_bus_info there.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent 09e5ab63

hw/qdev.c

+2 −24
Original line number Diff line number Diff line
@@ -34,10 +34,6 @@ int qdev_hotplug = 0; 
static bool qdev_hot_added = false;

static bool qdev_hot_removed = false;



/* This is a nasty hack to allow passing a NULL bus to qdev_create.  */

static BusState *main_system_bus;

static void main_system_bus_create(void);



/* Register a new device type.  */

const VMStateDescription *qdev_get_vmsd(DeviceState *dev)

{
@@ -188,14 +184,6 @@ static int qdev_reset_one(DeviceState *dev, void *opaque) 
    return 0;

}



BusState *sysbus_get_default(void)

{

    if (!main_system_bus) {

        main_system_bus_create();

    }

    return main_system_bus;

}



static int qbus_reset_one(BusState *bus, void *opaque)

{

    if (bus->info->reset) {
@@ -415,7 +403,7 @@ void qbus_create_inplace(BusState *bus, BusInfo *info, 
    if (parent) {

        QLIST_INSERT_HEAD(&parent->child_bus, bus, sibling);

        parent->num_child_bus++;

    } else if (bus != main_system_bus) {

    } else if (bus != sysbus_get_default()) {

        /* TODO: once all bus devices are qdevified,

           only reset handler for main_system_bus should be registered here. */

        qemu_register_reset(qbus_reset_all_fn, bus);
@@ -432,16 +420,6 @@ BusState *qbus_create(BusInfo *info, DeviceState *parent, const char *name) 
    return bus;

}



static void main_system_bus_create(void)

{

    /* assign main_system_bus before qbus_create_inplace()

     * in order to make "if (bus != main_system_bus)" work */

    main_system_bus = g_malloc0(system_bus_info.size);

    main_system_bus->qdev_allocated = 1;

    qbus_create_inplace(main_system_bus, &system_bus_info, NULL,

                        "main-system-bus");

}



void qbus_free(BusState *bus)

{

    DeviceState *dev;
@@ -453,7 +431,7 @@ void qbus_free(BusState *bus) 
        QLIST_REMOVE(bus, sibling);

        bus->parent->num_child_bus--;

    } else {

        assert(bus != main_system_bus); /* main_system_bus is never freed */

        assert(bus != sysbus_get_default()); /* main_system_bus is never freed */

        qemu_unregister_reset(qbus_reset_all_fn, bus);

    }

    g_free((void*)bus->name);

hw/sysbus.c

+21 −0
Original line number Diff line number Diff line
@@ -256,6 +256,27 @@ static TypeInfo sysbus_device_type_info = { 
    .class_init = sysbus_device_class_init,

};



/* This is a nasty hack to allow passing a NULL bus to qdev_create.  */

static BusState *main_system_bus;



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.size);

    main_system_bus->qdev_allocated = 1;

    qbus_create_inplace(main_system_bus, &system_bus_info, NULL,

                        "main-system-bus");

}



BusState *sysbus_get_default(void)

{

    if (!main_system_bus) {

        main_system_bus_create();

    }

    return main_system_bus;

}



static void sysbus_register_types(void)

{

    type_register_static(&sysbus_device_type_info);