[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/16] virtio: fix feature bit checks
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 09/16] virtio: fix feature bit checks |
Date: |
Tue, 27 Jan 2015 15:14:18 +0200 |
From: Cornelia Huck <address@hidden>
Several places check against the feature bit number instead of against
the feature bit. Fix them.
Cc: address@hidden
Reported-by: Thomas Huth <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
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 b06dd39..9e2c718 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;
--
MST
- [Qemu-devel] [PULL 02/16] Add some trace calls to pci.c., (continued)
- [Qemu-devel] [PULL 02/16] Add some trace calls to pci.c., Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 01/16] ich9: add disable_s3, disable_s4, s4_val properties, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 05/16] acpi-test: update expected DSDT, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 06/16] acpi: update generated hex files, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 04/16] pc: acpi: fix WindowsXP BSOD when memory hotplug is enabled, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 14/16] pc: Fix DIMMs capacity calculation, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 15/16] pc-dimm: Make pc_existing_dimms_capacity global, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 16/16] pc-dimm: Add Error argument to pc_existing_dimms_capacity, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 11/16] bios-linker-loader: move source to common location, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 12/16] smbios: Fix dimm size calculation when RAM is multiple of 16GB, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 09/16] virtio: fix feature bit checks,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 03/16] pci: Split pcie_host_mmcfg_map(), Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 13/16] smbios: Don't report unknown CPU speed (fix SVVP regression), Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 10/16] bios-linker-loader: move header to common location, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 07/16] acpi: build_append_nameseg(): add padding if necessary, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 08/16] bios-tables-test: split piix4 and q35 tests, Michael S. Tsirkin, 2015/01/27
- Re: [Qemu-devel] [PULL 00/16] pci, pc, virtio fixes and cleanups, Peter Maydell, 2015/01/27