From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KT1FO-0002AJ-LQ for qemu-devel@nongnu.org; Tue, 12 Aug 2008 17:17:42 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KT1FL-00028u-Nv for qemu-devel@nongnu.org; Tue, 12 Aug 2008 17:17:42 -0400 Received: from [199.232.76.173] (port=34263 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KT1FL-00028p-K5 for qemu-devel@nongnu.org; Tue, 12 Aug 2008 17:17:39 -0400 Received: from mtaout02-winn.ispmail.ntl.com ([81.103.221.48]:21057) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KT1FK-0002CD-Tn for qemu-devel@nongnu.org; Tue, 12 Aug 2008 17:17:39 -0400 Received: from aamtaout03-winn.ispmail.ntl.com ([81.103.221.35]) by mtaout02-winn.ispmail.ntl.com with ESMTP id <20080812211736.LEEB21103.mtaout02-winn.ispmail.ntl.com@aamtaout03-winn.ispmail.ntl.com> for ; Tue, 12 Aug 2008 22:17:36 +0100 Received: from implementation.famille.thibault.fr ([82.21.96.230]) by aamtaout03-winn.ispmail.ntl.com with ESMTP id <20080812211736.ZOMB29597.aamtaout03-winn.ispmail.ntl.com@implementation.famille.thibault.fr> for ; Tue, 12 Aug 2008 22:17:36 +0100 Received: from samy by implementation.famille.thibault.fr with local (Exim 4.69) (envelope-from ) id 1KT1FI-0001iy-3f for qemu-devel@nongnu.org; Tue, 12 Aug 2008 23:17:36 +0200 Date: Tue, 12 Aug 2008 22:17:31 +0100 From: Samuel Thibault Subject: Re: [Qemu-devel] [RFC, PATCH] Host AIO support detection, OpenBSD host support Message-ID: <20080812211731.GP4468@implementation> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org For BSD, you may need the patch below as well (from the xen repo) changeset: 15970:04cc0e22a20a user: Keir Fraser date: Thu Sep 27 16:36:23 2007 +0100 files: tools/ioemu/audio/audio.c tools/ioemu/audio/mixeng.c tools/ioemu/audio/ossaudio.c tools/ioemu/block-raw.c tools/ioemu/block-vvfat.c tools/ioemu/bswap.h tools/ioemu/cutils.c tools/ioemu/monitor.c tools/ioemu/osdep.h tools/ioemu/target-i386-dm/exec-dm.c tools/ioemu/usb-linux.c tools/ioemu/vl.c tools/ioemu/vl.h tools/ioemu/vnc.c description: ioemu: Fixes for BSD. Signed-off-by: Christoph Egger Samuel I don't know why this one was done, it looks a bit odd. diff --git a/audio/mixeng.c b/audio/mixeng.c index b668c52..f4b8003 100644 --- a/audio/mixeng.c +++ b/audio/mixeng.c @@ -146,6 +146,7 @@ #undef SHIFT t_sample *mixeng_conv[2][2][2][3] = { +#ifndef _BSD { { { @@ -198,9 +199,11 @@ t_sample *mixeng_conv[2][2][2][3] = { } } } +#endif /* !_BSD */ }; f_sample *mixeng_clip[2][2][2][3] = { +#ifndef _BSD { { { @@ -253,6 +256,7 @@ f_sample *mixeng_clip[2][2][2][3] = { } } } +#endif /* !_BSD */ }; /* Possibly related to the hunk above, something like improper endian detection? diff --git a/bswap.h b/bswap.h index 523d805..fd589da 100644 --- a/bswap.h +++ b/bswap.h @@ -5,6 +5,11 @@ #include +#ifdef _BSD +#include +#include +#else + #ifdef HAVE_BYTESWAP_H #include #else @@ -73,6 +78,8 @@ static inline void bswap64s(uint64_t *s) *s = bswap64(*s); } +#endif /* _BSD */ + #if defined(WORDS_BIGENDIAN) #define be_bswap(v, size) (v) #define le_bswap(v, size) bswap ## size(v)