{"id":807777,"url":"http://patchwork.ozlabs.org/api/patches/807777/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830165252.13421-29-cohuck@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170830165252.13421-29-cohuck@redhat.com>","list_archive_url":null,"date":"2017-08-30T16:52:36","name":"[PULL,28/44] s390x/cpumodel: factor out determination of default model name","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"cc203cb0a300d7727bcbcf2b9a56f7accbf3ea44","submitter":{"id":71914,"url":"http://patchwork.ozlabs.org/api/people/71914/?format=json","name":"Cornelia Huck","email":"cohuck@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830165252.13421-29-cohuck@redhat.com/mbox/","series":[{"id":656,"url":"http://patchwork.ozlabs.org/api/series/656/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=656","date":"2017-08-30T16:52:08","name":"[PULL,01/44] s390x/css: use macro for event-information pending error recover code","version":1,"mbox":"http://patchwork.ozlabs.org/series/656/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/807777/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807777/checks/","tags":{},"related":[],"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-mx07.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx07.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 3xjC7j0rVgz9sN5\n\tfor ;\n\tThu, 31 Aug 2017 03:25:15 +1000 (AEST)","from localhost ([::1]:51759 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dn6jo-0004vx-Sj\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 13:25:12 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:57431)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dn6Gd-000321-17\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:55:04 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dn6Gc-0005f5-6Y\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:55:03 -0400","from mx1.redhat.com ([209.132.183.28]:46786)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dn6Gc-0005ek-0Z\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:55:02 -0400","from smtp.corp.redhat.com\n\t(int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13])\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 DD690C04B938;\n\tWed, 30 Aug 2017 16:55:00 +0000 (UTC)","from localhost (ovpn-116-210.ams2.redhat.com [10.36.116.210])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id 849AD60BF2;\n\tWed, 30 Aug 2017 16:54:58 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com DD690C04B938","From":"Cornelia Huck ","To":"peter.maydell@linaro.org","Date":"Wed, 30 Aug 2017 18:52:36 +0200","Message-Id":"<20170830165252.13421-29-cohuck@redhat.com>","In-Reply-To":"<20170830165252.13421-1-cohuck@redhat.com>","References":"<20170830165252.13421-1-cohuck@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.13","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.31]);\n\tWed, 30 Aug 2017 16:55:01 +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":"[Qemu-devel] [PULL 28/44] s390x/cpumodel: factor out determination\n\tof default model name","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, david@redhat.com, Cornelia Huck ,\n\tagraf@suse.de, qemu-devel@nongnu.org, borntraeger@de.ibm.com,\n\trth@twiddle.net","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: David Hildenbrand \n\nNow we can drop inclusion of \"sysemu/kvm.h\" from \"s390-virtio.c\".\n\nSigned-off-by: David Hildenbrand \nMessage-Id: <20170818114353.13455-7-david@redhat.com>\nReviewed-by: Thomas Huth \nSigned-off-by: Cornelia Huck \n---\n hw/s390x/s390-virtio.c | 7 +------\n target/s390x/cpu.h | 1 +\n target/s390x/cpu_models.c | 8 ++++++++\n 3 files changed, 10 insertions(+), 6 deletions(-)","diff":"diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c\nindex afa4148e6b..da3f49e80e 100644\n--- a/hw/s390x/s390-virtio.c\n+++ b/hw/s390x/s390-virtio.c\n@@ -33,7 +33,6 @@\n #include \"hw/boards.h\"\n #include \"hw/loader.h\"\n #include \"hw/virtio/virtio.h\"\n-#include \"sysemu/kvm.h\"\n #include \"exec/address-spaces.h\"\n #include \"sysemu/qtest.h\"\n \n@@ -93,11 +92,7 @@ void s390_init_cpus(MachineState *machine)\n gchar *name;\n \n if (machine->cpu_model == NULL) {\n- if (kvm_enabled()) {\n- machine->cpu_model = \"host\";\n- } else {\n- machine->cpu_model = \"qemu\";\n- }\n+ machine->cpu_model = s390_default_cpu_model_name();\n }\n \n cpu_states = g_new0(S390CPU *, max_cpus);\ndiff --git a/target/s390x/cpu.h b/target/s390x/cpu.h\nindex 798e299db1..3ce7ffc126 100644\n--- a/target/s390x/cpu.h\n+++ b/target/s390x/cpu.h\n@@ -647,6 +647,7 @@ void s390_cpu_model_register_props(Object *obj);\n void s390_cpu_model_class_register_props(ObjectClass *oc);\n void s390_realize_cpu_model(CPUState *cs, Error **errp);\n ObjectClass *s390_cpu_class_by_name(const char *name);\n+const char *s390_default_cpu_model_name(void);\n \n #define EXCP_EXT 1 /* external interrupt */\n #define EXCP_SVC 2 /* supervisor call (syscall) */\ndiff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c\nindex fa1338fc72..915f067991 100644\n--- a/target/s390x/cpu_models.c\n+++ b/target/s390x/cpu_models.c\n@@ -1200,6 +1200,14 @@ ObjectClass *s390_cpu_class_by_name(const char *name)\n return oc;\n }\n \n+const char *s390_default_cpu_model_name(void)\n+{\n+ if (kvm_enabled()) {\n+ return \"host\";\n+ }\n+ return \"qemu\";\n+}\n+\n static const TypeInfo qemu_s390_cpu_type_info = {\n .name = S390_CPU_TYPE_NAME(\"qemu\"),\n .parent = TYPE_S390_CPU,\n","prefixes":["PULL","28/44"]}