[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 19/22] ppc/xics: move the cpu_setup() handler und
From: |
Cédric Le Goater |
Subject: |
[Qemu-devel] [PATCH v2 19/22] ppc/xics: move the cpu_setup() handler under the ICPState class |
Date: |
Thu, 16 Feb 2017 14:47:42 +0100 |
The cpu_setup() handler is currenlty under the XICSState class but it
really belongs under ICPState as it is setting up a vCPU.
It makes use of the kernel ICP file descriptor which could be a
problem.
Signed-off-by: Cédric Le Goater <address@hidden>
---
hw/intc/xics.c | 8 +++----
hw/intc/xics_kvm.c | 58 +++++++++++++++++++++++++--------------------------
include/hw/ppc/xics.h | 3 +--
3 files changed, 34 insertions(+), 35 deletions(-)
diff --git a/hw/intc/xics.c b/hw/intc/xics.c
index 3ad7e8cf8ec4..78e08e23e3d6 100644
--- a/hw/intc/xics.c
+++ b/hw/intc/xics.c
@@ -66,15 +66,15 @@ void xics_cpu_setup(XICSInterface *xi, PowerPCCPU *cpu)
CPUState *cs = CPU(cpu);
CPUPPCState *env = &cpu->env;
ICPState *ss = xics_icp_get(xi, cs->cpu_index);
- XICSStateClass *info;
+ ICPStateClass *icpc;
assert(ss);
ss->cs = cs;
- info = XICS_COMMON_GET_CLASS(ss->xics);
- if (info->cpu_setup) {
- info->cpu_setup(ss, cpu);
+ icpc = ICP_GET_CLASS(ss);
+ if (icpc->cpu_setup) {
+ icpc->cpu_setup(ss, cpu);
}
switch (PPC_INPUT(env)) {
diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c
index 19c55fa74412..850777eab913 100644
--- a/hw/intc/xics_kvm.c
+++ b/hw/intc/xics_kvm.c
@@ -124,6 +124,34 @@ static void icp_kvm_reset(DeviceState *dev)
icp_set_kvm_state(icp, 1);
}
+static void icp_kvm_cpu_setup(ICPState *ss, PowerPCCPU *cpu)
+{
+ CPUState *cs = CPU(cpu);
+ int ret;
+
+ if (kernel_xics_fd == -1) {
+ abort();
+ }
+
+ /*
+ * If we are reusing a parked vCPU fd corresponding to the CPU
+ * which was hot-removed earlier we don't have to renable
+ * KVM_CAP_IRQ_XICS capability again.
+ */
+ if (ss->cap_irq_xics_enabled) {
+ return;
+ }
+
+ ret = kvm_vcpu_enable_cap(cs, KVM_CAP_IRQ_XICS, 0, kernel_xics_fd,
+ kvm_arch_vcpu_id(cs));
+ if (ret < 0) {
+ error_report("Unable to connect CPU%ld to kernel XICS: %s",
+ kvm_arch_vcpu_id(cs), strerror(errno));
+ exit(1);
+ }
+ ss->cap_irq_xics_enabled = true;
+}
+
static void icp_kvm_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
@@ -132,6 +160,7 @@ static void icp_kvm_class_init(ObjectClass *klass, void
*data)
dc->reset = icp_kvm_reset;
icpc->pre_save = icp_get_kvm_state;
icpc->post_load = icp_set_kvm_state;
+ icpc->cpu_setup = icp_kvm_cpu_setup;
}
static const TypeInfo icp_kvm_info = {
@@ -334,33 +363,6 @@ static const TypeInfo ics_kvm_info = {
/*
* XICS-KVM
*/
-static void xics_kvm_cpu_setup(ICPState *ss, PowerPCCPU *cpu)
-{
- CPUState *cs = CPU(cpu);
- int ret;
-
- if (kernel_xics_fd == -1) {
- abort();
- }
-
- /*
- * If we are reusing a parked vCPU fd corresponding to the CPU
- * which was hot-removed earlier we don't have to renable
- * KVM_CAP_IRQ_XICS capability again.
- */
- if (ss->cap_irq_xics_enabled) {
- return;
- }
-
- ret = kvm_vcpu_enable_cap(cs, KVM_CAP_IRQ_XICS, 0, kernel_xics_fd,
- kvm_arch_vcpu_id(cs));
- if (ret < 0) {
- error_report("Unable to connect CPU%ld to kernel XICS: %s",
- kvm_arch_vcpu_id(cs), strerror(errno));
- exit(1);
- }
- ss->cap_irq_xics_enabled = true;
-}
static void rtas_dummy(PowerPCCPU *cpu, sPAPRMachineState *spapr,
uint32_t token,
@@ -439,10 +441,8 @@ fail:
static void xics_kvm_class_init(ObjectClass *oc, void *data)
{
DeviceClass *dc = DEVICE_CLASS(oc);
- XICSStateClass *xsc = XICS_COMMON_CLASS(oc);
dc->realize = xics_kvm_realize;
- xsc->cpu_setup = xics_kvm_cpu_setup;
}
static const TypeInfo xics_spapr_kvm_info = {
diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h
index 726492c948db..f7f89c1d18d7 100644
--- a/include/hw/ppc/xics.h
+++ b/include/hw/ppc/xics.h
@@ -72,8 +72,6 @@ typedef struct ICSIRQState ICSIRQState;
struct XICSStateClass {
DeviceClass parent_class;
-
- void (*cpu_setup)(ICPState *icp, PowerPCCPU *cpu);
};
struct XICSState {
@@ -98,6 +96,7 @@ struct ICPStateClass {
void (*pre_save)(ICPState *s);
int (*post_load)(ICPState *s, int version_id);
+ void (*cpu_setup)(ICPState *icp, PowerPCCPU *cpu);
};
struct ICPState {
--
2.7.4
- Re: [Qemu-devel] [PATCH v2 11/22] ppc/xics: remove the XICS list of ICS, (continued)
- [Qemu-devel] [PATCH v2 12/22] ppc/xics: extend the QOM interface to handle ICPs, Cédric Le Goater, 2017/02/16
- [Qemu-devel] [PATCH v2 13/22] ppc/xics: simplify the cpu_setup() handler, Cédric Le Goater, 2017/02/16
- [Qemu-devel] [PATCH v2 14/22] ppc/xics: use the QOM interface to grab an ICP, Cédric Le Goater, 2017/02/16
- [Qemu-devel] [PATCH v2 15/22] ppc/xics: simplify spapr_dt_xics() interface, Cédric Le Goater, 2017/02/16
- [Qemu-devel] [PATCH v2 16/22] ppc/xics: register the reset handler of ICP objects, Cédric Le Goater, 2017/02/16
- [Qemu-devel] [PATCH v2 17/22] ppc/xics: move the ICP array under the sPAPR machine, Cédric Le Goater, 2017/02/16
- [Qemu-devel] [PATCH v2 18/22] ppc/xics: move kernel_xics_fd out of KVMXICSState, Cédric Le Goater, 2017/02/16
- [Qemu-devel] [PATCH v2 19/22] ppc/xics: move the cpu_setup() handler under the ICPState class,
Cédric Le Goater <=
- [Qemu-devel] [PATCH v2 20/22] ppc/xics: remove the 'xics' backlinks, Cédric Le Goater, 2017/02/16
- [Qemu-devel] [PATCH v2 21/22] ppc/xics: export the XICS init routines, Cédric Le Goater, 2017/02/16
- [Qemu-devel] [PATCH v2 22/22] ppc/xics: remove the XICSState classes, Cédric Le Goater, 2017/02/16
- Re: [Qemu-devel] [PATCH v2 00/22] ppc/xics: simplify ICS and ICP creation, David Gibson, 2017/02/21