From patchwork Tue Feb 4 18:58:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 316731 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 81B462C0089 for ; Wed, 5 Feb 2014 06:23:46 +1100 (EST) Received: from localhost ([::1]:54237 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WAlEY-0004b4-BG for incoming@patchwork.ozlabs.org; Tue, 04 Feb 2014 14:00:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37679) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WAlDN-0003H0-6B for qemu-devel@nongnu.org; Tue, 04 Feb 2014 13:59:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WAlDD-00069Z-St for qemu-devel@nongnu.org; Tue, 04 Feb 2014 13:59:21 -0500 Received: from ssl.serverraum.org ([88.198.40.39]:46369) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WAlDD-00069S-Mn for qemu-devel@nongnu.org; Tue, 04 Feb 2014 13:59:11 -0500 Received: from localhost (localhost [127.0.0.1]) by ssl.serverraum.org (Postfix) with ESMTP id 1F9CD3F0C2; Tue, 4 Feb 2014 19:59:11 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at ssl.serverraum.org Received: from ssl.serverraum.org ([127.0.0.1]) by localhost (ssl.serverraum.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jUGv8X-HzaK2; Tue, 4 Feb 2014 19:59:11 +0100 (CET) Received: from thanatos.fritz.box (88-134-75-61-dynip.superkabel.de [88.134.75.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ssl.serverraum.org (Postfix) with ESMTPSA id 6CCE93F0BB; Tue, 4 Feb 2014 19:59:10 +0100 (CET) From: Michael Walle To: qemu-devel@nongnu.org Date: Tue, 4 Feb 2014 19:58:27 +0100 Message-Id: <1391540314-16141-6-git-send-email-michael@walle.cc> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1391540314-16141-1-git-send-email-michael@walle.cc> References: <1391540314-16141-1-git-send-email-michael@walle.cc> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 88.198.40.39 Cc: Peter Maydell , Michael Walle , Anthony Liguori , Paolo Bonzini Subject: [Qemu-devel] [PULL v5 05/12] milkymist-vgafb: swap pixel data in source buffer X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org In commit fc97bb5ba3e7239c0b6d24095df6784868dfebbf the lduw_raw() call was eliminated. But we are reading from the target buffer a 16-bit value, which is in big-endian format. Therefore, use lduw_be_p() to read the value. Cc: Paolo Bonzini Signed-off-by: Michael Walle --- hw/display/milkymist-vgafb_template.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/display/milkymist-vgafb_template.h b/hw/display/milkymist-vgafb_template.h index e0036e1..4883780 100644 --- a/hw/display/milkymist-vgafb_template.h +++ b/hw/display/milkymist-vgafb_template.h @@ -61,7 +61,7 @@ static void glue(draw_line_, BITS)(void *opaque, uint8_t *d, const uint8_t *s, uint8_t r, g, b; while (width--) { - memcpy(&rgb565, s, sizeof(rgb565)); + rgb565 = lduw_be_p(s); r = ((rgb565 >> 11) & 0x1f) << 3; g = ((rgb565 >> 5) & 0x3f) << 2; b = ((rgb565 >> 0) & 0x1f) << 3;