From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MLdNP-0003TQ-6i for qemu-devel@nongnu.org; Tue, 30 Jun 2009 09:27:59 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MLdNI-0003Mp-UC for qemu-devel@nongnu.org; Tue, 30 Jun 2009 09:27:58 -0400 Received: from [199.232.76.173] (port=46034 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MLdNI-0003Md-N8 for qemu-devel@nongnu.org; Tue, 30 Jun 2009 09:27:52 -0400 Received: from va3ehsobe005.messaging.microsoft.com ([216.32.180.15]:21176 helo=VA3EHSOBE006.bigfish.com) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_ARCFOUR_MD5:16) (Exim 4.60) (envelope-from ) id 1MLd9X-0007T6-AD for qemu-devel@nongnu.org; Tue, 30 Jun 2009 09:13:39 -0400 Received: from mail112-va3 (localhost.localdomain [127.0.0.1]) by mail112-va3-R.bigfish.com (Postfix) with ESMTP id 96A1CD401BD for ; Tue, 30 Jun 2009 13:13:32 +0000 (UTC) Received: from svlb1extmailp02.amd.com (unknown [139.95.251.11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail112-va3.bigfish.com (Postfix) with ESMTP id 3CA42196804D for ; Tue, 30 Jun 2009 13:13:31 +0000 (UTC) Received: from svlb1twp01.amd.com ([139.95.250.34]) by svlb1extmailp02.amd.com (Switch-3.2.7/Switch-3.2.7) with ESMTP id n5UDDN0A014856 for ; Tue, 30 Jun 2009 06:13:26 -0700 Received: from SSVLEXBH1.amd.com (ssvlexbh1.amd.com [139.95.53.182]) by svlb1twp01.amd.com (Tumbleweed MailGate 3.5.1) with ESMTP id 28EE888493C for ; Tue, 30 Jun 2009 06:13:10 -0700 (PDT) From: Christoph Egger Date: Tue, 30 Jun 2009 15:13:11 +0200 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary-00=_o9gSKkLuSENNEXF" Message-ID: <200906301513.12043.Christoph.Egger@amd.com> Subject: [Qemu-devel] [PATCH] build fix: xen on NetBSD/amd64 List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org --Boundary-00=_o9gSKkLuSENNEXF Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi! Attached patch fixes this build error on NetBSD/amd64: hw/xen_blkif.h:20: warning: #pragma pack(psuh[, id], ) is not supported on this target hw/xen_blkif.h:36: warning: #pragma pack(pop[, id], ) is not supported on this target Signed-off-by: Christoph Egger -- ---to satisfy European Law for business letters: Advanced Micro Devices GmbH Karl-Hammerschmidt-Str. 34, 85609 Dornach b. Muenchen Geschaeftsfuehrer: Thomas M. McCoy, Giuliano Meroni Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632 --Boundary-00=_o9gSKkLuSENNEXF Content-Type: text/x-diff; charset="us-ascii"; name="qemu_xen_blkif.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="qemu_xen_blkif.diff" diff --git a/hw/xen_blkif.h b/hw/xen_blkif.h index 738b8fe..bb4ff02 100644 --- a/hw/xen_blkif.h +++ b/hw/xen_blkif.h @@ -16,8 +16,9 @@ struct blkif_common_response { char dummy; }; +/* XXX move this into a proper header */ +#define __aligned(x) __attribute__((__aligned__(x))) /* i386 protocol version */ -#pragma pack(push, 4) struct blkif_x86_32_request { uint8_t operation; /* BLKIF_OP_??? */ uint8_t nr_segments; /* number of segments */ @@ -25,15 +26,14 @@ struct blkif_x86_32_request { uint64_t id; /* private guest value, echoed in resp */ blkif_sector_t sector_number;/* start sector idx on disk (r/w only) */ struct blkif_request_segment seg[BLKIF_MAX_SEGMENTS_PER_REQUEST]; -}; +} __aligned(4); struct blkif_x86_32_response { uint64_t id; /* copied from request */ uint8_t operation; /* copied from request */ int16_t status; /* BLKIF_RSP_??? */ -}; +} __aligned(4); typedef struct blkif_x86_32_request blkif_x86_32_request_t; typedef struct blkif_x86_32_response blkif_x86_32_response_t; -#pragma pack(pop) /* x86_64 protocol version */ struct blkif_x86_64_request { --Boundary-00=_o9gSKkLuSENNEXF--