Commit 55df8e1a authored by Marc-André Lureau's avatar Marc-André Lureau
Browse files

qdev: all globals are now user-provided 



All globals are now either provided via -global or through -cpu
features (CPU features are implemented by registering globals).

If the global isn't being used, it should warn in either case.

We can thus consider that all global_props are "user-provided"
globals. No need to track this per-globals anymore.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Acked-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 1c3994f6

hw/core/qdev-properties.c

+0 −4
Original line number Diff line number Diff line
@@ -1192,9 +1192,6 @@ int qdev_prop_check_globals(void) 
        if (prop->used) {

            continue;

        }

        if (!prop->user_provided) {

            continue;

        }

        oc = object_class_by_name(prop->driver);

        oc = object_class_dynamic_cast(oc, TYPE_DEVICE);

        if (!oc) {
@@ -1233,7 +1230,6 @@ void qdev_prop_set_globals(DeviceState *dev) 
            if (!dev->hotplugged && prop->errp) {

                error_propagate(prop->errp, err);

            } else {

                assert(prop->user_provided);

                warn_report_err(err);

            }

        }

include/hw/qdev-core.h

+0 −3
Original line number Diff line number Diff line
@@ -249,8 +249,6 @@ struct PropertyInfo { 


/**

 * GlobalProperty:

 * @user_provided: Set to true if property comes from user-provided config

 * (command-line or config file).

 * @used: Set to true if property was used when initializing a device.

 * @errp: Error destination, used like first argument of error_setg()

 *        in case property setting fails later. If @errp is NULL, we
@@ -262,7 +260,6 @@ typedef struct GlobalProperty { 
    const char *driver;

    const char *property;

    const char *value;

    bool user_provided;

    bool used;

    Error **errp;

} GlobalProperty;

tests/test-qdev-global-props.c

+6 −51
Original line number Diff line number Diff line
@@ -216,12 +216,12 @@ static void test_dynamic_globalprop_subprocess(void) 
{

    MyType *mt;

    static GlobalProperty props[] = {

        { TYPE_DYNAMIC_PROPS, "prop1", "101", true },

        { TYPE_DYNAMIC_PROPS, "prop2", "102", true },

        { TYPE_DYNAMIC_PROPS"-bad", "prop3", "103", true },

        { TYPE_UNUSED_HOTPLUG, "prop4", "104", true },

        { TYPE_UNUSED_NOHOTPLUG, "prop5", "105", true },

        { TYPE_NONDEVICE, "prop6", "106", true },

        { TYPE_DYNAMIC_PROPS, "prop1", "101", },

        { TYPE_DYNAMIC_PROPS, "prop2", "102", },

        { TYPE_DYNAMIC_PROPS"-bad", "prop3", "103", },

        { TYPE_UNUSED_HOTPLUG, "prop4", "104", },

        { TYPE_UNUSED_NOHOTPLUG, "prop5", "105", },

        { TYPE_NONDEVICE, "prop6", "106", },

        {}

    };

    int global_error;
@@ -256,46 +256,6 @@ static void test_dynamic_globalprop(void) 
    g_test_trap_assert_stdout("");

}



/* Test setting of dynamic properties using user_provided=false properties */

static void test_dynamic_globalprop_nouser_subprocess(void)

{

    MyType *mt;

    static GlobalProperty props[] = {

        { TYPE_DYNAMIC_PROPS, "prop1", "101" },

        { TYPE_DYNAMIC_PROPS, "prop2", "102" },

        { TYPE_DYNAMIC_PROPS"-bad", "prop3", "103" },

        { TYPE_UNUSED_HOTPLUG, "prop4", "104" },

        { TYPE_UNUSED_NOHOTPLUG, "prop5", "105" },

        { TYPE_NONDEVICE, "prop6", "106" },

        {}

    };

    int global_error;



    register_global_properties(props);



    mt = DYNAMIC_TYPE(object_new(TYPE_DYNAMIC_PROPS));

    qdev_init_nofail(DEVICE(mt));



    g_assert_cmpuint(mt->prop1, ==, 101);

    g_assert_cmpuint(mt->prop2, ==, 102);

    global_error = qdev_prop_check_globals();

    g_assert_cmpuint(global_error, ==, 0);

    g_assert(props[0].used);

    g_assert(props[1].used);

    g_assert(!props[2].used);

    g_assert(!props[3].used);

    g_assert(!props[4].used);

    g_assert(!props[5].used);

}



static void test_dynamic_globalprop_nouser(void)

{

    g_test_trap_subprocess("/qdev/properties/dynamic/global/nouser/subprocess", 0, 0);

    g_test_trap_assert_passed();

    g_test_trap_assert_stderr("");

    g_test_trap_assert_stdout("");

}



/* Test if global props affecting subclasses are applied in the right order */

static void test_subclass_global_props(void)

{
@@ -345,11 +305,6 @@ int main(int argc, char **argv) 
    g_test_add_func("/qdev/properties/dynamic/global",

                    test_dynamic_globalprop);



    g_test_add_func("/qdev/properties/dynamic/global/nouser/subprocess",

                    test_dynamic_globalprop_nouser_subprocess);

    g_test_add_func("/qdev/properties/dynamic/global/nouser",

                    test_dynamic_globalprop_nouser);



    g_test_add_func("/qdev/properties/global/subclass",

                    test_subclass_global_props);

vl.c

+0 −1
Original line number Diff line number Diff line
@@ -2964,7 +2964,6 @@ static int global_init_func(void *opaque, QemuOpts *opts, Error **errp) 
    g->driver   = qemu_opt_get(opts, "driver");

    g->property = qemu_opt_get(opts, "property");

    g->value    = qemu_opt_get(opts, "value");

    g->user_provided = true;

    g->errp = &error_fatal;

    qdev_prop_register_global(g);

    return 0;