diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2012-03-17 12:59:23 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2012-03-17 12:59:23 +0000 |
| commit | cb76e9c7b7e9fe8786be2ef729636b264fe1d63a (patch) | |
| tree | c5e38019a45fc629cbd8101e739b01b4d1cc16f3 /hw/spapr.h | |
| parent | 1329d1896cc627cf71e3833525152ff59dd5113b (diff) | |
| parent | 38ae51a804a6ad2baec3e45ecb1571583b312441 (diff) | |
| download | qemu-cb76e9c7b7e9fe8786be2ef729636b264fe1d63a.zip qemu-cb76e9c7b7e9fe8786be2ef729636b264fe1d63a.tar.gz qemu-cb76e9c7b7e9fe8786be2ef729636b264fe1d63a.tar.bz2 | |
Merge branch 'ppc-for-upstream' of git://repo.or.cz/qemu/agraf
* 'ppc-for-upstream' of git://repo.or.cz/qemu/agraf:
PPC: Fix openpic with relative memregions
pseries: Configure PCI bridge using properties
PPC: KVM: Synchronize regs on CPU dump
kvm: Comparison with ioctl number macros needs to be unsigned
ppc: Correctly define POWERPC_INSNS2_DEFAULT
pseries: Add support for level interrupts to XICS
PPC: Fix large page support in TCG
PPC: Add PIR register to POWER7 CPU
pseries: Remove PCI device from PCI host bridge code
pseries: Remove unused constant from PCI code
pseries: Update SLOF firmware image
PPC64: Add support for ldbrx and stdbrx instructions
pseries: Don't try to munmap() a malloc()ed TCE table
ppc: Add missing 'static' to spin_rw_ops
PPC: 405: Fix ppc405ep initialization
Bad zero comparison for sas_ss_flags on powerpc
Diffstat (limited to 'hw/spapr.h')
| -rw-r--r-- | hw/spapr.h | 13 |
1 files changed, 12 insertions, 1 deletions
@@ -286,7 +286,18 @@ void spapr_register_hypercall(target_ulong opcode, spapr_hcall_fn fn); target_ulong spapr_hypercall(CPUPPCState *env, target_ulong opcode, target_ulong *args); -qemu_irq spapr_allocate_irq(uint32_t hint, uint32_t *irq_num); +qemu_irq spapr_allocate_irq(uint32_t hint, uint32_t *irq_num, + enum xics_irq_type type); + +static inline qemu_irq spapr_allocate_msi(uint32_t hint, uint32_t *irq_num) +{ + return spapr_allocate_irq(hint, irq_num, XICS_MSI); +} + +static inline qemu_irq spapr_allocate_lsi(uint32_t hint, uint32_t *irq_num) +{ + return spapr_allocate_irq(hint, irq_num, XICS_LSI); +} static inline uint32_t rtas_ld(target_ulong phys, int n) { |