OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

ppc: Skip partially initialized vCPUs in 'info pic'

Browse Source 
CPU_FOREACH() can race with vCPU hotplug/unplug on sPAPR machines, ie.
we may try to print out info about a vCPU with a NULL presenter pointer.

Check that in order to prevent QEMU from crashing.

Signed-off-by: Greg Kurz <groug@kaod.org>
Message-Id: <157192725327.3146912.12047076483178652551.stgit@bahia.lan>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
This commit is contained in:
Greg Kurz 2019-10-24 16:27:33 +02:00 committed by Laurent Vivier
parent 35886de140
commit 0a83b47055
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/intc/xics.c
View File

@ -44,7 +44,16 @@
void icp_pic_print_info(ICPState *icp, Monitor *mon) void icp_pic_print_info(ICPState *icp, Monitor *mon)
{ {
int cpu_index = icp->cs ? icp->cs->cpu_index : -1; int cpu_index;
/* Skip partially initialized vCPUs. This can happen on sPAPR when vCPUs
* are hot plugged or unplugged.
*/
if (!icp) {
return;
}
cpu_index = icp->cs ? icp->cs->cpu_index : -1;
if (!icp->output) { if (!icp->output) {
return; return;

11
hw/intc/xive.c
View File

@ -523,9 +523,18 @@ static const char * const xive_tctx_ring_names[] = {
void xive_tctx_pic_print_info(XiveTCTX *tctx, Monitor *mon) void xive_tctx_pic_print_info(XiveTCTX *tctx, Monitor *mon)
{ {
int cpu_index = tctx->cs ? tctx->cs->cpu_index : -1; int cpu_index;
int i; int i;
/* Skip partially initialized vCPUs. This can happen on sPAPR when vCPUs
* are hot plugged or unplugged.
*/
if (!tctx) {
return;
}
cpu_index = tctx->cs ? tctx->cs->cpu_index : -1;
if (kvm_irqchip_in_kernel()) { if (kvm_irqchip_in_kernel()) {
Error *local_err = NULL; Error *local_err = NULL;