Commit 2f7bd829 authored by Andreas Färber's avatar Andreas Färber Committed by Anthony Liguori
Browse files

qdev: Fix device_add bus assumptions 



Drop an unreachable fallback bus assignment to SysBus.

If no ,bus= is specified, only search busses recursively for bus type if
the DeviceClass has a bus_type specified. Handle resulting NULL cases.

Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
Message-id: 1366077021-28882-1-git-send-email-afaerber@suse.de
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent acbbc036

qdev-monitor.c

+8 −8
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
 */



#include "hw/qdev.h"

#include "hw/sysbus.h"

#include "monitor/monitor.h"

#include "monitor/qdev.h"

#include "qmp-commands.h"
@@ -415,7 +416,7 @@ DeviceState *qdev_device_add(QemuOpts *opts) 
    DeviceClass *k;

    const char *driver, *path, *id;

    DeviceState *qdev;

    BusState *bus;

    BusState *bus = NULL;



    driver = qemu_opt_get(opts, "driver");

    if (!driver) {
@@ -453,7 +454,7 @@ DeviceState *qdev_device_add(QemuOpts *opts) 
                          driver, object_get_typename(OBJECT(bus)));

            return NULL;

        }

    } else {

    } else if (k->bus_type != NULL) {

        bus = qbus_find_recursive(sysbus_get_default(), NULL, k->bus_type);

        if (!bus) {

            qerror_report(QERR_NO_BUS_FOR_DEVICE,
@@ -461,18 +462,17 @@ DeviceState *qdev_device_add(QemuOpts *opts) 
            return NULL;

        }

    }

    if (qdev_hotplug && !bus->allow_hotplug) {

    if (qdev_hotplug && bus && !bus->allow_hotplug) {

        qerror_report(QERR_BUS_NO_HOTPLUG, bus->name);

        return NULL;

    }



    if (!bus) {

        bus = sysbus_get_default();

    }



    /* create device, set properties */

    qdev = DEVICE(object_new(driver));



    if (bus) {

        qdev_set_parent_bus(qdev, bus);

    }



    id = qemu_opts_id(opts);

    if (id) {