msix: fix crash on msix_irq_entries access

PATCH New Michael S. Tsirkin 1 participant 1 message Oct 20, 2010 KVM

Share & tools

Michael S. Tsirkin

author

2010-10-20 04:56 UTC #0 lore raw

PATCH 1/1 msix: fix crash on msix_irq_entries access

Since commit 889e30cc18e21f2091b77267dca8096d7dd34f8b, msix.c doesn't include kvm/h anymore, so KVM_IRQCHIP is never defined, and msix_irq_entries ends up as NULL.

Signed-off-by Michael S. Tsirkin <[email protected]>

---
 hw/msix.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

hw/msix.c +0 -2

index 43efbd2..f12e4aa 100644
@@ -389,12 +389,10 @@ int msix_init(struct PCIDevice *dev, unsigned short nentries,
     if (ret)
         goto err_config;
 
-#ifdef KVM_CAP_IRQCHIP
     if (kvm_enabled() && kvm_irqchip_in_kernel()) {
         dev->msix_irq_entries = qemu_malloc(nentries *
                                             sizeof *dev->msix_irq_entries);
     }
-#endif
 
     dev->cap_present |= QEMU_PCI_CAP_MSIX;
     return 0;

Signature · 1 line

1.7.3-rc1