From: Juan Quintela <quintela@redhat.com>
In-Reply-To: <20100617151502.9916.3597.stgit@localhost.localdomain> (Alex
	Williamson's message of "Thu, 17 Jun 2010 09:15:02 -0600")
References: <20100617151502.9916.3597.stgit@localhost.localdomain>
Date: Thu, 17 Jun 2010 18:40:01 +0200
Message-ID: <m3sk4lliji.fsf@trasno.mitica>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Subject: [Qemu-devel] Re: [PATCH] virtio-pci: fix bus master bug setting on
	load
To: Alex Williamson <alex.williamson@redhat.com>
Cc: amit.shah@redhat.com, mst@redhat.com, qemu-devel@nongnu.org, agraf@suse.de

Alex Williamson <alex.williamson@redhat.com> 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: Juan Quintela <quintela@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;
>      }