[{"id":1764783,"web_url":"http://patchwork.ozlabs.org/comment/1764783/","msgid":"<20170907172222.6307d887.cohuck@redhat.com>","list_archive_url":null,"date":"2017-09-07T15:22:22","subject":"Re: [Qemu-devel] [PATCH v2 15/19] s390x: print CPU definitions in\n\tsorted order","submitter":{"id":71914,"url":"http://patchwork.ozlabs.org/api/people/71914/","name":"Cornelia Huck","email":"cohuck@redhat.com"},"content":"On Mon, 4 Sep 2017 17:43:12 +0200\nDavid Hildenbrand wrote:\n\n> Other architectures provide nicely sorted lists, let's do it similarly on\n> s390x.\n> \n> While at it, clean up the code we have to touch either way.\n> \n> Signed-off-by: David Hildenbrand \n> ---\n> target/s390x/cpu_models.c | 63 ++++++++++++++++++++++++++++++-----------------\n> 1 file changed, 41 insertions(+), 22 deletions(-)\n> \n> diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c\n> index 8e20e7637b..092db34258 100644\n> --- a/target/s390x/cpu_models.c\n> +++ b/target/s390x/cpu_models.c\n> @@ -270,41 +270,60 @@ const S390CPUDef *s390_find_cpu_def(uint16_t type, uint8_t gen, uint8_t ec_ga,\n> return last_compatible;\n> }\n> \n> -struct S390PrintCpuListInfo {\n> - FILE *f;\n> - fprintf_function print;\n> -};\n> -\n> -static void print_cpu_model_list(ObjectClass *klass, void *opaque)\n> +static void s390_print_cpu_model_list_entry(gpointer data, gpointer user_data)\n> {\n> - struct S390PrintCpuListInfo *info = opaque;\n> - S390CPUClass *scc = S390_CPU_CLASS(klass);\n> - char *name = g_strdup(object_class_get_name(klass));\n> - const char *details = \"\";\n> -\n> - if (scc->is_static) {\n> - details = \"(static, migration-safe)\";\n> - } else if (scc->is_migration_safe) {\n> - details = \"(migration-safe)\";\n> - }\n> + CPUListState *s = user_data;\n> + const S390CPUClass *scc = S390_CPU_CLASS((ObjectClass *)data);\n> + char *name = g_strdup(object_class_get_name((ObjectClass *)data));\n> \n> /* strip off the -s390-cpu */\n> g_strrstr(name, \"-\" TYPE_S390_CPU)[0] = 0;\n> - (*info->print)(info->f, \"s390 %-15s %-35s %s\\n\", name, scc->desc,\n> - details);\n> + (*s->cpu_fprintf)(s->file, \"s390 %-15s %-35s (%smigration-safe)\\n\", name,\n> + scc->desc, scc->is_static ? \"static, \" : \"\");\n\nHm, that now prints 's390 host' as 'migration safe'...\n\n> g_free(name);\n> }\n> \n> +static gint s390_cpu_list_compare(gconstpointer a, gconstpointer b)\n> +{\n> + const S390CPUClass *cc_a = S390_CPU_CLASS((ObjectClass *)a);\n> + const S390CPUClass *cc_b = S390_CPU_CLASS((ObjectClass *)b);\n> + const char *name_a = object_class_get_name((ObjectClass *)a);\n> + const char *name_b = object_class_get_name((ObjectClass *)b);\n> +\n> + /* move qemu and host to the top of the list, qemu first, host second */\n> + if (name_a[0] == 'q') {\n> + return -1;\n> + } else if (name_b[0] == 'q') {\n> + return 1;\n> + } else if (name_a[0] == 'h') {\n> + return -1;\n> + } else if (name_b[0] == 'h') {\n> + return 1;\n> + }\n\nAre we sure that there will never be models starting with q or h? But\nwe can worry about that later.\n\n> +\n> + /* keep the same order we have in our table (sorted by release date) */\n> + if (cc_a->cpu_def != cc_b->cpu_def) {\n> + return cc_a->cpu_def - cc_b->cpu_def;\n> + }\n> +\n> + /* exact same definition - list base model first */\n> + return cc_a->is_static ? -1 : 1;\n> +}\n> +\n> void s390_cpu_list(FILE *f, fprintf_function print)\n> {\n> - struct S390PrintCpuListInfo info = {\n> - .f = f,\n> - .print = print,\n> + CPUListState s = {\n> + .file = f,\n> + .cpu_fprintf = print,\n> };\n> S390FeatGroup group;\n> S390Feat feat;\n> + GSList *list;\n> \n> - object_class_foreach(print_cpu_model_list, TYPE_S390_CPU, false, &info);\n> + list = object_class_get_list(TYPE_S390_CPU, false);\n> + list = g_slist_sort(list, s390_cpu_list_compare);\n> + g_slist_foreach(list, s390_print_cpu_model_list_entry, &s);\n> + g_slist_free(list);\n> \n> (*print)(f, \"\\nRecognized feature flags:\\n\");\n> for (feat = 0; feat < S390_FEAT_MAX; feat++) {\n\nSorting looks good.","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx09.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx09.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=cohuck@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xp44D0h4Jz9s8J\n\tfor ;\n\tFri, 8 Sep 2017 01:24:12 +1000 (AEST)","from localhost ([::1]:40906 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dpyf4-0000w3-7y\n\tfor incoming@patchwork.ozlabs.org; Thu, 07 Sep 2017 11:24:10 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:51254)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dpydX-0000FM-Oa\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 11:22:40 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dpydS-0004PR-UH\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 11:22:35 -0400","from mx1.redhat.com ([209.132.183.28]:57132)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dpydS-0004O6-Jv\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 11:22:30 -0400","from smtp.corp.redhat.com\n\t(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id B91A64A6E1;\n\tThu, 7 Sep 2017 15:22:28 +0000 (UTC)","from gondolin (dhcp-192-215.str.redhat.com [10.33.192.215])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 15B6E1881A;\n\tThu, 7 Sep 2017 15:22:24 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com B91A64A6E1","Date":"Thu, 7 Sep 2017 17:22:22 +0200","From":"Cornelia Huck ","To":"David Hildenbrand ","Message-ID":"<20170907172222.6307d887.cohuck@redhat.com>","In-Reply-To":"<20170904154316.4148-16-david@redhat.com>","References":"<20170904154316.4148-1-david@redhat.com>\n\t<20170904154316.4148-16-david@redhat.com>","Organization":"Red Hat GmbH","MIME-Version":"1.0","Content-Type":"text/plain; charset=US-ASCII","Content-Transfer-Encoding":"7bit","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.12","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.38]);\n\tThu, 07 Sep 2017 15:22:28 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"Re: [Qemu-devel] [PATCH v2 15/19] s390x: print CPU definitions in\n\tsorted order","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"thuth@redhat.com, Eduardo Habkost ,\n\tRichard Henderson ,\n\tqemu-devel@nongnu.org, Alexander Graf ,\n\tborntraeger@de.ibm.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}},{"id":1764919,"web_url":"http://patchwork.ozlabs.org/comment/1764919/","msgid":"","list_archive_url":null,"date":"2017-09-07T20:04:09","subject":"Re: [Qemu-devel] [PATCH v2 15/19] s390x: print CPU definitions in\n\tsorted order","submitter":{"id":70402,"url":"http://patchwork.ozlabs.org/api/people/70402/","name":"David Hildenbrand","email":"david@redhat.com"},"content":">> + CPUListState *s = user_data;\n>> + const S390CPUClass *scc = S390_CPU_CLASS((ObjectClass *)data);\n>> + char *name = g_strdup(object_class_get_name((ObjectClass *)data));\n>> \n>> /* strip off the -s390-cpu */\n>> g_strrstr(name, \"-\" TYPE_S390_CPU)[0] = 0;\n>> - (*info->print)(info->f, \"s390 %-15s %-35s %s\\n\", name, scc->desc,\n>> - details);\n>> + (*s->cpu_fprintf)(s->file, \"s390 %-15s %-35s (%smigration-safe)\\n\", name,\n>> + scc->desc, scc->is_static ? \"static, \" : \"\");\n> \n> Hm, that now prints 's390 host' as 'migration safe'...\n\nVery good point, will fix, thanks!\n\n> \n>> g_free(name);\n>> }\n>> \n>> +static gint s390_cpu_list_compare(gconstpointer a, gconstpointer b)\n>> +{\n>> + const S390CPUClass *cc_a = S390_CPU_CLASS((ObjectClass *)a);\n>> + const S390CPUClass *cc_b = S390_CPU_CLASS((ObjectClass *)b);\n>> + const char *name_a = object_class_get_name((ObjectClass *)a);\n>> + const char *name_b = object_class_get_name((ObjectClass *)b);\n>> +\n>> + /* move qemu and host to the top of the list, qemu first, host second */\n>> + if (name_a[0] == 'q') {\n>> + return -1;\n>> + } else if (name_b[0] == 'q') {\n>> + return 1;\n>> + } else if (name_a[0] == 'h') {\n>> + return -1;\n>> + } else if (name_b[0] == 'h') {\n>> + return 1;\n>> + }\n> \n> Are we sure that there will never be models starting with q or h? But\n> we can worry about that later.\n\nCould be but unlikely. In the worst case sorting would be wrong, I think\nwe can live with that :)","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx05.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx05.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=david@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xpBJ35HMbz9s83\n\tfor ;\n\tFri, 8 Sep 2017 06:04:51 +1000 (AEST)","from localhost ([::1]:42067 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dq32f-0001N8-Oo\n\tfor incoming@patchwork.ozlabs.org; Thu, 07 Sep 2017 16:04:49 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:34776)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dq32A-0001Js-Tu\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 16:04:25 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dq326-00032q-AS\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 16:04:18 -0400","from mx1.redhat.com ([209.132.183.28]:39476)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dq326-00031c-4W\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 16:04:14 -0400","from smtp.corp.redhat.com\n\t(int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 30A74155E2;\n\tThu, 7 Sep 2017 20:04:12 +0000 (UTC)","from [10.36.116.60] (ovpn-116-60.ams2.redhat.com [10.36.116.60])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 9EA045D967;\n\tThu, 7 Sep 2017 20:04:10 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 30A74155E2","To":"Cornelia Huck ","References":"<20170904154316.4148-1-david@redhat.com>\n\t<20170904154316.4148-16-david@redhat.com>\n\t<20170907172222.6307d887.cohuck@redhat.com>","From":"David Hildenbrand ","Organization":"Red Hat GmbH","Message-ID":"","Date":"Thu, 7 Sep 2017 22:04:09 +0200","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101\n\tThunderbird/52.3.0","MIME-Version":"1.0","In-Reply-To":"<20170907172222.6307d887.cohuck@redhat.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-US","Content-Transfer-Encoding":"7bit","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.14","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.29]);\n\tThu, 07 Sep 2017 20:04:12 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"Re: [Qemu-devel] [PATCH v2 15/19] s390x: print CPU definitions in\n\tsorted order","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"thuth@redhat.com, Eduardo Habkost ,\n\tRichard Henderson ,\n\tqemu-devel@nongnu.org, Alexander Graf ,\n\tborntraeger@de.ibm.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}}]