Re: [Qemu-devel] [RFC, PATCH] Host AIO support detection, OpenBSD host support

[Samuel Thibault <samuel.thibault@eu.citrix.com>]

For BSD, you may need the patch below as well (from the xen repo)

changeset:   15970:04cc0e22a20a 
user:        Keir Fraser <keir@xensource.com> 
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 <Christoph.Egger@amd.com> 

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 <inttypes.h>
 
+#ifdef _BSD
+#include <sys/endian.h>
+#include <sys/types.h>
+#else
+
 #ifdef HAVE_BYTESWAP_H
 #include <byteswap.h>
 #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)