{"id":809739,"url":"http://patchwork.ozlabs.org/api/1.0/patches/809739/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/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":""},"msgid":"<20170904154316.4148-12-david@redhat.com>","date":"2017-09-04T15:43:08","name":"[v2,11/19] s390x: allow only 1 CPU with TCG","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"c01def760dfff7571354300857139544c9aedc4d","submitter":{"id":70402,"url":"http://patchwork.ozlabs.org/api/1.0/people/70402/?format=json","name":"David Hildenbrand","email":"david@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170904154316.4148-12-david@redhat.com/mbox/","series":[{"id":1412,"url":"http://patchwork.ozlabs.org/api/1.0/series/1412/?format=json","date":"2017-09-04T15:42:57","name":"s390x cleanups and CPU hotplug via device_add","version":2,"mbox":"http://patchwork.ozlabs.org/series/1412/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809739/checks/","tags":{},"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-mx06.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx06.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 3xmDn40VhNz9t2Z\n\tfor ;\n\tTue, 5 Sep 2017 01:49:44 +1000 (AEST)","from localhost ([::1]:54520 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dotd8-0000VU-3t\n\tfor incoming@patchwork.ozlabs.org; Mon, 04 Sep 2017 11:49:42 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:37725)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dotXW-0004c6-UJ\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 11:43:59 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dotXS-00015g-CP\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 11:43:55 -0400","from mx1.redhat.com ([209.132.183.28]:53086)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dotXS-00015P-6a\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 11:43:50 -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 38D54771;\n\tMon, 4 Sep 2017 15:43:49 +0000 (UTC)","from t460s.redhat.com (ovpn-116-139.ams2.redhat.com\n\t[10.36.116.139])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 4B6C811CC33;\n\tMon, 4 Sep 2017 15:43:47 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 38D54771","From":"David Hildenbrand ","To":"qemu-devel@nongnu.org","Date":"Mon, 4 Sep 2017 17:43:08 +0200","Message-Id":"<20170904154316.4148-12-david@redhat.com>","In-Reply-To":"<20170904154316.4148-1-david@redhat.com>","References":"<20170904154316.4148-1-david@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.30]);\n\tMon, 04 Sep 2017 15:43:49 +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] [PATCH v2 11/19] s390x: allow only 1 CPU with TCG","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 , david@redhat.com,\n\tcohuck@redhat.com, Richard Henderson , \n\tAlexander Graf , borntraeger@de.ibm.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Specifying more than 1 CPU (e.g. -smp 5) leads to SIGP errors (the\nguest tries to bring these CPUs up but fails), because we don't support\nmultiple CPUs on s390x under TCG.\n\nLet's bail out if more than 1 is specified, so we don't raise people's\nhope. Make it a define, so we can easily bump it up later.\n\nSigned-off-by: David Hildenbrand \n---\n hw/s390x/s390-virtio-ccw.c | 7 +++++++\n target/s390x/cpu.h | 2 ++\n 2 files changed, 9 insertions(+)","diff":"diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c\nindex f67b4b5d58..f7ca20d77a 100644\n--- a/hw/s390x/s390-virtio-ccw.c\n+++ b/hw/s390x/s390-virtio-ccw.c\n@@ -23,6 +23,7 @@\n #include \"hw/s390x/css.h\"\n #include \"virtio-ccw.h\"\n #include \"qemu/config-file.h\"\n+#include \"qemu/error-report.h\"\n #include \"s390-pci-bus.h\"\n #include \"hw/s390x/storage-keys.h\"\n #include \"hw/s390x/storage-attributes.h\"\n@@ -55,6 +56,12 @@ static void s390_init_cpus(MachineState *machine)\n if (machine->cpu_model == NULL) {\n machine->cpu_model = s390_default_cpu_model_name();\n }\n+ if (tcg_enabled() && max_cpus > S390_TCG_MAX_CPUS) {\n+ error_report(\"Number of SMP CPUs requested (%d) exceeds max CPUs \"\n+ \"supported by TCG (%d) on s390x\", max_cpus,\n+ S390_TCG_MAX_CPUS);\n+ exit(1);\n+ }\n \n cpu_states = g_new0(S390CPU *, max_cpus);\n \ndiff --git a/target/s390x/cpu.h b/target/s390x/cpu.h\nindex 147aceba28..dca6aa9aae 100644\n--- a/target/s390x/cpu.h\n+++ b/target/s390x/cpu.h\n@@ -209,6 +209,8 @@ static inline S390CPU *s390_env_get_cpu(CPUS390XState *env)\n \n #define ENV_OFFSET offsetof(S390CPU, env)\n \n+#define S390_TCG_MAX_CPUS 1\n+\n #ifndef CONFIG_USER_ONLY\n extern const struct VMStateDescription vmstate_s390_cpu;\n #endif\n","prefixes":["v2","11/19"]}