From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:43260) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S1i9y-0002hW-7Y for qemu-devel@nongnu.org; Sun, 26 Feb 2012 12:45:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S1i9v-00059h-B4 for qemu-devel@nongnu.org; Sun, 26 Feb 2012 12:45:22 -0500 Received: from e23smtp06.au.ibm.com ([202.81.31.148]:47903) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S1i9u-00059H-PR for qemu-devel@nongnu.org; Sun, 26 Feb 2012 12:45:19 -0500 Received: from /spool/local by e23smtp06.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sun, 26 Feb 2012 17:41:10 +1000 Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q1QHiwb81290408 for ; Mon, 27 Feb 2012 04:44:58 +1100 Received: from d23av04.au.ibm.com (loopback [127.0.0.1]) by d23av04.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q1QHiwtf029604 for ; Mon, 27 Feb 2012 04:44:58 +1100 From: "Aneesh Kumar K.V" Date: Sun, 26 Feb 2012 23:14:48 +0530 Message-Id: <1330278288-25483-3-git-send-email-aneesh.kumar@linux.vnet.ibm.com> In-Reply-To: <1330278288-25483-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> References: <1330278288-25483-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 2/2] hw/9pfs: Endian fixes for virtfs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, "Aneesh Kumar K.V" , David Gibson 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 Signed-off-by: Aneesh Kumar K.V --- 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