From nobody Mon Apr 14 11:14:57 2025
Delivered-To: importer@patchew.org
Received-SPF: temperror (zoho.com: Error in retrieving data from DNS)
client-ip=208.118.235.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Authentication-Results: mx.zohomail.com;
spf=temperror (zoho.com: Error in retrieving data from DNS)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by
mx.zohomail.com
with SMTPS id 1510582393502632.5688972912807;
Mon, 13 Nov 2017 06:13:13 -0800 (PST)
Received: from localhost ([::1]:54610 helo=lists.gnu.org)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1eEFU3-0005tE-9n
for importer@patchew.org; Mon, 13 Nov 2017 09:13:07 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:47252)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <pm215@archaic.org.uk>) id 1eEFSD-00043d-Vb
for qemu-devel@nongnu.org; Mon, 13 Nov 2017 09:11:20 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <pm215@archaic.org.uk>) id 1eEFSC-0007e2-3y
for qemu-devel@nongnu.org; Mon, 13 Nov 2017 09:11:13 -0500
Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:38322)
by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
(Exim 4.71) (envelope-from <pm215@archaic.org.uk>)
id 1eEFSB-0007Yd-RM
for qemu-devel@nongnu.org; Mon, 13 Nov 2017 09:11:12 -0500
Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89)
(envelope-from <pm215@archaic.org.uk>) id 1eEFS8-00025A-EQ
for qemu-devel@nongnu.org; Mon, 13 Nov 2017 14:11:08 +0000
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Date: Mon, 13 Nov 2017 14:11:43 +0000
Message-Id: <1510582304-27058-9-git-send-email-peter.maydell@linaro.org>
X-Mailer: git-send-email 2.7.4
In-Reply-To: <1510582304-27058-1-git-send-email-peter.maydell@linaro.org>
References: <1510582304-27058-1-git-send-email-peter.maydell@linaro.org>
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
recognized.
X-Received-From: 2001:8b0:1d0::2
Subject: [Qemu-devel] [PULL 8/9] hw: add .min_cpus and .default_cpus fields
to machine_class
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail: RSF_6 Z_629925259 SPT_0
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
From: "Emilio G. Cota" <cota@braap.org>
max_cpus needs to be an upper bound on the number of vCPUs
initialized; otherwise TCG region initialization breaks.
Some boards initialize a hard-coded number of vCPUs, which is not
captured by the global max_cpus and therefore breaks TCG initialization.
Fix it by adding the .min_cpus field to machine_class.
This commit also changes some user-facing behaviour: we now die if
-smp is below this hard-coded vCPU minimum instead of silently
ignoring the passed -smp value (sometimes announcing this by printing
a warning). However, the introduction of .default_cpus lessens the
likelihood that users will notice this: if -smp isn't set, we now
assign the value in .default_cpus to both smp_cpus and max_cpus. IOW,
if a user does not set -smp, they always get a correct number of vCPUs.
This change fixes 3468b59 ("tcg: enable multiple TCG contexts in
softmmu", 2017-10-24), which broke TCG initialization for some
ARM boards.
Fixes: 3468b59e18b179bc63c7ce934de912dfa9596122
Reported-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>
Signed-off-by: Emilio G. Cota <cota@braap.org>
Message-id: 1510343626-25861-6-git-send-email-cota@braap.org
Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Emilio G. Cota <cota@braap.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
include/hw/boards.h | 5 +++++
hw/arm/exynos4_boards.c | 12 ++++--------
hw/arm/raspi.c | 2 ++
hw/arm/xlnx-zcu102.c | 2 ++
vl.c | 21 ++++++++++++++++++---
5 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/include/hw/boards.h b/include/hw/boards.h
index 191a5b3..62f160e 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -102,6 +102,9 @@ typedef struct {
=20
/**
* MachineClass:
+ * @max_cpus: maximum number of CPUs supported. Default: 1
+ * @min_cpus: minimum number of CPUs supported. Default: 1
+ * @default_cpus: number of CPUs instantiated if none are specified. Defau=
lt: 1
* @get_hotplug_handler: this function is called during bus-less
* device hotplug. If defined it returns pointer to an instance
* of HotplugHandler object, which handles hotplug operation
@@ -167,6 +170,8 @@ struct MachineClass {
BlockInterfaceType block_default_type;
int units_per_default_bus;
int max_cpus;
+ int min_cpus;
+ int default_cpus;
unsigned int no_serial:1,
no_parallel:1,
use_virtcon:1,
diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c
index f1441ec..750162c 100644
--- a/hw/arm/exynos4_boards.c
+++ b/hw/arm/exynos4_boards.c
@@ -27,7 +27,6 @@
#include "qemu-common.h"
#include "cpu.h"
#include "sysemu/sysemu.h"
-#include "sysemu/qtest.h"
#include "hw/sysbus.h"
#include "net/net.h"
#include "hw/arm/arm.h"
@@ -129,13 +128,6 @@ exynos4_boards_init_common(MachineState *machine,
Exynos4BoardType board_type)
{
Exynos4BoardState *s =3D g_new(Exynos4BoardState, 1);
- MachineClass *mc =3D MACHINE_GET_CLASS(machine);
-
- if (smp_cpus !=3D EXYNOS4210_NCPUS && !qtest_enabled()) {
- error_report("%s board supports only %d CPU cores, ignoring smp_cp=
us"
- " value",
- mc->name, EXYNOS4210_NCPUS);
- }
=20
exynos4_board_binfo.ram_size =3D exynos4_board_ram_size[board_type];
exynos4_board_binfo.board_id =3D exynos4_board_id[board_type];
@@ -189,6 +181,8 @@ static void nuri_class_init(ObjectClass *oc, void *data)
mc->desc =3D "Samsung NURI board (Exynos4210)";
mc->init =3D nuri_init;
mc->max_cpus =3D EXYNOS4210_NCPUS;
+ mc->min_cpus =3D EXYNOS4210_NCPUS;
+ mc->default_cpus =3D EXYNOS4210_NCPUS;
mc->ignore_memory_transaction_failures =3D true;
}
=20
@@ -205,6 +199,8 @@ static void smdkc210_class_init(ObjectClass *oc, void *=
data)
mc->desc =3D "Samsung SMDKC210 board (Exynos4210)";
mc->init =3D smdkc210_init;
mc->max_cpus =3D EXYNOS4210_NCPUS;
+ mc->min_cpus =3D EXYNOS4210_NCPUS;
+ mc->default_cpus =3D EXYNOS4210_NCPUS;
mc->ignore_memory_transaction_failures =3D true;
}
=20
diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c
index 5941c9f..cd5fa8c 100644
--- a/hw/arm/raspi.c
+++ b/hw/arm/raspi.c
@@ -167,6 +167,8 @@ static void raspi2_machine_init(MachineClass *mc)
mc->no_floppy =3D 1;
mc->no_cdrom =3D 1;
mc->max_cpus =3D BCM2836_NCPUS;
+ mc->min_cpus =3D BCM2836_NCPUS;
+ mc->default_cpus =3D BCM2836_NCPUS;
mc->default_ram_size =3D 1024 * 1024 * 1024;
mc->ignore_memory_transaction_failures =3D true;
};
diff --git a/hw/arm/xlnx-zcu102.c b/hw/arm/xlnx-zcu102.c
index 190eb69..9631a53 100644
--- a/hw/arm/xlnx-zcu102.c
+++ b/hw/arm/xlnx-zcu102.c
@@ -189,6 +189,7 @@ static void xlnx_ep108_machine_class_init(ObjectClass *=
oc, void *data)
mc->units_per_default_bus =3D 1;
mc->ignore_memory_transaction_failures =3D true;
mc->max_cpus =3D XLNX_ZYNQMP_NUM_APU_CPUS + XLNX_ZYNQMP_NUM_RPU_CPUS;
+ mc->default_cpus =3D XLNX_ZYNQMP_NUM_APU_CPUS;
}
=20
static const TypeInfo xlnx_ep108_machine_init_typeinfo =3D {
@@ -246,6 +247,7 @@ static void xlnx_zcu102_machine_class_init(ObjectClass =
*oc, void *data)
mc->units_per_default_bus =3D 1;
mc->ignore_memory_transaction_failures =3D true;
mc->max_cpus =3D XLNX_ZYNQMP_NUM_APU_CPUS + XLNX_ZYNQMP_NUM_RPU_CPUS;
+ mc->default_cpus =3D XLNX_ZYNQMP_NUM_APU_CPUS;
}
=20
static const TypeInfo xlnx_zcu102_machine_init_typeinfo =3D {
diff --git a/vl.c b/vl.c
index ec29909..7372424 100644
--- a/vl.c
+++ b/vl.c
@@ -160,8 +160,8 @@ Chardev *virtcon_hds[MAX_VIRTIO_CONSOLES];
Chardev *sclp_hds[MAX_SCLP_CONSOLES];
int win2k_install_hack =3D 0;
int singlestep =3D 0;
-int smp_cpus =3D 1;
-unsigned int max_cpus =3D 1;
+int smp_cpus;
+unsigned int max_cpus;
int smp_cores =3D 1;
int smp_threads =3D 1;
int acpi_enabled =3D 1;
@@ -4327,9 +4327,24 @@ int main(int argc, char **argv, char **envp)
exit(0);
}
=20
+ /* machine_class: default to UP */
+ machine_class->max_cpus =3D machine_class->max_cpus ?: 1;
+ machine_class->min_cpus =3D machine_class->min_cpus ?: 1;
+ machine_class->default_cpus =3D machine_class->default_cpus ?: 1;
+
+ /* default to machine_class->default_cpus */
+ smp_cpus =3D machine_class->default_cpus;
+ max_cpus =3D machine_class->default_cpus;
+
smp_parse(qemu_opts_find(qemu_find_opts("smp-opts"), NULL));
=20
- machine_class->max_cpus =3D machine_class->max_cpus ?: 1; /* Default t=
o UP */
+ /* sanity-check smp_cpus and max_cpus against machine_class */
+ if (smp_cpus < machine_class->min_cpus) {
+ error_report("Invalid SMP CPUs %d. The min CPUs "
+ "supported by machine '%s' is %d", smp_cpus,
+ machine_class->name, machine_class->min_cpus);
+ exit(1);
+ }
if (max_cpus > machine_class->max_cpus) {
error_report("Invalid SMP CPUs %d. The max CPUs "
"supported by machine '%s' is %d", max_cpus,
--=20
2.7.4