From patchwork Thu Aug 23 14:51:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 961449 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41x7Qc1fgsz9s4v for ; Fri, 24 Aug 2018 01:20:40 +1000 (AEST) Received: from localhost ([::1]:37176 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fsrPZ-0000Ez-Re for incoming@patchwork.ozlabs.org; Thu, 23 Aug 2018 11:20:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48015) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fsqxL-0002lA-24 for qemu-devel@nongnu.org; Thu, 23 Aug 2018 10:51:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fsqxI-00070W-A3 for qemu-devel@nongnu.org; Thu, 23 Aug 2018 10:51:26 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:40982 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fsqxG-0006zP-Fy for qemu-devel@nongnu.org; Thu, 23 Aug 2018 10:51:23 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BBBE140216E6 for ; Thu, 23 Aug 2018 14:51:21 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.37.153.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id EA2FDA9E77; Thu, 23 Aug 2018 14:51:20 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Thu, 23 Aug 2018 16:51:17 +0200 Message-Id: <1535035877-219196-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Thu, 23 Aug 2018 14:51:21 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Thu, 23 Aug 2018 14:51:21 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'imammedo@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH] vl.c: make sure maxcpus matches topology to prevent migration failure 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: pbonzini@redhat.com, ehabkost@redhat.com, dgilbert@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Topology (threads*cores*sockets) must match maxcpus to be valid, otherwise we could start QEMU with invalid topology that throws a error on migration destination side, that should not be reachable: Source: -smp 8,maxcpus=64,cores=1,threads=8,sockets=1 // hotplug cpus upto maxcpus Destination: -smp 64,maxcpus=64,cores=1,threads=8,sockets=1 qemu: cpu topology: sockets (1) * cores (1) * threads (8) < smp_cpus (64) Signed-off-by: Igor Mammedov --- vl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vl.c b/vl.c index 16b913f..2b35e0c 100644 --- a/vl.c +++ b/vl.c @@ -1238,10 +1238,10 @@ static void smp_parse(QemuOpts *opts) exit(1); } - if (sockets * cores * threads > max_cpus) { + if (sockets * cores * threads != max_cpus) { error_report("cpu topology: " - "sockets (%u) * cores (%u) * threads (%u) > " - "maxcpus (%u)", + "sockets (%u) * cores (%u) * threads (%u) not equal to" + " maxcpus (%u)", sockets, cores, threads, max_cpus); exit(1); }