From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54586) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzMDE-0002X1-Sp for qemu-devel@nongnu.org; Fri, 12 Dec 2014 04:08:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XzMD8-0006uj-Gy for qemu-devel@nongnu.org; Fri, 12 Dec 2014 04:08:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38506) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzMD8-0006uQ-7R for qemu-devel@nongnu.org; Fri, 12 Dec 2014 04:08:30 -0500 Date: Fri, 12 Dec 2014 11:08:21 +0200 From: "Michael S. Tsirkin" Message-ID: <20141212090821.GA8105@redhat.com> References: <1418374906-16358-1-git-send-email-cornelia.huck@de.ibm.com> <1418374906-16358-2-git-send-email-cornelia.huck@de.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1418374906-16358-2-git-send-email-cornelia.huck@de.ibm.com> Subject: Re: [Qemu-devel] [PATCH 1/1] virtio: fix feature bit checks List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Cornelia Huck Cc: Thomas Huth , qemu-devel@nongnu.org On Fri, Dec 12, 2014 at 10:01:46AM +0100, Cornelia Huck wrote: > Several places check against the feature bit number instead of against > the feature bit. Fix them. > > Reported-by: Thomas Huth > Signed-off-by: Cornelia Huck Cc: stable? > --- > hw/scsi/virtio-scsi.c | 2 +- > hw/virtio/dataplane/vring.c | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c > index ef48550..a44c410 100644 > --- a/hw/scsi/virtio-scsi.c > +++ b/hw/scsi/virtio-scsi.c > @@ -144,7 +144,7 @@ static int virtio_scsi_parse_req(VirtIOSCSIReq *req, > * > * TODO: always disable this workaround for virtio 1.0 devices. > */ > - if ((vdev->guest_features & VIRTIO_F_ANY_LAYOUT) == 0) { > + if ((vdev->guest_features & (1 << VIRTIO_F_ANY_LAYOUT)) == 0) { > req_size = req->elem.out_sg[0].iov_len; > resp_size = req->elem.in_sg[0].iov_len; > } > diff --git a/hw/virtio/dataplane/vring.c b/hw/virtio/dataplane/vring.c > index 61f6d83..78c6f45 100644 > --- a/hw/virtio/dataplane/vring.c > +++ b/hw/virtio/dataplane/vring.c > @@ -133,12 +133,12 @@ bool vring_should_notify(VirtIODevice *vdev, Vring *vring) > * interrupts. */ > smp_mb(); > > - if ((vdev->guest_features & VIRTIO_F_NOTIFY_ON_EMPTY) && > + if ((vdev->guest_features & (1 << VIRTIO_F_NOTIFY_ON_EMPTY)) && > unlikely(vring->vr.avail->idx == vring->last_avail_idx)) { > return true; > } > > - if (!(vdev->guest_features & VIRTIO_RING_F_EVENT_IDX)) { > + if (!(vdev->guest_features & (1 << VIRTIO_RING_F_EVENT_IDX))) { > return !(vring->vr.avail->flags & VRING_AVAIL_F_NO_INTERRUPT); > } > old = vring->signalled_used; > -- > 1.8.5.5