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

xics: Handle KVM ICS reset from the "simple" ICS code 

The KVM ICS reset handler simply writes the ICS state to KVM. This
doesn't need the overkill parent_reset logic we have today. Also
we want to use the same ICS type for the KVM and non-KVM case with
pseries.

Call icp_set_kvm_state() from the "simple" ICS reset function.

Signed-off-by: Greg Kurz <groug@kaod.org>
Message-Id: <155023082407.1011724.1983100830860273401.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:24 +01:00 committed by David Gibson
parent d80b2ccfa7
commit f1f5b701b8
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/intc/xics.c
View File

@ -553,6 +553,10 @@ static void ics_simple_reset(DeviceState *dev)
ICSStateClass *icsc = ICS_BASE_GET_CLASS(dev);
icsc->parent_reset(dev);
if (kvm_irqchip_in_kernel()) {
ics_set_kvm_state(ICS_BASE(dev));
}
}
static void ics_simple_reset_handler(void *dev)

18
hw/intc/xics_kvm.c
View File

@ -280,20 +280,6 @@ void ics_kvm_set_irq(void *opaque, int srcno, int val)
}
}
static void ics_kvm_reset(DeviceState *dev)
{
ICSStateClass *icsc = ICS_BASE_GET_CLASS(dev);
icsc->parent_reset(dev);
ics_set_kvm_state(ICS_KVM(dev));
}
static void ics_kvm_reset_handler(void *dev)
{
ics_kvm_reset(dev);
}
static void ics_kvm_realize(DeviceState *dev, Error **errp)
{
ICSState *ics = ICS_KVM(dev);
@ -305,8 +291,6 @@ static void ics_kvm_realize(DeviceState *dev, Error **errp)
error_propagate(errp, local_err);
return;
}
qemu_register_reset(ics_kvm_reset_handler, ics);
}
static void ics_kvm_class_init(ObjectClass *klass, void *data)
@ -316,8 +300,6 @@ static void ics_kvm_class_init(ObjectClass *klass, void *data)
device_class_set_parent_realize(dc, ics_kvm_realize,
&icsc->parent_realize);
device_class_set_parent_reset(dc, ics_kvm_reset,
&icsc->parent_reset);
}
static const TypeInfo ics_kvm_info = {