Commit e6add65b authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Eduardo Habkost
Browse files

qdev: move qdev_prop_register_global_list() to tests 



The function is only used by a test, move it there.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20181204142023.15982-6-marcandre.lureau@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 745a4f5e

hw/core/qdev-properties.c

+0 −9
Original line number Diff line number Diff line
@@ -1180,15 +1180,6 @@ void qdev_prop_register_global(GlobalProperty *prop) 
    global_props = g_list_append(global_props, prop);

}



void qdev_prop_register_global_list(GlobalProperty *props)

{

    int i;



    for (i = 0; props[i].driver != NULL; i++) {

        qdev_prop_register_global(props+i);

    }

}



int qdev_prop_check_globals(void)

{

    GList *l;

include/hw/qdev-properties.h

+0 −1
Original line number Diff line number Diff line
@@ -249,7 +249,6 @@ void qdev_prop_set_enum(DeviceState *dev, const char *name, int value); 
void qdev_prop_set_ptr(DeviceState *dev, const char *name, void *value);



void qdev_prop_register_global(GlobalProperty *prop);

void qdev_prop_register_global_list(GlobalProperty *props);

int qdev_prop_check_globals(void);

void qdev_prop_set_globals(DeviceState *dev);

void error_set_from_qdev_prop_error(Error **errp, int ret, DeviceState *dev,

tests/test-qdev-global-props.c

+14 −4
Original line number Diff line number Diff line
@@ -89,6 +89,16 @@ static void test_static_prop(void) 
    g_test_trap_assert_stdout("");

}



static void register_global_properties(GlobalProperty *props)

{

    int i;



    for (i = 0; props[i].driver != NULL; i++) {

        qdev_prop_register_global(props + i);

    }

}





/* Test setting of static property using global properties */

static void test_static_globalprop_subprocess(void)

{
@@ -98,7 +108,7 @@ static void test_static_globalprop_subprocess(void) 
        {}

    };



    qdev_prop_register_global_list(props);

    register_global_properties(props);



    mt = STATIC_TYPE(object_new(TYPE_STATIC_PROPS));

    qdev_init_nofail(DEVICE(mt));
@@ -216,7 +226,7 @@ static void test_dynamic_globalprop_subprocess(void) 
    };

    int global_error;



    qdev_prop_register_global_list(props);

    register_global_properties(props);



    mt = DYNAMIC_TYPE(object_new(TYPE_DYNAMIC_PROPS));

    qdev_init_nofail(DEVICE(mt));
@@ -261,7 +271,7 @@ static void test_dynamic_globalprop_nouser_subprocess(void) 
    };

    int global_error;



    qdev_prop_register_global_list(props);

    register_global_properties(props);



    mt = DYNAMIC_TYPE(object_new(TYPE_DYNAMIC_PROPS));

    qdev_init_nofail(DEVICE(mt));
@@ -299,7 +309,7 @@ static void test_subclass_global_props(void) 
        {}

    };



    qdev_prop_register_global_list(props);

    register_global_properties(props);



    mt = STATIC_TYPE(object_new(TYPE_SUBCLASS));

    qdev_init_nofail(DEVICE(mt));