summary refs log tree commit diff stats
path: root/include/hw/ppc
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2013-06-12 15:32:51 -0500
committerAlexander Graf <agraf@suse.de>2013-07-01 01:11:14 +0200
commitd85937e683f6ff4d68293cb24c780fb1f6820d2c (patch)
treed5e22e6fe43fcb1d004d39d3974241e8fd1d7aa7 /include/hw/ppc
parent4be1db86060d803f2335c08a483218eb6a8bd9eb (diff)
downloadfocaccia-qemu-d85937e683f6ff4d68293cb24c780fb1f6820d2c.tar.gz
focaccia-qemu-d85937e683f6ff4d68293cb24c780fb1f6820d2c.zip
kvm/openpic: in-kernel mpic support
Enables support for the in-kernel MPIC that thas been merged into the
KVM next branch.  This includes irqfd/KVM_IRQ_LINE support from Alex
Graf (along with some other improvements).

Note from Alex regarding kvm_irqchip_create():

  On x86, one would call kvm_irqchip_create() to initialize an
  in-kernel interrupt controller.  That function then goes ahead and
  initializes global capability variables as well as the default irq
  routing table.

  On ppc, we can't call kvm_irqchip_create() because we can have
  different types of interrupt controllers.  So we want to do all the
  things that function would do for us in the in-kernel device init
  handler.

Signed-off-by: Scott Wood <scottwood@freescale.com>
[agraf: squash in kvm_irqchip_commit_routes patch, fix non-kvm build,
        fix ppcemb]
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'include/hw/ppc')
-rw-r--r--include/hw/ppc/openpic.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/hw/ppc/openpic.h b/include/hw/ppc/openpic.h
index d873bb6419..1fe4865e1d 100644
--- a/include/hw/ppc/openpic.h
+++ b/include/hw/ppc/openpic.h
@@ -24,6 +24,6 @@ enum {
 #define OPENPIC_MAX_IRQ     (OPENPIC_MAX_SRC + OPENPIC_MAX_IPI + \
                              OPENPIC_MAX_TMR)
 
-DeviceState *kvm_openpic_create(BusState *bus, int model);
+int kvm_openpic_connect_vcpu(DeviceState *d, CPUState *cs);
 
 #endif /* __OPENPIC_H__ */