From 1ea06c398cda2600974860ec7020cbbe9682e382 Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Wed, 4 Oct 2017 00:00:24 -0300 Subject: vl: Eliminate defconfig variable Both -nodefconfig and -no-user-config options do the same thing today, we only need one variable to keep track of them. Suggested-by: Markus Armbruster Acked-by: Alistair Francis Reviewed-by: Markus Armbruster Signed-off-by: Eduardo Habkost Message-Id: <20171004030025.7866-2-ehabkost@redhat.com> Reviewed-by: Daniel P. Berrange Signed-off-by: Eduardo Habkost --- vl.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'vl.c') diff --git a/vl.c b/vl.c index 3fed457921..ebea42e0ea 100644 --- a/vl.c +++ b/vl.c @@ -3111,7 +3111,6 @@ int main(int argc, char **argv, char **envp) const char *qtest_log = NULL; const char *pid_file = NULL; const char *incoming = NULL; - bool defconfig = true; bool userconfig = true; bool nographic = false; DisplayType display_type = DT_DEFAULT; @@ -3213,8 +3212,6 @@ int main(int argc, char **argv, char **envp) popt = lookup_opt(argc, argv, &optarg, &optind); switch (popt->index) { case QEMU_OPTION_nodefconfig: - defconfig = false; - break; case QEMU_OPTION_nouserconfig: userconfig = false; break; @@ -3222,7 +3219,7 @@ int main(int argc, char **argv, char **envp) } } - if (defconfig && userconfig) { + if (userconfig) { if (qemu_read_default_config_file() < 0) { exit(1); } -- cgit v1.2.3-55-g7522 From c0dd10991903c552811d8cbe9231055b1b3a7ebd Mon Sep 17 00:00:00 2001 From: Seeteena Thoufeek Date: Mon, 4 Sep 2017 13:13:51 +0530 Subject: vl: exit if maxcpus is negative Signed-off-by: Eduardo Habkost ---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 Signed-off-by: Seeteena Thoufeek Message-Id: <1504511031-26834-1-git-send-email-s1seetee@linux.vnet.ibm.com> Reviewed-by: Philippe Mathieu-Daudé --- include/sysemu/sysemu.h | 2 +- vl.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'vl.c') 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); } -- cgit v1.2.3-55-g7522