From patchwork Wed Jun 8 10:26:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 99403 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 63F62B7009 for ; Wed, 8 Jun 2011 20:41:31 +1000 (EST) Received: from localhost ([::1]:57712 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QUGCW-0001Ft-2V for incoming@patchwork.ozlabs.org; Wed, 08 Jun 2011 06:41:28 -0400 Received: from eggs.gnu.org ([140.186.70.92]:53212) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QUFyN-0006aP-KZ for qemu-devel@nongnu.org; Wed, 08 Jun 2011 06:26:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QUFyK-0003gm-Gq for qemu-devel@nongnu.org; Wed, 08 Jun 2011 06:26:51 -0400 Received: from goliath.siemens.de ([192.35.17.28]:27922) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QUFyK-0003fs-7b for qemu-devel@nongnu.org; Wed, 08 Jun 2011 06:26:48 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by goliath.siemens.de (8.13.6/8.13.6) with ESMTP id p58AQkkO002274; Wed, 8 Jun 2011 12:26:46 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p58AQjw7017096; Wed, 8 Jun 2011 12:26:46 +0200 From: Jan Kiszka To: "Michael S. Tsirkin" Date: Wed, 8 Jun 2011 12:26:45 +0200 Message-Id: <5923157ff7b0b009ed57d167e5ff9a58181befec.1307528800.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 1.7.1 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.28 Cc: qemu-devel Subject: [Qemu-devel] [PATCH 7/7] msi: Move PCI_MSI_PENDING_32/64 into pci_regs.h 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 Signed-off-by: Jan Kiszka --- hw/msi.c | 4 ---- hw/pci_regs.h | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/msi.c b/hw/msi.c index 09bcdd1..edd3e5b 100644 --- a/hw/msi.c +++ b/hw/msi.c @@ -21,10 +21,6 @@ #include "msi.h" #include "range.h" -/* Eventually those constants should go to Linux pci_regs.h */ -#define PCI_MSI_PENDING_32 0x10 -#define PCI_MSI_PENDING_64 0x14 - /* PCI_MSI_ADDRESS_LO */ #define PCI_MSI_ADDRESS_LO_MASK (~0x3) diff --git a/hw/pci_regs.h b/hw/pci_regs.h index c17c22f..002ed2e 100644 --- a/hw/pci_regs.h +++ b/hw/pci_regs.h @@ -297,8 +297,10 @@ #define PCI_MSI_ADDRESS_HI 8 /* Upper 32 bits (if PCI_MSI_FLAGS_64BIT set) */ #define PCI_MSI_DATA_32 8 /* 16 bits of data for 32-bit devices */ #define PCI_MSI_MASK_32 12 /* Mask bits register for 32-bit devices */ +#define PCI_MSI_PENDING_32 16 /* Pending bits register for 32-bit devices */ #define PCI_MSI_DATA_64 12 /* 16 bits of data for 64-bit devices */ #define PCI_MSI_MASK_64 16 /* Mask bits register for 64-bit devices */ +#define PCI_MSI_PENDING_64 20 /* Pending bits register for 64-bit devices */ /* MSI-X registers */ #define PCI_MSIX_CTRL 2 /* Message control */