From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:38831) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S0ixZ-0008Vk-Kl for qemu-devel@nongnu.org; Thu, 23 Feb 2012 19:24:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S0ixS-0004SI-Gl for qemu-devel@nongnu.org; Thu, 23 Feb 2012 19:24:29 -0500 Received: from ozlabs.org ([203.10.76.45]:58130) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S0ixS-0004Rc-10 for qemu-devel@nongnu.org; Thu, 23 Feb 2012 19:24:22 -0500 From: David Gibson Date: Fri, 24 Feb 2012 11:23:30 +1100 Message-Id: <1330043012-30556-5-git-send-email-david@gibson.dropbear.id.au> In-Reply-To: <1330043012-30556-1-git-send-email-david@gibson.dropbear.id.au> References: <1330043012-30556-1-git-send-email-david@gibson.dropbear.id.au> Subject: [Qemu-devel] [PATCH 4/6] Endian fixes for virtfs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: David Gibson , qemu-devel@nongnu.org, "Aneesh Kumar K.V" From: Benjamin Herrenschmidt This patch fixes several endian bugs in virtfs. Cc: Aneesh Kumar K.V Signed-off-by: Benjamin Herrenschmidt Signed-off-by: David Gibson --- 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); } -- 1.7.9