|
 |
9bac43 |
From 72c9f52facf418294ce72056d771591debb2a2f0 Mon Sep 17 00:00:00 2001
|
|
|
9bac43 |
From: Sam Bobroff <sbobroff@redhat.com>
|
|
|
9bac43 |
Date: Fri, 13 Oct 2017 00:56:26 +0200
|
|
|
9bac43 |
Subject: [PATCH 33/34] vl: exit if maxcpus is negative
|
|
|
9bac43 |
MIME-Version: 1.0
|
|
|
9bac43 |
Content-Type: text/plain; charset=UTF-8
|
|
|
9bac43 |
Content-Transfer-Encoding: 8bit
|
|
|
9bac43 |
|
|
|
9bac43 |
RH-Author: Sam Bobroff <sbobroff@redhat.com>
|
|
|
9bac43 |
Message-id: <1507856186-31186-1-git-send-email-sbobroff@redhat.com>
|
|
|
9bac43 |
Patchwork-id: 77221
|
|
|
9bac43 |
O-Subject: [RHEL7.5 qemu-kvm-rhev PATCH] vl: exit if maxcpus is negative
|
|
|
9bac43 |
Bugzilla: 1491743
|
|
|
9bac43 |
RH-Acked-by: David Gibson <dgibson@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
9bac43 |
|
|
|
9bac43 |
From: Seeteena Thoufeek <s1seetee@linux.vnet.ibm.com>
|
|
|
9bac43 |
|
|
|
9bac43 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9bac43 |
|
|
|
9bac43 |
---Steps to Reproduce---
|
|
|
9bac43 |
|
|
|
9bac43 |
When passed a negative number to 'maxcpus' parameter, Qemu aborts
|
|
|
9bac43 |
with a core dump.
|
|
|
9bac43 |
|
|
|
9bac43 |
Run the following command with maxcpus argument as negative number
|
|
|
9bac43 |
|
|
|
9bac43 |
ppc64-softmmu/qemu-system-ppc64 --nographic -vga none -machine
|
|
|
9bac43 |
pseries,accel=kvm,kvm-type=HV -m size=200g -device virtio-blk-pci,
|
|
|
9bac43 |
drive=rootdisk -drive file=/home/images/pegas-1.0-ppc64le.qcow2,
|
|
|
9bac43 |
if=none,cache=none,id=rootdisk,format=qcow2 -monitor telnet
|
|
|
9bac43 |
:127.0.0.1:1234,server,nowait -net nic,model=virtio -net
|
|
|
9bac43 |
user -redir tcp:2000::22 -device nec-usb-xhci -smp 8,cores=1,
|
|
|
9bac43 |
threads=1,maxcpus=-12
|
|
|
9bac43 |
|
|
|
9bac43 |
(process:12149): GLib-ERROR **: gmem.c:130: failed to allocate
|
|
|
9bac43 |
18446744073709550568 bytes
|
|
|
9bac43 |
|
|
|
9bac43 |
Trace/breakpoint trap
|
|
|
9bac43 |
|
|
|
9bac43 |
Reported-by: R.Nageswara Sastry <rnsastry@linux.vnet.ibm.com>
|
|
|
9bac43 |
Signed-off-by: Seeteena Thoufeek <s1seetee@linux.vnet.ibm.com>
|
|
|
9bac43 |
Message-Id: <1504511031-26834-1-git-send-email-s1seetee@linux.vnet.ibm.com>
|
|
|
9bac43 |
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
|
|
|
9bac43 |
(cherry picked from commit c0dd10991903c552811d8cbe9231055b1b3a7ebd)
|
|
|
9bac43 |
|
|
|
9bac43 |
Testing: Run qemu-kvm with "-smp maxcpus=-1".
|
|
|
9bac43 |
Signed-off-by: Sam Bobroff <sbobroff@redhat.com>
|
|
|
9bac43 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9bac43 |
---
|
|
|
9bac43 |
include/sysemu/sysemu.h | 2 +-
|
|
|
9bac43 |
vl.c | 6 +++---
|
|
|
9bac43 |
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
9bac43 |
|
|
|
9bac43 |
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
|
|
|
9bac43 |
index 54fdc4f..d6a9cd7 100644
|
|
|
9bac43 |
--- a/include/sysemu/sysemu.h
|
|
|
9bac43 |
+++ b/include/sysemu/sysemu.h
|
|
|
9bac43 |
@@ -115,7 +115,7 @@ extern int win2k_install_hack;
|
|
|
9bac43 |
extern int alt_grab;
|
|
|
9bac43 |
extern int ctrl_grab;
|
|
|
9bac43 |
extern int smp_cpus;
|
|
|
9bac43 |
-extern int max_cpus;
|
|
|
9bac43 |
+extern unsigned int max_cpus;
|
|
|
9bac43 |
extern int cursor_hide;
|
|
|
9bac43 |
extern int graphic_rotate;
|
|
|
9bac43 |
extern int no_quit;
|
|
|
9bac43 |
diff --git a/vl.c b/vl.c
|
|
|
9bac43 |
index 183b7f7..18b837c 100644
|
|
|
9bac43 |
--- a/vl.c
|
|
|
9bac43 |
+++ b/vl.c
|
|
|
9bac43 |
@@ -164,7 +164,7 @@ Chardev *sclp_hds[MAX_SCLP_CONSOLES];
|
|
|
9bac43 |
int win2k_install_hack = 0;
|
|
|
9bac43 |
int singlestep = 0;
|
|
|
9bac43 |
int smp_cpus = 1;
|
|
|
9bac43 |
-int max_cpus = 1;
|
|
|
9bac43 |
+unsigned int max_cpus = 1;
|
|
|
9bac43 |
int smp_cores = 1;
|
|
|
9bac43 |
int smp_threads = 1;
|
|
|
9bac43 |
int acpi_enabled = 1;
|
|
|
9bac43 |
@@ -4244,8 +4244,8 @@ int main(int argc, char **argv, char **envp)
|
|
|
9bac43 |
|
|
|
9bac43 |
machine_class->max_cpus = machine_class->max_cpus ?: 1; /* Default to UP */
|
|
|
9bac43 |
if (max_cpus > machine_class->max_cpus) {
|
|
|
9bac43 |
- error_report("Number of SMP CPUs requested (%d) exceeds max CPUs "
|
|
|
9bac43 |
- "supported by machine '%s' (%d)", max_cpus,
|
|
|
9bac43 |
+ error_report("Invalid SMP CPUs %d. The max CPUs "
|
|
|
9bac43 |
+ "supported by machine '%s' is %d", max_cpus,
|
|
|
9bac43 |
machine_class->name, machine_class->max_cpus);
|
|
|
9bac43 |
exit(1);
|
|
|
9bac43 |
}
|
|
|
9bac43 |
--
|
|
|
9bac43 |
1.8.3.1
|
|
|
9bac43 |
|