[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/6] pci/aer: remove dead code
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PATCH 3/6] pci/aer: remove dead code |
Date: |
Fri, 3 Dec 2010 00:54:37 +0200 |
User-agent: |
Mutt/1.5.21 (2010-09-15) |
Remove some unused variables and return values.
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/pcie_aer.c | 15 +--------------
1 files changed, 1 insertions(+), 14 deletions(-)
diff --git a/hw/pcie_aer.c b/hw/pcie_aer.c
index 18bbd5a..204155b 100644
--- a/hw/pcie_aer.c
+++ b/hw/pcie_aer.c
@@ -258,29 +258,21 @@ static unsigned int pcie_aer_root_get_vector(PCIDevice
*dev)
}
/*
- * return value:
- * true: error message is sent up
- * false: error message is masked
- *
* 6.2.6 Error Message Control
* Figure 6-3
* root port part
*/
-static bool pcie_aer_msg_root_port(PCIDevice *dev, const PCIEAERMsg *msg)
+static void pcie_aer_msg_root_port(PCIDevice *dev, const PCIEAERMsg *msg)
{
- bool msg_sent;
uint16_t cmd;
uint8_t *aer_cap;
uint32_t root_cmd;
uint32_t root_status;
- bool msi_trigger;
- msg_sent = false;
cmd = pci_get_word(dev->config + PCI_COMMAND);
aer_cap = dev->config + dev->exp.aer_cap;
root_cmd = pci_get_long(aer_cap + PCI_ERR_ROOT_COMMAND);
root_status = pci_get_long(aer_cap + PCI_ERR_ROOT_STATUS);
- msi_trigger = false;
if (cmd & PCI_COMMAND_SERR) {
/* System Error.
@@ -300,7 +292,6 @@ static bool pcie_aer_msg_root_port(PCIDevice *dev, const
PCIEAERMsg *msg)
root_status |= PCI_ERR_ROOT_MULTI_COR_RCV;
} else {
if (root_cmd & PCI_ERR_ROOT_CMD_COR_EN) {
- msi_trigger = true;
}
pci_set_word(aer_cap + PCI_ERR_ROOT_COR_SRC, msg->source_id);
}
@@ -309,14 +300,12 @@ static bool pcie_aer_msg_root_port(PCIDevice *dev, const
PCIEAERMsg *msg)
case PCI_ERR_ROOT_CMD_NONFATAL_EN:
if (!(root_status & PCI_ERR_ROOT_NONFATAL_RCV) &&
root_cmd & PCI_ERR_ROOT_CMD_NONFATAL_EN) {
- msi_trigger = true;
}
root_status |= PCI_ERR_ROOT_NONFATAL_RCV;
break;
case PCI_ERR_ROOT_CMD_FATAL_EN:
if (!(root_status & PCI_ERR_ROOT_FATAL_RCV) &&
root_cmd & PCI_ERR_ROOT_CMD_FATAL_EN) {
- msi_trigger = true;
}
if (!(root_status & PCI_ERR_ROOT_UNCOR_RCV)) {
root_status |= PCI_ERR_ROOT_FIRST_FATAL;
@@ -346,9 +335,7 @@ static bool pcie_aer_msg_root_port(PCIDevice *dev, const
PCIEAERMsg *msg)
} else {
qemu_set_irq(dev->irq[dev->exp.aer_intx], 1);
}
- msg_sent = true;
}
- return msg_sent;
}
/*
--
1.7.3.2.91.g446ac
- [Qemu-devel] [PATCH 0/6] pcie aer fixes, Michael S. Tsirkin, 2010/12/02
- [Qemu-devel] [PATCH 1/6] pci: untangle pci/msi dependency, Michael S. Tsirkin, 2010/12/02
- [Qemu-devel] [PATCH 3/6] pci/aer: remove dead code,
Michael S. Tsirkin <=
- [Qemu-devel] [PATCH 4/6] pci/aer: fix error injection, Michael S. Tsirkin, 2010/12/02
- [Qemu-devel] [PATCH 5/6] pci/aer: fix interrupt on config write, Michael S. Tsirkin, 2010/12/02
- [Qemu-devel] [PATCH 6/6] pci/aer: factor out common code, Michael S. Tsirkin, 2010/12/02
- [Qemu-devel] [PATCH 2/6] Makefile: make msix/msi depend on CONFIG_PCI, Michael S. Tsirkin, 2010/12/02