From patchwork Tue Aug 6 07:44:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 264891 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 830FF2C07C5 for ; Tue, 6 Aug 2013 17:46:16 +1000 (EST) Received: from localhost ([::1]:57870 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V6byA-0006qj-D5 for incoming@patchwork.ozlabs.org; Tue, 06 Aug 2013 03:46:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35227) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V6bxY-0006iB-7P for qemu-devel@nongnu.org; Tue, 06 Aug 2013 03:45:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V6bxR-0004bv-2s for qemu-devel@nongnu.org; Tue, 06 Aug 2013 03:45:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:28052) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V6bxQ-0004bi-RO for qemu-devel@nongnu.org; Tue, 06 Aug 2013 03:45:29 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r767jSQ8017137 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 6 Aug 2013 03:45:28 -0400 Received: from T430s.nay.redhat.com ([10.66.6.13]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r767j9bx031719; Tue, 6 Aug 2013 03:45:24 -0400 From: Fam Zheng To: qemu-devel@nongnu.org Date: Tue, 6 Aug 2013 15:44:47 +0800 Message-Id: <1375775095-19456-3-git-send-email-famz@redhat.com> In-Reply-To: <1375775095-19456-1-git-send-email-famz@redhat.com> References: <1375775095-19456-1-git-send-email-famz@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, pmatouse@redhat.com, jcody@redhat.com, armbru@redhat.com, stefanha@redhat.com, famz@redhat.com, asias@redhat.com, areis@redhat.com Subject: [Qemu-devel] [PATCH v4 02/10] vmdk: Make VMDK3Header and VmdkGrainMarker QEMU_PACKED 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 It's best to make it consistent that all on disk structures are QEMU_PACKED. Signed-off-by: Fam Zheng --- block/vmdk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index f42657b..8b86fe9 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -62,7 +62,7 @@ typedef struct { uint32_t cylinders; uint32_t heads; uint32_t sectors_per_track; -} VMDK3Header; +} QEMU_PACKED VMDK3Header; typedef struct { uint32_t version; @@ -131,7 +131,7 @@ typedef struct VmdkGrainMarker { uint64_t lba; uint32_t size; uint8_t data[0]; -} VmdkGrainMarker; +} QEMU_PACKED VmdkGrainMarker; enum { MARKER_END_OF_STREAM = 0,