| Message ID | 20100617151502.9916.3597.stgit@localhost.localdomain |
|---|---|
| State | New |
| Headers | show |
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; > }
On (Thu) Jun 17 2010 [09:15:02], 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: Amit Shah <amit.shah@redhat.com> Amit
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> > --- > > 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) && > Phew - that's an evil one. Thanks for the catch! Acked-by: Alexander Graf <agraf@suse.de> Alex
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; > }
On 06/17/2010 10:15 AM, 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> > Applied. Thanks. Regards, Anthony Liguori > --- > > 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; > } > > > >
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; }
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> --- hw/virtio-pci.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)