Patchwork Endian fixes for virtfs

login
register
mail settings
Submitter Benjamin Herrenschmidt
Date Jan. 13, 2012, 6:32 a.m.
Message ID <1326436334.26116.1.camel@pasglop>
Download mbox | patch
Permalink /patch/135722/
State New
Headers show

Comments

Benjamin Herrenschmidt - Jan. 13, 2012, 6:32 a.m.
This may not fix all of the endian problems in there but it's
enough to make it work with some SLOF version I'm working on.

Maybe more when I get the Linux client attached...

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
 hw/9pfs/virtio-9p.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

Patch

diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c
index e6ba6ba..08445a1 100644
--- a/hw/9pfs/virtio-9p.c
+++ b/hw/9pfs/virtio-9p.c
@@ -1349,7 +1349,9 @@  static void v9fs_open(void *opaque)
     if (s->proto_version == V9FS_PROTO_2000L) {
         err = pdu_unmarshal(pdu, offset, "dd", &fid, &mode);
     } else {
-        err = pdu_unmarshal(pdu, offset, "db", &fid, &mode);
+        uint8_t modebyte;
+        err = pdu_unmarshal(pdu, offset, "db", &fid, &modebyte);
+        mode = modebyte;
     }
     if (err < 0) {
         goto out_nofid;
@@ -3261,9 +3263,9 @@  void handle_9p_output(VirtIODevice *vdev, VirtQueue *vq)
 
         ptr = pdu->elem.out_sg[0].iov_base;
 
-        memcpy(&pdu->size, ptr, 4);
+        pdu->size = le32_to_cpu(*(uint32_t *)ptr);
         pdu->id = ptr[4];
-        memcpy(&pdu->tag, ptr + 5, 2);
+        pdu->tag = le16_to_cpu(*(uint16_t *)(ptr + 5));
         qemu_co_queue_init(&pdu->complete);
         submit_pdu(s, pdu);
     }