Commit 47c66009 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

qom: introduce object_class_get_list_sorted 



Unify half a dozen copies of very similar code (the only difference being
whether comparisons were case-sensitive) and use it also in Tricore,
which did not do any sorting of CPU model names.

Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 819fd469

include/qom/object.h

+11 −0
Original line number Diff line number Diff line
@@ -913,6 +913,17 @@ void object_class_foreach(void (*fn)(ObjectClass *klass, void *opaque), 
GSList *object_class_get_list(const char *implements_type,

                              bool include_abstract);



/**

 * object_class_get_list_sorted:

 * @implements_type: The type to filter for, including its derivatives.

 * @include_abstract: Whether to include abstract classes.

 *

 * Returns: A singly-linked list of the classes in alphabetical

 * case-insensitive order.

 */

GSList *object_class_get_list_sorted(const char *implements_type,

                              bool include_abstract);



/**

 * object_ref:

 * @obj: the object

qdev-monitor.c

+1 −8
Original line number Diff line number Diff line
@@ -122,12 +122,6 @@ static void qdev_print_devinfo(DeviceClass *dc) 
    error_printf("\n");

}



static gint devinfo_cmp(gconstpointer a, gconstpointer b)

{

    return strcasecmp(object_class_get_name((ObjectClass *)a),

                      object_class_get_name((ObjectClass *)b));

}



static void qdev_print_devinfos(bool show_no_user)

{

    static const char *cat_name[DEVICE_CATEGORY_MAX + 1] = {
@@ -146,8 +140,7 @@ static void qdev_print_devinfos(bool show_no_user) 
    int i;

    bool cat_printed;



    list = g_slist_sort(object_class_get_list(TYPE_DEVICE, false),

                        devinfo_cmp);

    list = object_class_get_list_sorted(TYPE_DEVICE, false);



    for (i = 0; i <= DEVICE_CATEGORY_MAX; i++) {

        cat_printed = false;

qom/object.c

+13 −0
Original line number Diff line number Diff line
@@ -891,6 +891,19 @@ GSList *object_class_get_list(const char *implements_type, 
    return list;

}



static gint object_class_cmp(gconstpointer a, gconstpointer b)

{

    return strcasecmp(object_class_get_name((ObjectClass *)a),

                      object_class_get_name((ObjectClass *)b));

}



GSList *object_class_get_list_sorted(const char *implements_type,

                                     bool include_abstract)

{

    return g_slist_sort(object_class_get_list(implements_type, include_abstract),

                        object_class_cmp);

}



void object_ref(Object *obj)

{

    if (!obj) {

target/alpha/cpu.c

+1 −14
Original line number Diff line number Diff line
@@ -71,18 +71,6 @@ static void alpha_cpu_realizefn(DeviceState *dev, Error **errp) 
    acc->parent_realize(dev, errp);

}



/* Sort alphabetically by type name. */

static gint alpha_cpu_list_compare(gconstpointer a, gconstpointer b)

{

    ObjectClass *class_a = (ObjectClass *)a;

    ObjectClass *class_b = (ObjectClass *)b;

    const char *name_a, *name_b;



    name_a = object_class_get_name(class_a);

    name_b = object_class_get_name(class_b);

    return strcmp(name_a, name_b);

}



static void alpha_cpu_list_entry(gpointer data, gpointer user_data)

{

    ObjectClass *oc = data;
@@ -100,8 +88,7 @@ void alpha_cpu_list(FILE *f, fprintf_function cpu_fprintf) 
    };

    GSList *list;



    list = object_class_get_list(TYPE_ALPHA_CPU, false);

    list = g_slist_sort(list, alpha_cpu_list_compare);

    list = object_class_get_list_sorted(TYPE_ALPHA_CPU, false);

    (*cpu_fprintf)(f, "Available CPUs:\n");

    g_slist_foreach(list, alpha_cpu_list_entry, &s);

    g_slist_free(list);

target/hppa/cpu.c

+1 −14
Original line number Diff line number Diff line
@@ -110,18 +110,6 @@ static void hppa_cpu_realizefn(DeviceState *dev, Error **errp) 
#endif

}



/* Sort hppabetically by type name. */

static gint hppa_cpu_list_compare(gconstpointer a, gconstpointer b)

{

    ObjectClass *class_a = (ObjectClass *)a;

    ObjectClass *class_b = (ObjectClass *)b;

    const char *name_a, *name_b;



    name_a = object_class_get_name(class_a);

    name_b = object_class_get_name(class_b);

    return strcmp(name_a, name_b);

}



static void hppa_cpu_list_entry(gpointer data, gpointer user_data)

{

    ObjectClass *oc = data;
@@ -138,8 +126,7 @@ void hppa_cpu_list(FILE *f, fprintf_function cpu_fprintf) 
    };

    GSList *list;



    list = object_class_get_list(TYPE_HPPA_CPU, false);

    list = g_slist_sort(list, hppa_cpu_list_compare);

    list = object_class_get_list_sorted(TYPE_HPPA_CPU, false);

    (*cpu_fprintf)(f, "Available CPUs:\n");

    g_slist_foreach(list, hppa_cpu_list_entry, &s);

    g_slist_free(list);