From a009d0254cdfd6deb532ef654a3f2811cb8b9c15 Mon Sep 17 00:00:00 2001 From: David Hildenbrand Date: Fri, 10 Nov 2017 14:49:03 +0100 Subject: [PATCH 6/7] s390x: print CPU definitions in sorted order RH-Author: David Hildenbrand Message-id: <20171110144904.7026-2-david@redhat.com> Patchwork-id: 77647 O-Subject: [RHEL-7.5 qemu-kvm-ma PATCH v3 1/2] s390x: print CPU definitions in sorted order Bugzilla: 1504138 RH-Acked-by: Thomas Huth RH-Acked-by: Cornelia Huck RH-Acked-by: Eduardo Habkost Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1504138 Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=14527097 Upstream-status: 99aa6bf29b87052d9603c5bf5c23d0db960f30ce Other architectures provide nicely sorted lists, let's do it similarly on s390x. While at it, clean up the code we have to touch either way. Acked-by: Christian Borntraeger Signed-off-by: David Hildenbrand Message-Id: <20170913132417.24384-16-david@redhat.com> Signed-off-by: Cornelia Huck (cherry picked from commit 99aa6bf29b87052d9603c5bf5c23d0db960f30ce) Signed-off-by: David Hildenbrand Signed-off-by: Miroslav Rezanina --- target/s390x/cpu_models.c | 56 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 41 insertions(+), 15 deletions(-) diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c index fa1338f..e055852 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -267,16 +267,11 @@ const S390CPUDef *s390_find_cpu_def(uint16_t type, uint8_t gen, uint8_t ec_ga, return last_compatible; } -struct S390PrintCpuListInfo { - FILE *f; - fprintf_function print; -}; - -static void print_cpu_model_list(ObjectClass *klass, void *opaque) +static void s390_print_cpu_model_list_entry(gpointer data, gpointer user_data) { - struct S390PrintCpuListInfo *info = opaque; - S390CPUClass *scc = S390_CPU_CLASS(klass); - char *name = g_strdup(object_class_get_name(klass)); + CPUListState *s = user_data; + const S390CPUClass *scc = S390_CPU_CLASS((ObjectClass *)data); + char *name = g_strdup(object_class_get_name((ObjectClass *)data)); const char *details = ""; if (scc->is_static) { @@ -287,21 +282,52 @@ static void print_cpu_model_list(ObjectClass *klass, void *opaque) /* strip off the -s390-cpu */ g_strrstr(name, "-" TYPE_S390_CPU)[0] = 0; - (*info->print)(info->f, "s390 %-15s %-35s %s\n", name, scc->desc, - details); + (*s->cpu_fprintf)(s->file, "s390 %-15s %-35s %s\n", name, scc->desc, + details); g_free(name); } +static gint s390_cpu_list_compare(gconstpointer a, gconstpointer b) +{ + const S390CPUClass *cc_a = S390_CPU_CLASS((ObjectClass *)a); + const S390CPUClass *cc_b = S390_CPU_CLASS((ObjectClass *)b); + const char *name_a = object_class_get_name((ObjectClass *)a); + const char *name_b = object_class_get_name((ObjectClass *)b); + + /* move qemu and host to the top of the list, qemu first, host second */ + if (name_a[0] == 'q') { + return -1; + } else if (name_b[0] == 'q') { + return 1; + } else if (name_a[0] == 'h') { + return -1; + } else if (name_b[0] == 'h') { + return 1; + } + + /* keep the same order we have in our table (sorted by release date) */ + if (cc_a->cpu_def != cc_b->cpu_def) { + return cc_a->cpu_def - cc_b->cpu_def; + } + + /* exact same definition - list base model first */ + return cc_a->is_static ? -1 : 1; +} + void s390_cpu_list(FILE *f, fprintf_function print) { - struct S390PrintCpuListInfo info = { - .f = f, - .print = print, + CPUListState s = { + .file = f, + .cpu_fprintf = print, }; S390FeatGroup group; S390Feat feat; + GSList *list; - object_class_foreach(print_cpu_model_list, TYPE_S390_CPU, false, &info); + list = object_class_get_list(TYPE_S390_CPU, false); + list = g_slist_sort(list, s390_cpu_list_compare); + g_slist_foreach(list, s390_print_cpu_model_list_entry, &s); + g_slist_free(list); (*print)(f, "\nRecognized feature flags:\n"); for (feat = 0; feat < S390_FEAT_MAX; feat++) { -- 1.8.3.1