Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-08 08:05:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

xics,xics_kvm: Handle CPU unplug correctly

Browse Source 
XICS is setup for each CPU during initialization. Provide a routine
to undo the same when CPU is unplugged. While here, move ss->cs management
into xics from xics_kvm since there is nothing KVM specific in it.
Also ensure xics reset doesn't set irq for CPUs that are already unplugged.

This allows reboot of a VM that has undergone CPU hotplug and unplug
to work correctly.

Signed-off-by: Bharata B Rao <bharata@linux.vnet.ibm.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Bharata B Rao 2016-05-12 09:18:20 +05:30 committed by David Gibson
parent f1020c2c26
commit 4a4b344c7c
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/intc/xics.c
View File

@ -48,6 +48,18 @@ static int get_cpu_index_by_dt_id(int cpu_dt_id)
return -1; return -1;
} }
void xics_cpu_destroy(XICSState *icp, PowerPCCPU *cpu)
{
CPUState *cs = CPU(cpu);
ICPState *ss = &icp->ss[cs->cpu_index];
assert(cs->cpu_index < icp->nr_servers);
assert(cs == ss->cs);
ss->output = NULL;
ss->cs = NULL;
}
void xics_cpu_setup(XICSState *icp, PowerPCCPU *cpu) void xics_cpu_setup(XICSState *icp, PowerPCCPU *cpu)
{ {
CPUState *cs = CPU(cpu); CPUState *cs = CPU(cpu);
@ -57,6 +69,8 @@ void xics_cpu_setup(XICSState *icp, PowerPCCPU *cpu)
assert(cs->cpu_index < icp->nr_servers); assert(cs->cpu_index < icp->nr_servers);
ss->cs = cs;
if (info->cpu_setup) { if (info->cpu_setup) {
info->cpu_setup(icp, cpu); info->cpu_setup(icp, cpu);
} }

8
hw/intc/xics_kvm.c
View File

@ -114,8 +114,10 @@ static void icp_kvm_reset(DeviceState *dev)
icp->pending_priority = 0xff; icp->pending_priority = 0xff;
icp->mfrr = 0xff; icp->mfrr = 0xff;
/* Make all outputs are deasserted */ /* Make all outputs as deasserted only if the CPU thread is in use */
qemu_set_irq(icp->output, 0); if (icp->output) {
qemu_set_irq(icp->output, 0);
}
icp_set_kvm_state(icp, 1); icp_set_kvm_state(icp, 1);
} }
@ -348,8 +350,6 @@ static void xics_kvm_cpu_setup(XICSState *icp, PowerPCCPU *cpu)
if (icpkvm->kernel_xics_fd != -1) { if (icpkvm->kernel_xics_fd != -1) {
int ret; int ret;
ss->cs = cs;
ret = kvm_vcpu_enable_cap(cs, KVM_CAP_IRQ_XICS, 0, ret = kvm_vcpu_enable_cap(cs, KVM_CAP_IRQ_XICS, 0,
icpkvm->kernel_xics_fd, kvm_arch_vcpu_id(cs)); icpkvm->kernel_xics_fd, kvm_arch_vcpu_id(cs));
if (ret < 0) { if (ret < 0) {

1
include/hw/ppc/xics.h
View File

@ -167,5 +167,6 @@ int xics_alloc_block(XICSState *icp, int src, int num, bool lsi, bool align,
void xics_free(XICSState *icp, int irq, int num); void xics_free(XICSState *icp, int irq, int num);
void xics_cpu_setup(XICSState *icp, PowerPCCPU *cpu); void xics_cpu_setup(XICSState *icp, PowerPCCPU *cpu);
void xics_cpu_destroy(XICSState *icp, PowerPCCPU *cpu);
#endif /* __XICS_H__ */ #endif /* __XICS_H__ */