diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-27 11:19:27 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-27 11:19:27 -0600 |
| commit | b55c952aea6de024bf1a06357b49367fba045443 (patch) | |
| tree | 63574bbaa02ba71451712908253280a8a9ef8c22 /hw | |
| parent | 90d7416ab13113ccd3891435eea8715c5f503460 (diff) | |
| parent | 67d6fa53629f1eb3401974d740310c10e03fa1c9 (diff) | |
| download | qemu-b55c952aea6de024bf1a06357b49367fba045443.zip qemu-b55c952aea6de024bf1a06357b49367fba045443.tar.gz qemu-b55c952aea6de024bf1a06357b49367fba045443.tar.bz2 | |
Merge remote-tracking branch 'aneesh/for-upstream' into staging
* aneesh/for-upstream:
hw/9pfs: Endian fixes for virtfs
./configure: add option for disabling VirtFS
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/9pfs/virtio-9p.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c index a72ffc3..c633fb9 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; @@ -3260,9 +3262,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); } |