Commit 4b3582b0 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Andreas Färber
Browse files

qdev: Clean up global properties 



Now that global properties do not depend on buses anymore, set
them directly in the device instance_init function.

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

hw/qdev-monitor.c

+0 −1
Original line number Diff line number Diff line
@@ -440,7 +440,6 @@ DeviceState *qdev_device_add(QemuOpts *opts) 
    /* create device, set properties */

    qdev = DEVICE(object_new(driver));

    qdev_set_parent_bus(qdev, bus);

    qdev_prop_set_globals(qdev);



    id = qemu_opts_id(opts);

    if (id) {

hw/qdev.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,6 @@ DeviceState *qdev_try_create(BusState *bus, const char *type) 
    }



    qdev_set_parent_bus(dev, bus);

    qdev_prop_set_globals(dev);



    return dev;

}
@@ -618,6 +617,7 @@ static void device_initfn(Object *obj) 
        qdev_prop_set_defaults(dev, DEVICE_CLASS(class)->props);

        class = object_class_get_parent(class);

    } while (class != object_class_by_name(TYPE_DEVICE));

    qdev_prop_set_globals(dev);

}



/* Unlink device from bus and free the structure.  */