From patchwork Thu Aug 31 15:33:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 9932379 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8ED3760362 for ; Thu, 31 Aug 2017 15:34:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 746A0289C7 for ; Thu, 31 Aug 2017 15:34:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 692E2289E2; Thu, 31 Aug 2017 15:34:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DF862289C7 for ; Thu, 31 Aug 2017 15:33:59 +0000 (UTC) Received: from localhost ([::1]:56330 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnRTi-0002bT-NF for patchwork-qemu-devel@patchwork.kernel.org; Thu, 31 Aug 2017 11:33:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36416) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnRT6-0002bM-Gm for qemu-devel@nongnu.org; Thu, 31 Aug 2017 11:33:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dnRT3-0003le-D4 for qemu-devel@nongnu.org; Thu, 31 Aug 2017 11:33:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26562) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dnRT3-0003l6-3N for qemu-devel@nongnu.org; Thu, 31 Aug 2017 11:33:17 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F28C561477; Thu, 31 Aug 2017 15:33:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com F28C561477 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=david@redhat.com Received: from [10.36.118.11] (unknown [10.36.118.11]) by smtp.corp.redhat.com (Postfix) with ESMTP id 098D85D97E; Thu, 31 Aug 2017 15:33:13 +0000 (UTC) To: Cornelia Huck References: <20170830170601.15855-1-david@redhat.com> <20170830170601.15855-9-david@redhat.com> <20170831164142.607711ec.cohuck@redhat.com> <9beeb7d0-edb8-2227-3182-9275567b2fb5@redhat.com> <20170831170733.7fe86dbc.cohuck@redhat.com> From: David Hildenbrand Organization: Red Hat GmbH Message-ID: Date: Thu, 31 Aug 2017 17:33:13 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <20170831170733.7fe86dbc.cohuck@redhat.com> Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 31 Aug 2017 15:33:16 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-devel] [PATCH v1 08/11] 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: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, Richard Henderson , qemu-devel@nongnu.org, Alexander Graf , borntraeger@de.ibm.com, Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP On 31.08.2017 17:07, Cornelia Huck wrote: > On Thu, 31 Aug 2017 17:03:21 +0200 > David Hildenbrand wrote: > >> On 31.08.2017 16:41, Cornelia Huck wrote: >>> On Wed, 30 Aug 2017 19:05:58 +0200 >>> David Hildenbrand wrote: >>> >>>> Specifying more than 1 CPU (e.g. -smp 5) leads to SIGP errors (the >>>> guest tries to bring these CPUs up but fails), because we don't support >>>> multiple CPUs on s390x under TCG. >>>> >>>> Let's bail out if more than 1 are specified, so we don't raise people's >>>> hope. >>>> >>>> Signed-off-by: David Hildenbrand >>>> --- >>>> hw/s390x/s390-virtio-ccw.c | 6 ++++++ >>>> 1 file changed, 6 insertions(+) >>>> >>>> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c >>>> index 7754e3eaf9..eff96808c4 100644 >>>> --- a/hw/s390x/s390-virtio-ccw.c >>>> +++ b/hw/s390x/s390-virtio-ccw.c >>>> @@ -23,6 +23,7 @@ >>>> #include "hw/s390x/css.h" >>>> #include "virtio-ccw.h" >>>> #include "qemu/config-file.h" >>>> +#include "qemu/error-report.h" >>>> #include "s390-pci-bus.h" >>>> #include "hw/s390x/storage-keys.h" >>>> #include "hw/s390x/storage-attributes.h" >>>> @@ -56,6 +57,11 @@ static void s390_init_cpus(MachineState *machine) >>>> if (machine->cpu_model == NULL) { >>>> machine->cpu_model = s390_default_cpu_model_name(); >>>> } >>>> + if (tcg_enabled() && max_cpus > 1) { >>>> + error_report("Number of SMP CPUs requested (%d) exceeds max CPUs " >>>> + "supported by TCG (1) on s390x", max_cpus); >>> >>> Make this a #define, so we can just flip the switch when smp support is >>> ready? >> >> As an alternative: yield a warning? > > If we know that this can't work, it makes sense to stop immediately, no? Hmm, like that than? #endif diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 18ed0c57e3..dae848fa5f 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -23,6 +23,7 @@ #include "hw/s390x/css.h" #include "virtio-ccw.h" #include "qemu/config-file.h" +#include "qemu/error-report.h" #include "s390-pci-bus.h" #include "hw/s390x/storage-keys.h" #include "hw/s390x/storage-attributes.h" @@ -56,6 +57,12 @@ static void s390_init_cpus(MachineState *machine) if (machine->cpu_model == NULL) { machine->cpu_model = s390_default_cpu_model_name(); } + if (tcg_enabled() && max_cpus > S390_TCG_MAX_CPUS) { + error_report("Number of SMP CPUs requested (%d) exceeds max CPUs " + "supported by TCG (%d) on s390x", max_cpus, + S390_TCG_MAX_CPUS); + exit(1); + } ms->cpus = g_new0(S390CPU *, max_cpus); diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index 7ed9103b33..4e1de2102d 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -210,6 +210,8 @@ static inline S390CPU *s390_env_get_cpu(CPUS390XState *env) #define ENV_OFFSET offsetof(S390CPU, env) +#define S390_TCG_MAX_CPUS 1 + #ifndef CONFIG_USER_ONLY extern const struct VMStateDescription vmstate_s390_cpu;