From patchwork Sat Jan 1 20:50:34 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jarno X-Patchwork-Id: 77153 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C97B8B70D4 for ; Sun, 2 Jan 2011 07:53:17 +1100 (EST) Received: from localhost ([127.0.0.1]:52667 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PZ8Rv-0007UJ-7Q for incoming@patchwork.ozlabs.org; Sat, 01 Jan 2011 15:53:15 -0500 Received: from [140.186.70.92] (port=47121 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PZ8Pg-0006cq-Kq for qemu-devel@nongnu.org; Sat, 01 Jan 2011 15:50:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PZ8Pf-0003fk-Fe for qemu-devel@nongnu.org; Sat, 01 Jan 2011 15:50:56 -0500 Received: from hall.aurel32.net ([88.191.126.93]:57518) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PZ8Pf-0003ea-Ay for qemu-devel@nongnu.org; Sat, 01 Jan 2011 15:50:55 -0500 Received: from farad.aurel32.net ([82.232.2.251] helo=volta.aurel32.net) by hall.aurel32.net with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1PZ8PW-0006Wq-HB; Sat, 01 Jan 2011 21:50:46 +0100 Received: from aurel32 by volta.aurel32.net with local (Exim 4.72) (envelope-from ) id 1PZ8PU-0006xN-OP; Sat, 01 Jan 2011 21:50:44 +0100 From: Aurelien Jarno To: qemu-devel@nongnu.org Date: Sat, 1 Jan 2011 21:50:34 +0100 Message-Id: <1293915034-26391-2-git-send-email-aurelien@aurel32.net> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1293915034-26391-1-git-send-email-aurelien@aurel32.net> References: <1293915034-26391-1-git-send-email-aurelien@aurel32.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: Kevin Wolf , Aurelien Jarno Subject: [Qemu-devel] [PATCH 2/2] qcow2: fix unaligned access X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org cpu_to_be64w() is called with an obviously non-aligned pointer. Use cpu_to_be64wu() instead. It fixes unaligned accesses errors on IA64 hosts. Cc: Kevin Wolf Signed-off-by: Aurelien Jarno --- block/qcow2-cluster.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index 6928c63..c3ef550 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -81,7 +81,7 @@ int qcow2_grow_l1_table(BlockDriverState *bs, int min_size, bool exact_size) /* set new table */ BLKDBG_EVENT(bs->file, BLKDBG_L1_GROW_ACTIVATE_TABLE); cpu_to_be32w((uint32_t*)data, new_l1_size); - cpu_to_be64w((uint64_t*)(data + 4), new_l1_table_offset); + cpu_to_be64wu((uint64_t*)(data + 4), new_l1_table_offset); ret = bdrv_pwrite_sync(bs->file, offsetof(QCowHeader, l1_size), data,sizeof(data)); if (ret < 0) { goto fail;