From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:40182) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7QiS-0007Kb-SB for qemu-devel@nongnu.org; Tue, 13 Mar 2012 08:20:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S7QiE-0000xa-PE for qemu-devel@nongnu.org; Tue, 13 Mar 2012 08:20:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34166) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7QiE-0000xH-Hu for qemu-devel@nongnu.org; Tue, 13 Mar 2012 08:20:22 -0400 From: Gerd Hoffmann Date: Tue, 13 Mar 2012 13:20:11 +0100 Message-Id: <1331641211-20077-15-git-send-email-kraxel@redhat.com> In-Reply-To: <1331641211-20077-1-git-send-email-kraxel@redhat.com> References: <1331641211-20077-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 14/14] Endian fix an assertion in usb-msd List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffman , David Gibson From: Benjamin Herrenschmidt This fixes a broken endian assumption in an assertion in usb-msd. Cc: Gerd Hoffman Signed-off-by: Benjamin Herrenschmidt Signed-off-by: David Gibson Signed-off-by: Gerd Hoffmann --- hw/usb/dev-storage.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c index 6ffaf70..bdbe7bd 100644 --- a/hw/usb/dev-storage.c +++ b/hw/usb/dev-storage.c @@ -193,9 +193,9 @@ static void usb_msd_send_status(MSDState *s, USBPacket *p) int len; DPRINTF("Command status %d tag 0x%x, len %zd\n", - s->csw.status, s->csw.tag, p->iov.size); + s->csw.status, le32_to_cpu(s->csw.tag), p->iov.size); - assert(s->csw.sig == 0x53425355); + assert(s->csw.sig == cpu_to_le32(0x53425355)); len = MIN(sizeof(s->csw), p->iov.size); usb_packet_copy(p, &s->csw, len); memset(&s->csw, 0, sizeof(s->csw)); @@ -233,7 +233,7 @@ static void usb_msd_command_complete(SCSIRequest *req, uint32_t status, size_t r s->csw.sig = cpu_to_le32(0x53425355); s->csw.tag = cpu_to_le32(req->tag); - s->csw.residue = s->residue; + s->csw.residue = cpu_to_le32(s->residue); s->csw.status = status != 0; if (s->packet) { -- 1.7.1