From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=42614 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OPH21-0005qI-08
	for qemu-devel@nongnu.org; Thu, 17 Jun 2010 11:29:30 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <mst@redhat.com>) id 1OPH1z-0001Vn-CL
	for qemu-devel@nongnu.org; Thu, 17 Jun 2010 11:29:28 -0400
Received: from mx1.redhat.com ([209.132.183.28]:27753)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <mst@redhat.com>) id 1OPH1z-0001VY-2C
	for qemu-devel@nongnu.org; Thu, 17 Jun 2010 11:29:27 -0400
Date: Thu, 17 Jun 2010 18:24:31 +0300
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20100617152429.GA3714@redhat.com>
References: <20100617151502.9916.3597.stgit@localhost.localdomain>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20100617151502.9916.3597.stgit@localhost.localdomain>
Subject: [Qemu-devel] Re: [PATCH] virtio-pci: fix bus master bug setting on
	load
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: Alex Williamson <alex.williamson@redhat.com>
Cc: amit.shah@redhat.com, qemu-devel@nongnu.org, agraf@suse.de

On Thu, Jun 17, 2010 at 09:15:02AM -0600, Alex Williamson wrote:
> The comment suggests we're checking for the driver in the ready
> state and bus master disabled, but the code is checking that it's
> not in the ready state.
> 
> Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
> Found-by: Amit Shah <amit.shah@redhat.com>

Acked-by: Michael S. Tsirkin <mst@redhat.com>

> ---
> 
>  hw/virtio-pci.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
> index e101fa0..7a86a81 100644
> --- a/hw/virtio-pci.c
> +++ b/hw/virtio-pci.c
> @@ -155,7 +155,7 @@ static int virtio_pci_load_config(void * opaque, QEMUFile *f)
>  
>      /* Try to find out if the guest has bus master disabled, but is
>         in ready state. Then we have a buggy guest OS. */
> -    if (!(proxy->vdev->status & VIRTIO_CONFIG_S_DRIVER_OK) &&
> +    if ((proxy->vdev->status & VIRTIO_CONFIG_S_DRIVER_OK) &&
>          !(proxy->pci_dev.config[PCI_COMMAND] & PCI_COMMAND_MASTER)) {
>          proxy->bugs |= VIRTIO_PCI_BUG_BUS_MASTER;
>      }