From patchwork Mon Oct 17 09:28:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 120171 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1784DB6FA2 for ; Mon, 17 Oct 2011 22:19:40 +1100 (EST) Received: from localhost ([::1]:53753 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RFjWi-0000cX-7M for incoming@patchwork.ozlabs.org; Mon, 17 Oct 2011 05:30:32 -0400 Received: from eggs.gnu.org ([140.186.70.92]:33142) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RFjUt-0005MT-HB for qemu-devel@nongnu.org; Mon, 17 Oct 2011 05:28:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RFjUn-0004NM-8x for qemu-devel@nongnu.org; Mon, 17 Oct 2011 05:28:39 -0400 Received: from david.siemens.de ([192.35.17.14]:19136) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RFjUm-0004MS-SF for qemu-devel@nongnu.org; Mon, 17 Oct 2011 05:28:33 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by david.siemens.de (8.13.6/8.13.6) with ESMTP id p9H9SVQ9023828; Mon, 17 Oct 2011 11:28:32 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p9H9SKVv023511; Mon, 17 Oct 2011 11:28:31 +0200 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Date: Mon, 17 Oct 2011 11:28:15 +0200 Message-Id: <898a4d0f28ce539f2f4480bea4a1701ec951084d.1318843694.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 192.35.17.14 Cc: Alex Williamson , qemu-devel@nongnu.org, kvm@vger.kernel.org, "Michael S. Tsirkin" Subject: [Qemu-devel] [RFC][PATCH 41/45] msix: Drop unused msix_bar_size X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org No use for it, even more after the upcoming API changes. Signed-off-by: Jan Kiszka --- hw/msix.c | 8 -------- hw/msix.h | 2 -- hw/pci.h | 2 -- 3 files changed, 0 insertions(+), 12 deletions(-) diff --git a/hw/msix.c b/hw/msix.c index 5f0fa6a..bccd8b1 100644 --- a/hw/msix.c +++ b/hw/msix.c @@ -83,7 +83,6 @@ static int msix_add_config(struct PCIDevice *pdev, unsigned short nentries, new_size = bar_size * 2; } - pdev->msix_bar_size = new_size; config_offset = pci_add_capability(pdev, PCI_CAP_ID_MSIX, 0, MSIX_CAP_LENGTH); if (config_offset < 0) { @@ -374,13 +373,6 @@ int msix_enabled(PCIDevice *dev) MSIX_ENABLE_MASK); } -/* Size of bar where MSI-X table resides, or 0 if MSI-X not supported. */ -uint32_t msix_bar_size(PCIDevice *dev) -{ - return (dev->cap_present & QEMU_PCI_CAP_MSIX) ? - dev->msix_bar_size : 0; -} - /* Send an MSI-X message */ void msix_notify(PCIDevice *dev, unsigned vector) { diff --git a/hw/msix.h b/hw/msix.h index 9cd54cf..dfc6087 100644 --- a/hw/msix.h +++ b/hw/msix.h @@ -19,8 +19,6 @@ void msix_load(PCIDevice *dev, QEMUFile *f); int msix_enabled(PCIDevice *dev); int msix_present(PCIDevice *dev); -uint32_t msix_bar_size(PCIDevice *dev); - void msix_clear_vector(PCIDevice *dev, unsigned vector); void msix_clear_all_vectors(PCIDevice *dev); diff --git a/hw/pci.h b/hw/pci.h index 266fe34..e2be271 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -178,8 +178,6 @@ struct PCIDevice { uint8_t *msix_table_page; /* MMIO index used to map MSIX table and pending bit entries. */ MemoryRegion msix_mmio; - /* Region including the MSI-X table */ - uint32_t msix_bar_size; /* Version id needed for VMState */ int32_t version_id;