From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:41883)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1SbYaM-00037Z-1N
	for qemu-devel@nongnu.org; Mon, 04 Jun 2012 10:48:47 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1SbYaF-00082l-Ku
	for qemu-devel@nongnu.org; Mon, 04 Jun 2012 10:48:45 -0400
Received: from mx1.redhat.com ([209.132.183.28]:7611)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1SbYaE-00082N-S5
	for qemu-devel@nongnu.org; Mon, 04 Jun 2012 10:48:39 -0400
Date: Mon, 4 Jun 2012 17:48:37 +0300
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20120604144837.GA30538@redhat.com>
References: <cover.1336747349.git.jan.kiszka@siemens.com>
	<b036a21005fbd6f21c89940ffd325db3dcb7ae66.1336747349.git.jan.kiszka@siemens.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <b036a21005fbd6f21c89940ffd325db3dcb7ae66.1336747349.git.jan.kiszka@siemens.com>
Subject: Re: [Qemu-devel] [PATCH v3 8/8] msi: Use msi/msix_present more
	consistently
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/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: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Jan Kiszka <jan.kiszka@siemens.com>
Cc: qemu-devel <qemu-devel@nongnu.org>

On Fri, May 11, 2012 at 11:42:41AM -0300, Jan Kiszka wrote:
> Replace some open-coded msi/msix_present checks.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

This last one doesn't apply but I don't expect this blocks
anything. Applied 1-7 for now.

> ---
>  hw/msi.c  |    2 +-
>  hw/msix.c |   13 ++++++++-----
>  2 files changed, 9 insertions(+), 6 deletions(-)
> 
> diff --git a/hw/msi.c b/hw/msi.c
> index 556c7c4..5233204 100644
> --- a/hw/msi.c
> +++ b/hw/msi.c
> @@ -175,7 +175,7 @@ void msi_uninit(struct PCIDevice *dev)
>      uint16_t flags;
>      uint8_t cap_size;
>  
> -    if (!(dev->cap_present & QEMU_PCI_CAP_MSI)) {
> +    if (!msi_present(dev)) {
>          return;
>      }
>      flags = pci_get_word(dev->config + msi_flags_off(dev));
> diff --git a/hw/msix.c b/hw/msix.c
> index 84915d8..7c314bb 100644
> --- a/hw/msix.c
> +++ b/hw/msix.c
> @@ -285,8 +285,9 @@ static void msix_free_irq_entries(PCIDevice *dev)
>  /* Clean up resources for the device. */
>  int msix_uninit(PCIDevice *dev, MemoryRegion *bar)
>  {
> -    if (!(dev->cap_present & QEMU_PCI_CAP_MSIX))
> +    if (!msix_present(dev)) {
>          return 0;
> +    }
>      pci_del_capability(dev, PCI_CAP_ID_MSIX, MSIX_CAP_LENGTH);
>      dev->msix_cap = 0;
>      msix_free_irq_entries(dev);
> @@ -305,7 +306,7 @@ void msix_save(PCIDevice *dev, QEMUFile *f)
>  {
>      unsigned n = dev->msix_entries_nr;
>  
> -    if (!(dev->cap_present & QEMU_PCI_CAP_MSIX)) {
> +    if (!msix_present(dev)) {
>          return;
>      }
>  
> @@ -318,7 +319,7 @@ void msix_load(PCIDevice *dev, QEMUFile *f)
>  {
>      unsigned n = dev->msix_entries_nr;
>  
> -    if (!(dev->cap_present & QEMU_PCI_CAP_MSIX)) {
> +    if (!msix_present(dev)) {
>          return;
>      }
>  
> @@ -370,8 +371,9 @@ void msix_notify(PCIDevice *dev, unsigned vector)
>  
>  void msix_reset(PCIDevice *dev)
>  {
> -    if (!(dev->cap_present & QEMU_PCI_CAP_MSIX))
> +    if (!msix_present(dev)) {
>          return;
> +    }
>      msix_free_irq_entries(dev);
>      dev->config[dev->msix_cap + MSIX_CONTROL_OFFSET] &=
>  	    ~dev->wmask[dev->msix_cap + MSIX_CONTROL_OFFSET];
> @@ -410,7 +412,8 @@ void msix_vector_unuse(PCIDevice *dev, unsigned vector)
>  
>  void msix_unuse_all_vectors(PCIDevice *dev)
>  {
> -    if (!(dev->cap_present & QEMU_PCI_CAP_MSIX))
> +    if (!msix_present(dev)) {
>          return;
> +    }
>      msix_free_irq_entries(dev);
>  }
> -- 
> 1.7.3.4