From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Cornelia Huck <cornelia.huck@de.ibm.com>,
Peter Maydell <peter.maydell@linaro.org>,
qemu-block@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com>,
Greg Kurz <gkurz@linux.vnet.ibm.com>
Subject: [Qemu-devel] [PULL 01/13] dataplane: fix cross-endian issues
Date: Tue, 7 Jul 2015 15:40:03 +0300 [thread overview]
Message-ID: <1436272760-29611-2-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1436272760-29611-1-git-send-email-mst@redhat.com>
From: Greg Kurz <gkurz@linux.vnet.ibm.com>
Accesses to vring_avail_event and vring_used_event must honor the queue
endianness.
This patch allows cross-endian setups to use dataplane (tested with ppc64
on ppc64le, and vice-versa).
Suggested-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
---
hw/virtio/dataplane/vring.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/hw/virtio/dataplane/vring.c b/hw/virtio/dataplane/vring.c
index 3589185..bed9b11 100644
--- a/hw/virtio/dataplane/vring.c
+++ b/hw/virtio/dataplane/vring.c
@@ -153,7 +153,8 @@ bool vring_should_notify(VirtIODevice *vdev, Vring *vring)
return true;
}
- return vring_need_event(vring_used_event(&vring->vr), new, old);
+ return vring_need_event(virtio_tswap16(vdev, vring_used_event(&vring->vr)),
+ new, old);
}
@@ -407,7 +408,8 @@ int vring_pop(VirtIODevice *vdev, Vring *vring,
/* On success, increment avail index. */
vring->last_avail_idx++;
if (virtio_has_feature(vdev, VIRTIO_RING_F_EVENT_IDX)) {
- vring_avail_event(&vring->vr) = vring->last_avail_idx;
+ vring_avail_event(&vring->vr) =
+ virtio_tswap16(vdev, vring->last_avail_idx);
}
return head;
--
MST
next prev parent reply other threads:[~2015-07-07 12:40 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-07 12:40 [Qemu-devel] [PULL 00/13] pc,virtio,pci: fixes and updates Michael S. Tsirkin
2015-07-07 12:40 ` Michael S. Tsirkin [this message]
2015-07-07 12:40 ` [Qemu-devel] [PULL 02/13] Revert "dataplane: allow virtio-1 devices" Michael S. Tsirkin
2015-07-07 12:40 ` [Qemu-devel] [PULL 03/13] acpi: split out ICH ACPI support Michael S. Tsirkin
2015-07-07 12:40 ` [Qemu-devel] [PULL 04/13] ich9: add TCO interface emulation Michael S. Tsirkin
2015-07-07 12:40 ` [Qemu-devel] [PULL 05/13] tests: add testcase for TCO watchdog emulation Michael S. Tsirkin
2015-07-07 12:40 ` [Qemu-devel] [PULL 06/13] ich9: implement strap SPKR pin logic Michael S. Tsirkin
2015-07-07 12:40 ` [Qemu-devel] [PULL 07/13] hw/i386/pc: factor out pc_cmos_init_floppy() Michael S. Tsirkin
2015-07-07 12:40 ` [Qemu-devel] [PULL 08/13] hw/i386/pc: reflect any FDC @ ioport 0x3f0 in the CMOS Michael S. Tsirkin
2015-07-07 12:40 ` [Qemu-devel] [PULL 09/13] hw/i386/pc: don't carry FDC from pc_basic_device_init() to pc_cmos_init() Michael S. Tsirkin
2015-07-07 12:40 ` [Qemu-devel] [PULL 10/13] virtio_net: reuse constants from linux Michael S. Tsirkin
2015-07-07 12:40 ` [Qemu-devel] [PULL 11/13] pci_regs.h: import " Michael S. Tsirkin
2015-07-07 12:40 ` [Qemu-devel] [PULL 12/13] pcie: Set the "link active" in the link status register Michael S. Tsirkin
2015-07-07 12:40 ` [Qemu-devel] [PULL 13/13] virtio: define virtio_pci_cfg_cap in header Michael S. Tsirkin
2015-07-07 16:18 ` [Qemu-devel] [PULL 00/13] pc,virtio,pci: fixes and updates Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1436272760-29611-2-git-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=cornelia.huck@de.ibm.com \
--cc=gkurz@linux.vnet.ibm.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).