[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/10] hw/arm/virt: fix cmdline parsing bug with CPU
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 01/10] hw/arm/virt: fix cmdline parsing bug with CPU options and smp > 1 |
Date: |
Wed, 11 Mar 2015 14:18:41 +0000 |
From: Ard Biesheuvel <address@hidden>
The recently introduced feature that allows 32 bit guests to be
executed under KVM on a 64-bit host incorrectly handles the case
where more than 1 cpu is specified using '-smp N'
For instance, this invocation of qemu
qemu-system-aarch64 -M virt -cpu cortex-a57,aarch64=off -smp 2
produces the following error
qemu-system-aarch64: Expected key=value format, found aarch64
which is caused by the destructive parsing performed by
cpu_common_parse_features(), resulting in subsequent attempts
to parse the CPU option string (for each additional CPU) to fail.
So duplicate the string before parsing it, and free it directly
afterwards.
Signed-off-by: Ard Biesheuvel <address@hidden>
Reviewed-by: Greg Bellows <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>
---
hw/arm/virt.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 93b7605..9072bc2 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -758,6 +758,7 @@ static void machvirt_init(MachineState *machine)
CPUClass *cc = CPU_CLASS(oc);
Object *cpuobj;
Error *err = NULL;
+ char *cpuopts = g_strdup(cpustr[1]);
if (!oc) {
fprintf(stderr, "Unable to find CPU definition\n");
@@ -766,7 +767,8 @@ static void machvirt_init(MachineState *machine)
cpuobj = object_new(object_class_get_name(oc));
/* Handle any CPU options specified by the user */
- cc->parse_features(CPU(cpuobj), cpustr[1], &err);
+ cc->parse_features(CPU(cpuobj), cpuopts, &err);
+ g_free(cpuopts);
if (err) {
error_report("%s", error_get_pretty(err));
exit(1);
--
1.9.1
- [Qemu-devel] [PULL 00/10] target-arm queue, Peter Maydell, 2015/03/11
- [Qemu-devel] [PULL 10/10] bitops.h: sextract64() return type should be int64_t, not uint64_t, Peter Maydell, 2015/03/11
- [Qemu-devel] [PULL 07/10] target-arm: Add missing compatible property to A57, Peter Maydell, 2015/03/11
- [Qemu-devel] [PULL 08/10] integrator/cp: Model CP control registers as sysbus device, Peter Maydell, 2015/03/11
- [Qemu-devel] [PULL 01/10] hw/arm/virt: fix cmdline parsing bug with CPU options and smp > 1,
Peter Maydell <=
- [Qemu-devel] [PULL 09/10] integrator/cp: Implement CARDIN and WPROT signals, Peter Maydell, 2015/03/11
- [Qemu-devel] [PULL 03/10] stm32f2xx_USART: Add the stm32f2xx USART Controller, Peter Maydell, 2015/03/11
- [Qemu-devel] [PULL 05/10] stm32f205: Add the stm32f205 SoC, Peter Maydell, 2015/03/11
- [Qemu-devel] [PULL 02/10] stm32f2xx_timer: Add the stm32f2xx Timer, Peter Maydell, 2015/03/11
- [Qemu-devel] [PULL 04/10] stm32f2xx_SYSCFG: Add the stm32f2xx SYSCFG, Peter Maydell, 2015/03/11
- [Qemu-devel] [PULL 06/10] netduino2: Add the Netduino 2 Machine, Peter Maydell, 2015/03/11
- Re: [Qemu-devel] [PULL 00/10] target-arm queue, Peter Maydell, 2015/03/11