diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-28 13:19:06 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-28 13:19:06 -0600 |
| commit | 7e68494b0be4310c48996e9334373ef5771e3d15 (patch) | |
| tree | f9f24372cc2bd72f537142f143426765c9d794db /hw/spapr_pci.c | |
| parent | f3d44eb53c10b4dddfb3762c3e005be38adfc0ed (diff) | |
| parent | 6e72719e721a40fe1224701ca10edc1caf0cd708 (diff) | |
| download | focaccia-qemu-7e68494b0be4310c48996e9334373ef5771e3d15.tar.gz focaccia-qemu-7e68494b0be4310c48996e9334373ef5771e3d15.zip | |
Merge remote-tracking branch 'agraf/ppc-for-upstream-1.3' into staging
* agraf/ppc-for-upstream-1.3: fbdev: fix pixman compile on old pixman vl.c: Fix broken -usb option pseries: Fix bug in PCI MSI allocation kvm: fix incorrect length in a loop over kvm dirty pages map PPC: Fix missing TRACE exception hw/ide/macio: Fix segfault caused by NULL DMAContext* Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/spapr_pci.c')
| -rw-r--r-- | hw/spapr_pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/spapr_pci.c b/hw/spapr_pci.c index a08ed11166..3c5b855bc0 100644 --- a/hw/spapr_pci.c +++ b/hw/spapr_pci.c @@ -351,7 +351,7 @@ static void rtas_ibm_change_msi(sPAPREnvironment *spapr, /* There is no cached config, allocate MSIs */ if (!phb->msi_table[ndev].nvec) { - irq = spapr_allocate_irq_block(req_num, true); + irq = spapr_allocate_irq_block(req_num, false); if (irq < 0) { fprintf(stderr, "Cannot allocate MSIs for device#%d", ndev); rtas_st(rets, 0, -1); /* Hardware error */ |