openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

xics: Drop the KVM ICS class 

The KVM ICS class isn't used anymore. Drop it.

Signed-off-by: Greg Kurz <groug@kaod.org>
Message-Id: <155023084177.1011724.14693955932559990358.stgit@bahia.lan>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Greg Kurz 2019-02-15 12:40:41 +01:00 committed by David Gibson
parent 444d6ca301
commit 3272752a8b
3 changed files with 1 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
hw/intc/xics_kvm.c
View File

@ -279,39 +279,6 @@ void ics_kvm_set_irq(ICSState *ics, int srcno, int val)
} }
} }
static void ics_kvm_realize(DeviceState *dev, Error **errp)
{
ICSState *ics = ICS_KVM(dev);
ICSStateClass *icsc = ICS_BASE_GET_CLASS(ics);
Error *local_err = NULL;
icsc->parent_realize(dev, &local_err);
if (local_err) {
error_propagate(errp, local_err);
return;
}
}
static void ics_kvm_class_init(ObjectClass *klass, void *data)
{
ICSStateClass *icsc = ICS_BASE_CLASS(klass);
DeviceClass *dc = DEVICE_CLASS(klass);
device_class_set_parent_realize(dc, ics_kvm_realize,
&icsc->parent_realize);
}
static const TypeInfo ics_kvm_info = {
.name = TYPE_ICS_KVM,
.parent = TYPE_ICS_BASE,
.instance_size = sizeof(ICSState),
.class_init = ics_kvm_class_init,
};
/*
* XICS-KVM
*/
static void rtas_dummy(PowerPCCPU *cpu, sPAPRMachineState *spapr, static void rtas_dummy(PowerPCCPU *cpu, sPAPRMachineState *spapr,
uint32_t token, uint32_t token,
uint32_t nargs, target_ulong args, uint32_t nargs, target_ulong args,
@ -381,10 +348,3 @@ fail:
kvmppc_define_rtas_kernel_token(0, "ibm,int-off"); kvmppc_define_rtas_kernel_token(0, "ibm,int-off");
return -1; return -1;
} }
static void xics_kvm_register_types(void)
{
type_register_static(&ics_kvm_info);
}
type_init(xics_kvm_register_types)

2
hw/ppc/spapr_irq.c
View File

@ -208,7 +208,7 @@ static void spapr_irq_cpu_intc_create_xics(sPAPRMachineState *spapr,
static int spapr_irq_post_load_xics(sPAPRMachineState *spapr, int version_id) static int spapr_irq_post_load_xics(sPAPRMachineState *spapr, int version_id)
{ {
if (!object_dynamic_cast(OBJECT(spapr->ics), TYPE_ICS_KVM)) { if (!kvm_irqchip_in_kernel()) {
CPUState *cs; CPUState *cs;
CPU_FOREACH(cs) { CPU_FOREACH(cs) {
PowerPCCPU *cpu = POWERPC_CPU(cs); PowerPCCPU *cpu = POWERPC_CPU(cs);

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

@ -95,9 +95,6 @@ struct PnvICPState {
#define TYPE_ICS_SIMPLE "ics" #define TYPE_ICS_SIMPLE "ics"
#define ICS_SIMPLE(obj) OBJECT_CHECK(ICSState, (obj), TYPE_ICS_SIMPLE) #define ICS_SIMPLE(obj) OBJECT_CHECK(ICSState, (obj), TYPE_ICS_SIMPLE)
#define TYPE_ICS_KVM "icskvm"
#define ICS_KVM(obj) OBJECT_CHECK(ICSState, (obj), TYPE_ICS_KVM)
#define ICS_BASE_CLASS(klass) \ #define ICS_BASE_CLASS(klass) \
OBJECT_CLASS_CHECK(ICSStateClass, (klass), TYPE_ICS_BASE) OBJECT_CLASS_CHECK(ICSStateClass, (klass), TYPE_ICS_BASE)
#define ICS_BASE_GET_CLASS(obj) \ #define ICS_BASE_GET_CLASS(obj) \