From patchwork Mon Jun 4 14:56:01 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 162813 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7EFE4B6EE7 for ; Tue, 5 Jun 2012 00:56:20 +1000 (EST) Received: from localhost ([::1]:39108 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbYhe-0006VX-G8 for incoming@patchwork.ozlabs.org; Mon, 04 Jun 2012 10:56:18 -0400 Received: from eggs.gnu.org ([208.118.235.92]:45150) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbYhW-0006VF-NJ for qemu-devel@nongnu.org; Mon, 04 Jun 2012 10:56:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SbYhP-0002vJ-Oj for qemu-devel@nongnu.org; Mon, 04 Jun 2012 10:56:10 -0400 Received: from david.siemens.de ([192.35.17.14]:32448) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbYhP-0002tH-EM for qemu-devel@nongnu.org; Mon, 04 Jun 2012 10:56:03 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by david.siemens.de (8.13.6/8.13.6) with ESMTP id q54Eu1iV028981; Mon, 4 Jun 2012 16:56:01 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id q54Eu1a6021049; Mon, 4 Jun 2012 16:56:01 +0200 Message-ID: <4FCCCC81.4090504@siemens.com> Date: Mon, 04 Jun 2012 16:56:01 +0200 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: "Michael S. Tsirkin" 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: qemu-devel Subject: [Qemu-devel] [PATCH] 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 user in sight. 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 ded3c55..2b86cdf 100644 --- a/hw/msix.c +++ b/hw/msix.c @@ -72,7 +72,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) @@ -382,13 +381,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 50aee82..e5a488d 100644 --- a/hw/msix.h +++ b/hw/msix.h @@ -21,8 +21,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); - int msix_vector_use(PCIDevice *dev, unsigned vector); void msix_vector_unuse(PCIDevice *dev, unsigned vector); void msix_unuse_all_vectors(PCIDevice *dev); diff --git a/hw/pci.h b/hw/pci.h index c3cacce..3d534e7 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -226,8 +226,6 @@ struct PCIDevice { MemoryRegion msix_mmio; /* Reference-count for entries actually in use by driver. */ unsigned *msix_entry_used; - /* Region including the MSI-X table */ - uint32_t msix_bar_size; /* MSIX function mask set or MSIX disabled */ bool msix_function_masked; /* Version id needed for VMState */