From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=58409 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OHdwe-0006uR-7E
	for qemu-devel@nongnu.org; Thu, 27 May 2010 10:20:33 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <mst@redhat.com>) id 1OHdve-00086v-6Z
	for qemu-devel@nongnu.org; Thu, 27 May 2010 10:19:23 -0400
Received: from mx1.redhat.com ([209.132.183.28]:29317)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <mst@redhat.com>) id 1OHdvd-00086r-Ut
	for qemu-devel@nongnu.org; Thu, 27 May 2010 10:19:22 -0400
Date: Thu, 27 May 2010 17:15:07 +0300
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20100527141507.GE8287@redhat.com>
References: <20100527054037.GF31807@valinux.co.jp>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20100527054037.GF31807@valinux.co.jp>
Subject: [Qemu-devel] Re: [PATCH] msix: remove duplicated defines.
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Isaku Yamahata <yamahata@valinux.co.jp>
Cc: qemu-devel@nongnu.org

On Thu, May 27, 2010 at 02:40:37PM +0900, Isaku Yamahata wrote:
> remove defines which are already defined in pci_regs.h
> 
> Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>

Applied, thanks!

> ---
>  hw/msix.c |    8 --------
>  1 files changed, 0 insertions(+), 8 deletions(-)
> 
> diff --git a/hw/msix.c b/hw/msix.c
> index 2ca0900..1613bb4 100644
> --- a/hw/msix.c
> +++ b/hw/msix.c
> @@ -15,14 +15,6 @@
>  #include "msix.h"
>  #include "pci.h"
>  
> -/* Declaration from linux/pci_regs.h */
> -#define  PCI_CAP_ID_MSIX 0x11 /* MSI-X */
> -#define  PCI_MSIX_FLAGS 2     /* Table at lower 11 bits */
> -#define  PCI_MSIX_FLAGS_QSIZE	0x7FF
> -#define  PCI_MSIX_FLAGS_ENABLE	(1 << 15)
> -#define  PCI_MSIX_FLAGS_MASKALL	(1 << 14)
> -#define  PCI_MSIX_FLAGS_BIRMASK	(7 << 0)
> -
>  /* MSI-X capability structure */
>  #define MSIX_TABLE_OFFSET 4
>  #define MSIX_PBA_OFFSET 8
> -- 
> 1.6.6.1
>