From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=38591 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1POI3N-00044t-EU for qemu-devel@nongnu.org; Thu, 02 Dec 2010 17:55:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1POI3M-0001gG-8B for qemu-devel@nongnu.org; Thu, 02 Dec 2010 17:55:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:15917) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1POI3M-0001gA-0E for qemu-devel@nongnu.org; Thu, 02 Dec 2010 17:55:04 -0500 Date: Fri, 3 Dec 2010 00:54:47 +0200 From: "Michael S. Tsirkin" Message-ID: <7ab56779a4dcd09712ff1045ca8dcd312faae435.1291330353.git.mst@redhat.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Subject: [Qemu-devel] [PATCH 6/6] pci/aer: factor out common code List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: yamahata@valinux.co.jp, qemu-devel@nongnu.org Same logic is used to assert interrupts and send msix messages, so add a static functin for this. Signed-off-by: Michael S. Tsirkin --- hw/pcie_aer.c | 27 +++++++++++++-------------- 1 files changed, 13 insertions(+), 14 deletions(-) diff --git a/hw/pcie_aer.c b/hw/pcie_aer.c index 1c513a7..ca4f517 100644 --- a/hw/pcie_aer.c +++ b/hw/pcie_aer.c @@ -273,6 +273,17 @@ static uint32_t pcie_aer_status_to_cmd(uint32_t status) return cmd; } +static void pcie_aer_root_notify(PCIDevice *dev) +{ + if (msix_enabled(dev)) { + msix_notify(dev, pcie_aer_root_get_vector(dev)); + } else if (msi_enabled(dev)) { + msi_notify(dev, pcie_aer_root_get_vector(dev)); + } else { + qemu_set_irq(dev->irq[dev->exp.aer_intx], 1); + } +} + /* * 6.2.6 Error Message Control * Figure 6-3 @@ -352,13 +363,7 @@ static void pcie_aer_msg_root_port(PCIDevice *dev, const PCIEAERMsg *msg) return; } - if (msix_enabled(dev)) { - msix_notify(dev, pcie_aer_root_get_vector(dev)); - } else if (msi_enabled(dev)) { - msi_notify(dev, pcie_aer_root_get_vector(dev)); - } else { - qemu_set_irq(dev->irq[dev->exp.aer_intx], 1); - } + pcie_aer_root_notify(dev); } /* @@ -768,13 +773,7 @@ void pcie_aer_root_write_config(PCIDevice *dev, return; } - if (msix_enabled(dev)) { - msix_notify(dev, pcie_aer_root_get_vector(dev)); - } else if (msi_enabled(dev)) { - msi_notify(dev, pcie_aer_root_get_vector(dev)); - } else { - assert(0); - } + pcie_aer_root_notify(dev); } static const VMStateDescription vmstate_pcie_aer_err = { -- 1.7.3.2.91.g446ac