[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 7/8] vl: exit if maxcpus is negative
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL v2 7/8] vl: exit if maxcpus is negative |
Date: |
Mon, 9 Oct 2017 23:40:00 -0300 |
From: Seeteena Thoufeek <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---Steps to Reproduce---
When passed a negative number to 'maxcpus' parameter, Qemu aborts
with a core dump.
Run the following command with maxcpus argument as negative number
ppc64-softmmu/qemu-system-ppc64 --nographic -vga none -machine
pseries,accel=kvm,kvm-type=HV -m size=200g -device virtio-blk-pci,
drive=rootdisk -drive file=/home/images/pegas-1.0-ppc64le.qcow2,
if=none,cache=none,id=rootdisk,format=qcow2 -monitor telnet
:127.0.0.1:1234,server,nowait -net nic,model=virtio -net
user -redir tcp:2000::22 -device nec-usb-xhci -smp 8,cores=1,
threads=1,maxcpus=-12
(process:12149): GLib-ERROR **: gmem.c:130: failed to allocate
18446744073709550568 bytes
Trace/breakpoint trap
Reported-by: R.Nageswara Sastry <address@hidden>
Signed-off-by: Seeteena Thoufeek <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
include/sysemu/sysemu.h | 2 +-
vl.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index b21369672a..c083869fcf 100644
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -113,7 +113,7 @@ extern int win2k_install_hack;
extern int alt_grab;
extern int ctrl_grab;
extern int smp_cpus;
-extern int max_cpus;
+extern unsigned int max_cpus;
extern int cursor_hide;
extern int graphic_rotate;
extern int no_quit;
diff --git a/vl.c b/vl.c
index ebea42e0ea..d7c349233f 100644
--- a/vl.c
+++ b/vl.c
@@ -161,7 +161,7 @@ Chardev *sclp_hds[MAX_SCLP_CONSOLES];
int win2k_install_hack = 0;
int singlestep = 0;
int smp_cpus = 1;
-int max_cpus = 1;
+unsigned int max_cpus = 1;
int smp_cores = 1;
int smp_threads = 1;
int acpi_enabled = 1;
@@ -4331,8 +4331,8 @@ int main(int argc, char **argv, char **envp)
machine_class->max_cpus = machine_class->max_cpus ?: 1; /* Default to UP */
if (max_cpus > machine_class->max_cpus) {
- error_report("Number of SMP CPUs requested (%d) exceeds max CPUs "
- "supported by machine '%s' (%d)", max_cpus,
+ error_report("Invalid SMP CPUs %d. The max CPUs "
+ "supported by machine '%s' is %d", max_cpus,
machine_class->name, machine_class->max_cpus);
exit(1);
}
--
2.13.6
- [Qemu-devel] [PULL v2 0/8] x86 and machine queue, 2017-10-09, Eduardo Habkost, 2017/10/09
- [Qemu-devel] [PULL v2 1/8] qom/cpu: move cpu_model null check to cpu_class_by_name(), Eduardo Habkost, 2017/10/09
- [Qemu-devel] [PULL v2 2/8] machine: Add a valid_cpu_types property, Eduardo Habkost, 2017/10/09
- [Qemu-devel] [PULL v2 3/8] vl: Eliminate defconfig variable, Eduardo Habkost, 2017/10/09
- [Qemu-devel] [PULL v2 4/8] qemu-options: Deprecate -nodefconfig, Eduardo Habkost, 2017/10/09
- [Qemu-devel] [PULL v2 6/8] qom: update doc comment for type_register[_static](), Eduardo Habkost, 2017/10/09
- [Qemu-devel] [PULL v2 5/8] config: qemu_config_parse() return number of config groups, Eduardo Habkost, 2017/10/09
- [Qemu-devel] [PULL v2 7/8] vl: exit if maxcpus is negative,
Eduardo Habkost <=
- [Qemu-devel] [PULL v2 8/8] x86: Correct translation of some rdgsbase and wrgsbase encodings, Eduardo Habkost, 2017/10/09
- Re: [Qemu-devel] [PULL v2 0/8] x86 and machine queue, 2017-10-09, Peter Maydell, 2017/10/10