Re: [xen-unstable test] 5654: regressions - FAIL

[Ian Campbell <Ian.Campbell@citrix.com>]

On Sat, 2011-02-05 at 07:10 +0000, xen.org wrote: 
> flight 5654 xen-unstable real [real]
> http://www.chiark.greenend.org.uk/~xensrcts/logs/5654/
> 
> Regressions :-(
> 
> Tests which did not succeed and are blocking:
>  build-amd64-oldkern           4 xen-build                  fail REGR. vs. 5640
>  build-amd64                   4 xen-build                  fail REGR. vs. 5640
>  build-i386-oldkern            4 xen-build                  fail REGR. vs. 5640
>  build-i386                    4 xen-build                  fail REGR. vs. 5640

CC i386-stubdom/piix4acpi.o 
/home/osstest/build.5654.build-amd64/xen-unstable/stubdom/ioemu/hw/piix4acpi.c:272: error: expected ')' before '?' token
/home/osstest/build.5654.build-amd64/xen-unstable/stubdom/ioemu/hw/piix4acpi.c:277: error: conflicting types for 'set_bit'
/home/osstest/build.5654.build-amd64/xen-unstable/stubdom/../extras/mini-os/include/x86/mini-os/os.h:396: error: previous definition of 'set_bit' was here
/home/osstest/build.5654.build-amd64/xen-unstable/stubdom/ioemu/hw/piix4acpi.c:282: error: conflicting types for 'clear_bit'
/home/osstest/build.5654.build-amd64/xen-unstable/stubdom/../extras/mini-os/include/x86/mini-os/os.h:414: error: previous definition of 'clear_bit' was here
/home/osstest/build.5654.build-amd64/xen-unstable/stubdom/ioemu/hw/piix4acpi.c: In function 'gpe_sts_write':

Plus a bunch of followup warnings.

Seems to be caused by ad7d28519de7cdc604efefac5c22fe9f88040586 which
adds an extra #include "qemu_socket.h" to qemu-common.h.

The following seems like the simplest fix. It successfully builds x86_32
and x86_64 stubdom.

A much more thorough sweep of what minios exposes to applications would
be nice but I think that is likely to be a big task, especially for this
point in the release.

Ian.

8<------------------

minios: do not export {test,set,clear}_bit etc to applications

Fixes ioemu stubdom build:
CC    i386-stubdom/piix4acpi.o 
[...]/stubdom/ioemu/hw/piix4acpi.c:272: error: expected ')' before '?' token
[...]/stubdom/ioemu/hw/piix4acpi.c:277: error: conflicting types for 'set_bit'
[...]/stubdom/../extras/mini-os/include/x86/mini-os/os.h:396: error: previous definition of 'set_bit' was here
[...]/stubdom/ioemu/hw/piix4acpi.c:282: error: conflicting types for 'clear_bit'
[...]/stubdom/../extras/mini-os/include/x86/mini-os/os.h:414: error: previous definition of 'clear_bit' was here
[...]/stubdom/ioemu/hw/piix4acpi.c: In function 'gpe_sts_write':

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>

diff -r 544b103b4d97 extras/mini-os/include/x86/os.h
--- a/extras/mini-os/include/x86/os.h	Fri Feb 04 18:47:39 2011 +0000
+++ b/extras/mini-os/include/x86/os.h	Sat Feb 05 09:25:41 2011 +0000
@@ -164,6 +164,7 @@ typedef struct { volatile int counter; }
 

 /************************** i386 *******************************/
+#ifdef __INSIDE_MINIOS__
 #if defined (__i386__)
 
 #define xchg(ptr,v) ((__typeof__(*(ptr)))__xchg((unsigned long)(v),(ptr),sizeof(*(ptr))))
@@ -451,7 +452,7 @@ static __inline__ unsigned long __ffs(un
 #else /* ifdef __x86_64__ */
 #error "Unsupported architecture"
 #endif
-
+#endif /* ifdef __INSIDE_MINIOS */
 
 /********************* common i386 and x86_64  ****************************/
 struct __synch_xchg_dummy { unsigned long a[100]; };