From 4a9dd6658268a942a8ea230f950a951229355cbb Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" Date: Wed, 8 Dec 2010 17:46:23 +0900 Subject: pci: untangle pci/msi dependency msi depends on pci but pci should not depend on msi. The only dependency we have is a recent addition of pci_msi_ functions, IMO they add little enough to open-code in the small number of users. Follow-up patches add more cleanups. Signed-off-by: Michael S. Tsirkin Signed-off-by: Isaku Yamahata --- hw/pci.c | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'hw/pci.c') diff --git a/hw/pci.c b/hw/pci.c index ca878e8..254647b 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -25,8 +25,6 @@ #include "pci.h" #include "pci_bridge.h" #include "pci_internals.h" -#include "msix.h" -#include "msi.h" #include "monitor.h" #include "net.h" #include "sysemu.h" @@ -1099,23 +1097,6 @@ static void pci_set_irq(void *opaque, int irq_num, int level) pci_change_irq_level(pci_dev, irq_num, change); } -bool pci_msi_enabled(PCIDevice *dev) -{ - return msix_enabled(dev) || msi_enabled(dev); -} - -void pci_msi_notify(PCIDevice *dev, unsigned int vector) -{ - if (msix_enabled(dev)) { - msix_notify(dev, vector); - } else if (msi_enabled(dev)) { - msi_notify(dev, vector); - } else { - /* MSI/MSI-X must be enabled */ - abort(); - } -} - /***********************************************************/ /* monitor info on PCI */ -- cgit v1.1