[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATTCH v2 5/6] pci/aer: remove dead code
From: |
Isaku Yamahata |
Subject: |
[Qemu-devel] [PATTCH v2 5/6] pci/aer: remove dead code |
Date: |
Wed, 8 Dec 2010 17:46:27 +0900 |
From: Michael S. Tsirkin <address@hidden>
Remove some unused variables and return values.
Signed-off-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Isaku Yamahata <address@hidden>
---
changes v1 -> v2:
- reorder
---
hw/pcie_aer.c | 25 ++-----------------------
1 files changed, 2 insertions(+), 23 deletions(-)
diff --git a/hw/pcie_aer.c b/hw/pcie_aer.c
index 389e9d5..0fb21ab 100644
--- a/hw/pcie_aer.c
+++ b/hw/pcie_aer.c
@@ -274,29 +274,21 @@ static uint32_t pcie_aer_status_to_cmd(uint32_t status)
}
/*
- * 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, prev_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);
prev_status = root_status = pci_get_long(aer_cap + PCI_ERR_ROOT_STATUS);
- msi_trigger = false;
if (cmd & PCI_COMMAND_SERR) {
/* System Error.
@@ -315,25 +307,14 @@ static bool pcie_aer_msg_root_port(PCIDevice *dev, const
PCIEAERMsg *msg)
if (root_status & PCI_ERR_ROOT_COR_RCV) {
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);
}
root_status |= PCI_ERR_ROOT_COR_RCV;
break;
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;
}
@@ -360,10 +341,9 @@ static bool pcie_aer_msg_root_port(PCIDevice *dev, const
PCIEAERMsg *msg)
if (!(root_cmd & msg->severity) ||
(pcie_aer_status_to_cmd(prev_status) & root_cmd)) {
/* Condition is not being set or was already true so nothing to do. */
- return msg_sent;
+ return;
}
- msg_sent = true;
if (msix_enabled(dev)) {
msix_notify(dev, pcie_aer_root_get_vector(dev));
} else if (msi_enabled(dev)) {
@@ -371,7 +351,6 @@ static bool pcie_aer_msg_root_port(PCIDevice *dev, const
PCIEAERMsg *msg)
} else {
qemu_set_irq(dev->irq[dev->exp.aer_intx], 1);
}
- return msg_sent;
}
/*
--
1.7.1.1
- [Qemu-devel] [PATTCH v2 0/6] pcie aer fixes, Isaku Yamahata, 2010/12/08
- [Qemu-devel] [PATTCH v2 4/6] pci/aer: fix interrupt on config write, Isaku Yamahata, 2010/12/08
- [Qemu-devel] [PATTCH v2 2/6] Makefile: make msix/msi depend on CONFIG_PCI, Isaku Yamahata, 2010/12/08
- [Qemu-devel] [PATTCH v2 5/6] pci/aer: remove dead code,
Isaku Yamahata <=
- [Qemu-devel] [PATTCH v2 6/6] pci/aer: factor out common code, Isaku Yamahata, 2010/12/08
- [Qemu-devel] [PATTCH v2 3/6] pci/aer: fix error injection, Isaku Yamahata, 2010/12/08
- [Qemu-devel] [PATTCH v2 1/6] pci: untangle pci/msi dependency, Isaku Yamahata, 2010/12/08
- [Qemu-devel] Re: [PATTCH v2 0/6] pcie aer fixes, Michael S. Tsirkin, 2010/12/09