[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/18] xics, xics_kvm: Handle CPU unplug correctly
From: |
David Gibson |
Subject: |
[Qemu-devel] [PULL 08/18] xics, xics_kvm: Handle CPU unplug correctly |
Date: |
Fri, 17 Jun 2016 16:36:29 +1000 |
From: Bharata B Rao <address@hidden>
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 <address@hidden>
Reviewed-by: David Gibson <address@hidden>
Signed-off-by: David Gibson <address@hidden>
---
hw/intc/xics.c | 14 ++++++++++++++
hw/intc/xics_kvm.c | 8 ++++----
include/hw/ppc/xics.h | 1 +
3 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/hw/intc/xics.c b/hw/intc/xics.c
index 8659be0..cce7f3d 100644
--- a/hw/intc/xics.c
+++ b/hw/intc/xics.c
@@ -48,6 +48,18 @@ static int get_cpu_index_by_dt_id(int cpu_dt_id)
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)
{
CPUState *cs = CPU(cpu);
@@ -57,6 +69,8 @@ void xics_cpu_setup(XICSState *icp, PowerPCCPU *cpu)
assert(cs->cpu_index < icp->nr_servers);
+ ss->cs = cs;
+
if (info->cpu_setup) {
info->cpu_setup(icp, cpu);
}
diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c
index 55fd801..b17d6a9 100644
--- a/hw/intc/xics_kvm.c
+++ b/hw/intc/xics_kvm.c
@@ -114,8 +114,10 @@ static void icp_kvm_reset(DeviceState *dev)
icp->pending_priority = 0xff;
icp->mfrr = 0xff;
- /* Make all outputs are deasserted */
- qemu_set_irq(icp->output, 0);
+ /* Make all outputs as deasserted only if the CPU thread is in use */
+ if (icp->output) {
+ qemu_set_irq(icp->output, 0);
+ }
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) {
int ret;
- ss->cs = cs;
-
ret = kvm_vcpu_enable_cap(cs, KVM_CAP_IRQ_XICS, 0,
icpkvm->kernel_xics_fd,
kvm_arch_vcpu_id(cs));
if (ret < 0) {
diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h
index f60b06a..9091054 100644
--- a/include/hw/ppc/xics.h
+++ b/include/hw/ppc/xics.h
@@ -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_cpu_setup(XICSState *icp, PowerPCCPU *cpu);
+void xics_cpu_destroy(XICSState *icp, PowerPCCPU *cpu);
#endif /* __XICS_H__ */
--
2.5.5
- [Qemu-devel] [PULL 00/18] ppc-for-2.7 queue 20160617, David Gibson, 2016/06/17
- [Qemu-devel] [PULL 06/18] qdev: hotplug: Introduce HotplugHandler.pre_plug() callback, David Gibson, 2016/06/17
- [Qemu-devel] [PULL 12/18] spapr: Move spapr_cpu_init() to spapr_cpu_core.c, David Gibson, 2016/06/17
- [Qemu-devel] [PULL 05/18] target-ppc: Fix rlwimi, rlwinm, rlwnm, David Gibson, 2016/06/17
- [Qemu-devel] [PULL 01/18] hw/ppc/spapr: Silence deprecation message in qtest mode, David Gibson, 2016/06/17
- [Qemu-devel] [PULL 02/18] ppc / sparc: Add a tester for checking whether OpenBIOS runs successfully, David Gibson, 2016/06/17
- [Qemu-devel] [PULL 04/18] vfio: Fix broken EEH, David Gibson, 2016/06/17
- [Qemu-devel] [PULL 08/18] xics, xics_kvm: Handle CPU unplug correctly,
David Gibson <=
- [Qemu-devel] [PULL 07/18] cpu: Abstract CPU core type, David Gibson, 2016/06/17
- [Qemu-devel] [PULL 15/18] spapr: CPU hot unplug support, David Gibson, 2016/06/17
- [Qemu-devel] [PULL 11/18] spapr: Abstract CPU core device and type specific core devices, David Gibson, 2016/06/17
- [Qemu-devel] [PULL 10/18] qom: API to get instance_size of a type, David Gibson, 2016/06/17
- [Qemu-devel] [PULL 16/18] QMP: Add query-hotpluggable-cpus, David Gibson, 2016/06/17
- [Qemu-devel] [PULL 09/18] spapr_drc: Prevent detach racing against attach for CPU DR, David Gibson, 2016/06/17
- [Qemu-devel] [PULL 14/18] spapr: CPU hotplug support, David Gibson, 2016/06/17
- [Qemu-devel] [PULL 18/18] spapr: implement query-hotpluggable-cpus callback, David Gibson, 2016/06/17
- [Qemu-devel] [PULL 13/18] spapr: convert boot CPUs into CPU core devices, David Gibson, 2016/06/17
- [Qemu-devel] [PULL 03/18] target-ppc: Bug in BookE wait instruction, David Gibson, 2016/06/17