From nobody Sun Feb 8 20:34:14 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1557132229; cv=none; d=zoho.com; s=zohoarc; b=G68/Z5ucIzPE6xlYmKVkbU1Vmj6SU/T1jiMdKw2WtVsXyQKQBNhbZd6V8lMOyQjQUaW90GP/zwRYPMRV3iWg4C+JJpduT44ik8wIFbYrd/ZDmSzJrcxBp3ehsXQncQF2vj+7UG3zYKYxXegGKoE1MbozB4mKcbyVjKQHN0wN+6A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557132229; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=B6oA126ks5h2iqAkopNraxo2XqwJZc+ZnvN2ZXjaBUs=; b=X0CnA5VbUIioY6IuPQVXPNG9/4sJk1bvtxwOoSoFB1LTMnAp6pE+kOYPPyKPC9qewRU8MaRnPfXIL84lp+gGahUqyMEj1GitUAJjStvX/bWVb2xNTcYH//NT03PMIqf2PrJVCK4Q2URTCbzamedD4ukE/+K6uIHAZMGROqGQM1c= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1557132229673727.0129229931634; Mon, 6 May 2019 01:43:49 -0700 (PDT) Received: from localhost ([127.0.0.1]:52760 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNZDu-00028j-J9 for importer@patchew.org; Mon, 06 May 2019 04:43:46 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52756) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNZ5X-0002xW-5e for qemu-devel@nongnu.org; Mon, 06 May 2019 04:35:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hNZ5V-0007QI-8y for qemu-devel@nongnu.org; Mon, 06 May 2019 04:35:07 -0400 Received: from mga14.intel.com ([192.55.52.115]:60079) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hNZ5T-0007KN-I4 for qemu-devel@nongnu.org; Mon, 06 May 2019 04:35:04 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 May 2019 01:35:02 -0700 Received: from xulike-server.sh.intel.com ([10.239.48.134]) by FMSMGA003.fm.intel.com with ESMTP; 06 May 2019 01:35:00 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,437,1549958400"; d="scan'208";a="155407138" From: Like Xu To: qemu-devel@nongnu.org Date: Mon, 6 May 2019 16:33:16 +0800 Message-Id: <1557131596-25403-11-git-send-email-like.xu@linux.intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1557131596-25403-1-git-send-email-like.xu@linux.intel.com> References: <1557131596-25403-1-git-send-email-like.xu@linux.intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 Subject: [Qemu-devel] [PATCH v2 10/10] cpu/topology: replace smp global variables with smp machine properties 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: Peter Maydell , Eduardo Habkost , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Dr. David Alan Gilbert" , Paolo Bonzini , Alistair Francis , Igor Mammedov , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" At the end of this smp refactoring series, the global ones are removed and only smp machine properties are fully applied and enabled. Signed-off-by: Like Xu Reviewed-by: Alistair Francis --- vl.c | 53 ++++++++++++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/vl.c b/vl.c index 34f05b2..a3e426c 100644 --- a/vl.c +++ b/vl.c @@ -162,10 +162,6 @@ static Chardev **serial_hds; Chardev *parallel_hds[MAX_PARALLEL_PORTS]; int win2k_install_hack =3D 0; int singlestep =3D 0; -int smp_cpus; -unsigned int max_cpus; -int smp_cores =3D 1; -int smp_threads =3D 1; int acpi_enabled =3D 1; int no_hpet =3D 0; int fd_bootchk =3D 1; @@ -1282,8 +1278,9 @@ static void smp_parse(QemuOpts *opts) sockets =3D sockets > 0 ? sockets : 1; cpus =3D cores * threads * sockets; } else { - max_cpus =3D qemu_opt_get_number(opts, "maxcpus", cpus); - sockets =3D max_cpus / (cores * threads); + current_machine->smp.max_cpus =3D + qemu_opt_get_number(opts, "maxcpus", cpus); + sockets =3D current_machine->smp.max_cpus / (cores * threa= ds); } } else if (cores =3D=3D 0) { threads =3D threads > 0 ? threads : 1; @@ -1300,34 +1297,37 @@ static void smp_parse(QemuOpts *opts) exit(1); } =20 - max_cpus =3D qemu_opt_get_number(opts, "maxcpus", cpus); + current_machine->smp.max_cpus =3D + qemu_opt_get_number(opts, "maxcpus", cpus); =20 - if (max_cpus < cpus) { + if (current_machine->smp.max_cpus < cpus) { error_report("maxcpus must be equal to or greater than smp"); exit(1); } =20 - if (sockets * cores * threads > max_cpus) { + if (sockets * cores * threads > current_machine->smp.max_cpus) { error_report("cpu topology: " "sockets (%u) * cores (%u) * threads (%u) > " "maxcpus (%u)", - sockets, cores, threads, max_cpus); + sockets, cores, threads, + current_machine->smp.max_cpus); exit(1); } =20 - if (sockets * cores * threads !=3D max_cpus) { + if (sockets * cores * threads !=3D current_machine->smp.max_cpus) { warn_report("Invalid CPU topology deprecated: " "sockets (%u) * cores (%u) * threads (%u) " "!=3D maxcpus (%u)", - sockets, cores, threads, max_cpus); + sockets, cores, threads, + current_machine->smp.max_cpus); } =20 - smp_cpus =3D cpus; - smp_cores =3D cores; - smp_threads =3D threads; + current_machine->smp.cpus =3D cpus; + current_machine->smp.cores =3D cores; + current_machine->smp.threads =3D threads; } =20 - if (smp_cpus > 1) { + if (current_machine->smp.cpus > 1) { Error *blocker =3D NULL; error_setg(&blocker, QERR_REPLAY_NOT_SUPPORTED, "smp"); replay_add_blocker(blocker); @@ -4094,26 +4094,25 @@ int main(int argc, char **argv, char **envp) machine_class->default_cpus =3D machine_class->default_cpus ?: 1; =20 /* default to machine_class->default_cpus */ - smp_cpus =3D machine_class->default_cpus; - max_cpus =3D machine_class->default_cpus; + current_machine->smp.cpus =3D machine_class->default_cpus; + current_machine->smp.max_cpus =3D machine_class->default_cpus; + current_machine->smp.cores =3D 1; + current_machine->smp.threads =3D 1; =20 smp_parse(qemu_opts_find(qemu_find_opts("smp-opts"), NULL)); =20 - current_machine->smp.cpus =3D smp_cpus; - current_machine->smp.max_cpus =3D max_cpus; - current_machine->smp.cores =3D smp_cores; - current_machine->smp.threads =3D smp_threads; - /* sanity-check smp_cpus and max_cpus against machine_class */ - if (smp_cpus < machine_class->min_cpus) { + if (current_machine->smp.cpus < machine_class->min_cpus) { error_report("Invalid SMP CPUs %d. The min CPUs " - "supported by machine '%s' is %d", smp_cpus, + "supported by machine '%s' is %d", + current_machine->smp.cpus, machine_class->name, machine_class->min_cpus); exit(1); } - if (max_cpus > machine_class->max_cpus) { + if (current_machine->smp.max_cpus > machine_class->max_cpus) { error_report("Invalid SMP CPUs %d. The max CPUs " - "supported by machine '%s' is %d", max_cpus, + "supported by machine '%s' is %d", + current_machine->smp.max_cpus, machine_class->name, machine_class->max_cpus); exit(1); } --=20 1.8.3.1