[Qemu-devel] [5194] Fix the build on non-Linux systems

[Qemu-devel] [5194] Fix the build on non-Linux systems

[Anthony Liguori]

Revision: 5194
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5194
Author:   aliguori
Date:     2008-09-11 14:18:56 +0000 (Thu, 11 Sep 2008)

Log Message:
-----------
Fix the build on non-Linux systems

It turns out, we're never reading from the signalfd() which is causing it to
remain readable forever.  I'll fix this up but I thought I'd commit this fix
in the interim.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    trunk/compatfd.h

Modified: trunk/compatfd.h
===================================================================
--- trunk/compatfd.h	2008-09-10 20:09:22 UTC (rev 5193)
+++ trunk/compatfd.h	2008-09-11 14:18:56 UTC (rev 5194)
@@ -16,14 +16,10 @@
 
 #include <signal.h>
 
-#if defined(__linux__) && !defined(SYS_signalfd)
-struct signalfd_siginfo {
+struct qemu_signalfd_siginfo {
     uint32_t ssi_signo;
     uint8_t pad[124];
 };
-#else
-#include <linux/signalfd.h>
-#endif
 
 int qemu_signalfd(const sigset_t *mask);
 

Re: [Qemu-devel] [5194] Fix the build on non-Linux systems

[C.W. Betts]

[-- Attachment #1: Type: text/plain, Size: 1423 bytes --]

Now it complains about missing symbols:
Undefined symbols:
   "_sigwaitinfo", referenced from:
       _sigwait_compat in compatfd.o
ld: symbol(s) not found
collect2: ld returned 1 exit status
make: *** [qemu-img] Error 1
This happened both when trying to compile qemu-img and qemu-nbd.
On Sep 11, 2008, at 8:18 AM, Anthony Liguori wrote:

> Revision: 5194
>          http://svn.sv.gnu.org/viewvc/? 
> view=rev&root=qemu&revision=5194
> Author:   aliguori
> Date:     2008-09-11 14:18:56 +0000 (Thu, 11 Sep 2008)
>
> Log Message:
> -----------
> Fix the build on non-Linux systems
>
> It turns out, we're never reading from the signalfd() which is  
> causing it to
> remain readable forever.  I'll fix this up but I thought I'd commit  
> this fix
> in the interim.
>
> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
>
> Modified Paths:
> --------------
>    trunk/compatfd.h
>
> Modified: trunk/compatfd.h
> ===================================================================
> --- trunk/compatfd.h	2008-09-10 20:09:22 UTC (rev 5193)
> +++ trunk/compatfd.h	2008-09-11 14:18:56 UTC (rev 5194)
> @@ -16,14 +16,10 @@
>
> #include <signal.h>
>
> -#if defined(__linux__) && !defined(SYS_signalfd)
> -struct signalfd_siginfo {
> +struct qemu_signalfd_siginfo {
>     uint32_t ssi_signo;
>     uint8_t pad[124];
> };
> -#else
> -#include <linux/signalfd.h>
> -#endif
>
> int qemu_signalfd(const sigset_t *mask);
>
>
>
>
>


[-- Attachment #2: Type: text/html, Size: 2557 bytes --]

Re: [Qemu-devel] [5194] Fix the build on non-Linux systems

[Blue Swirl]

On 9/11/08, C. W. Betts <computers57@hotmail.com> wrote:
> Now it complains about missing symbols:
> Undefined symbols:
>   "_sigwaitinfo", referenced from:
>       _sigwait_compat in compatfd.o
> ld: symbol(s) not found
> collect2: ld returned 1 exit status
> make: *** [qemu-img] Error 1
> This happened both when trying to compile qemu-img and qemu-nbd.
>
> On Sep 11, 2008, at 8:18 AM, Anthony Liguori wrote:
>
> Revision: 5194
>
> http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5194
> Author:   aliguori
> Date:     2008-09-11 14:18:56 +0000 (Thu, 11 Sep 2008)
>
> Log Message:
> -----------
> Fix the build on non-Linux systems
>
> It turns out, we're never reading from the signalfd() which is causing it to
> remain readable forever.  I'll fix this up but I thought I'd commit this fix
> in the interim.

On OpenBSD the final link fails because pthread symbols are missing.

Re: [Qemu-devel] [5194] Fix the build on non-Linux systems

[Anthony Liguori]

Blue Swirl wrote:
> On 9/11/08, C. W. Betts <computers57@hotmail.com> wrote:
>   
>> Now it complains about missing symbols:
>> Undefined symbols:
>>   "_sigwaitinfo", referenced from:
>>       _sigwait_compat in compatfd.o
>> ld: symbol(s) not found
>> collect2: ld returned 1 exit status
>> make: *** [qemu-img] Error 1
>> This happened both when trying to compile qemu-img and qemu-nbd.
>>
>> On Sep 11, 2008, at 8:18 AM, Anthony Liguori wrote:
>>
>> Revision: 5194
>>
>> http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5194
>> Author:   aliguori
>> Date:     2008-09-11 14:18:56 +0000 (Thu, 11 Sep 2008)
>>
>> Log Message:
>> -----------
>> Fix the build on non-Linux systems
>>
>> It turns out, we're never reading from the signalfd() which is causing it to
>> remain readable forever.  I'll fix this up but I thought I'd commit this fix
>> in the interim.
>>     
>
> On OpenBSD the final link fails because pthread symbols are missing.
>   

Do we use posix-aio on OpenBSD?

Regards,

Anthony Liguori

Re: [Qemu-devel] [5194] Fix the build on non-Linux systems

[Blue Swirl]

On 9/11/08, Anthony Liguori <aliguori@us.ibm.com> wrote:
> Blue Swirl wrote:
>
> > On 9/11/08, C. W. Betts <computers57@hotmail.com> wrote:
> >
> >
> > > Now it complains about missing symbols:
> > > Undefined symbols:
> > >  "_sigwaitinfo", referenced from:
> > >      _sigwait_compat in compatfd.o
> > > ld: symbol(s) not found
> > > collect2: ld returned 1 exit status
> > > make: *** [qemu-img] Error 1
> > > This happened both when trying to compile qemu-img and qemu-nbd.
> > >
> > > On Sep 11, 2008, at 8:18 AM, Anthony Liguori wrote:
> > >
> > > Revision: 5194
> > >
> > >
> http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5194
> > > Author:   aliguori
> > > Date:     2008-09-11 14:18:56 +0000 (Thu, 11 Sep 2008)
> > >
> > > Log Message:
> > > -----------
> > > Fix the build on non-Linux systems
> > >
> > > It turns out, we're never reading from the signalfd() which is causing
> it to
> > > remain readable forever.  I'll fix this up but I thought I'd commit this
> fix
> > > in the interim.
> > >
> > >
> >
> > On OpenBSD the final link fails because pthread symbols are missing.
> >
> >
>
>  Do we use posix-aio on OpenBSD?

No, AIO is not available.

Re: [Qemu-devel] [5194] Fix the build on non-Linux systems

[Anthony Liguori]

Blue Swirl wrote:
> On 9/11/08, C. W. Betts <computers57@hotmail.com> wrote:
>   
>> Now it complains about missing symbols:
>> Undefined symbols:
>>   "_sigwaitinfo", referenced from:
>>       _sigwait_compat in compatfd.o
>> ld: symbol(s) not found
>> collect2: ld returned 1 exit status
>> make: *** [qemu-img] Error 1
>> This happened both when trying to compile qemu-img and qemu-nbd.
>>
>> On Sep 11, 2008, at 8:18 AM, Anthony Liguori wrote:
>>
>> Revision: 5194
>>
>> http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5194
>> Author:   aliguori
>> Date:     2008-09-11 14:18:56 +0000 (Thu, 11 Sep 2008)
>>
>> Log Message:
>> -----------
>> Fix the build on non-Linux systems
>>
>> It turns out, we're never reading from the signalfd() which is causing it to
>> remain readable forever.  I'll fix this up but I thought I'd commit this fix
>> in the interim.
>>     
>
> On OpenBSD the final link fails because pthread symbols are missing.
>   

Does this help:

Index: Makefile.target
===================================================================
--- Makefile.target    (revision 5193)
+++ Makefile.target    (working copy)
@@ -476,9 +476,13 @@
 ifdef CONFIG_WIN32
 OBJS+=block-raw-win32.o
 else
-OBJS+=block-raw-posix.o compatfd.o
+OBJS+=block-raw-posix.o
 endif
 
+ifdef CONFIG_AIO
+OBJS+=compatfd.o
+endif
+
 LIBS+=-lz
 ifdef CONFIG_ALSA
 LIBS += -lasound
Index: Makefile
===================================================================
--- Makefile    (revision 5193)
+++ Makefile    (working copy)
@@ -177,9 +177,13 @@
 ifdef CONFIG_WIN32
 QEMU_IMG_BLOCK_OBJS += qemu-img-block-raw-win32.o
 else
-QEMU_IMG_BLOCK_OBJS += nbd.o qemu-img-block-raw-posix.o compatfd.o
+QEMU_IMG_BLOCK_OBJS += nbd.o qemu-img-block-raw-posix.o
 endif
 
+ifdef CONFIG_AIO
+QEMU_IMG_BLOCK_OBJS += compatfd.o
+endif
+
 ######################################################################
 
 qemu-img$(EXESUF): qemu-img.o qemu-img-block.o $(QEMU_IMG_BLOCK_OBJS)
Index: configure
===================================================================
--- configure    (revision 5193)
+++ configure    (working copy)
@@ -1220,6 +1220,7 @@
 fi
 if test "$aio" = "yes" ; then
   echo "#define CONFIG_AIO 1" >> $config_h
+  echo "CONFIG_AIO=yes" >> $config_mak
 fi
 
 # XXX: suppress that

Regards,

Anthony Liguori

Re: [Qemu-devel] [5194] Fix the build on non-Linux systems

[Blue Swirl]

On 9/11/08, Anthony Liguori <aliguori@us.ibm.com> wrote:
> Blue Swirl wrote:
>
> > On 9/11/08, C. W. Betts <computers57@hotmail.com> wrote:
> >
> >
> > > Now it complains about missing symbols:
> > > Undefined symbols:
> > >  "_sigwaitinfo", referenced from:
> > >      _sigwait_compat in compatfd.o
> > > ld: symbol(s) not found
> > > collect2: ld returned 1 exit status
> > > make: *** [qemu-img] Error 1
> > > This happened both when trying to compile qemu-img and qemu-nbd.
> > >
> > > On Sep 11, 2008, at 8:18 AM, Anthony Liguori wrote:
> > >
> > > Revision: 5194
> > >
> > >
> http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5194
> > > Author:   aliguori
> > > Date:     2008-09-11 14:18:56 +0000 (Thu, 11 Sep 2008)
> > >
> > > Log Message:
> > > -----------
> > > Fix the build on non-Linux systems
> > >
> > > It turns out, we're never reading from the signalfd() which is causing
> it to
> > > remain readable forever.  I'll fix this up but I thought I'd commit this
> fix
> > > in the interim.
> > >
> > >
> >
> > On OpenBSD the final link fails because pthread symbols are missing.
> >
> >
>
>  Does this help:

Yes, that does it.

Re: [Qemu-devel] [5194] Fix the build on non-Linux systems

[C.W. Betts]

[-- Attachment #1: Type: text/plain, Size: 1601 bytes --]

Actually, it builds in 10.5.  Using the 10.4 SDK causes the problems.
On Sep 11, 2008, at 9:26 AM, C.W. Betts wrote:

> Now it complains about missing symbols:
> Undefined symbols:
>   "_sigwaitinfo", referenced from:
>       _sigwait_compat in compatfd.o
> ld: symbol(s) not found
> collect2: ld returned 1 exit status
> make: *** [qemu-img] Error 1
> This happened both when trying to compile qemu-img and qemu-nbd.
> On Sep 11, 2008, at 8:18 AM, Anthony Liguori wrote:
>
>> Revision: 5194
>>          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5194
>> Author:   aliguori
>> Date:     2008-09-11 14:18:56 +0000 (Thu, 11 Sep 2008)
>>
>> Log Message:
>> -----------
>> Fix the build on non-Linux systems
>>
>> It turns out, we're never reading from the signalfd() which is  
>> causing it to
>> remain readable forever.  I'll fix this up but I thought I'd commit  
>> this fix
>> in the interim.
>>
>> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
>>
>> Modified Paths:
>> --------------
>>    trunk/compatfd.h
>>
>> Modified: trunk/compatfd.h
>> ===================================================================
>> --- trunk/compatfd.h	2008-09-10 20:09:22 UTC (rev 5193)
>> +++ trunk/compatfd.h	2008-09-11 14:18:56 UTC (rev 5194)
>> @@ -16,14 +16,10 @@
>>
>> #include <signal.h>
>>
>> -#if defined(__linux__) && !defined(SYS_signalfd)
>> -struct signalfd_siginfo {
>> +struct qemu_signalfd_siginfo {
>>     uint32_t ssi_signo;
>>     uint8_t pad[124];
>> };
>> -#else
>> -#include <linux/signalfd.h>
>> -#endif
>>
>> int qemu_signalfd(const sigset_t *mask);
>>
>>
>>
>>
>>
>


[-- Attachment #2: Type: text/html, Size: 2890 bytes --]

Re: [Qemu-devel] [5194] Fix the build on non-Linux systems

[C.W. Betts]

[-- Attachment #1: Type: text/plain, Size: 1392 bytes --]

And it also doesn't link on 64-bit…
I don't know what library has the sigwaitinfo call on it, nor do I  
know what headers define it.  Spotlight only found one file,  
compatfd.c, and mail messages that reference it.
On Sep 11, 2008, at 10:33 AM, C.W. Betts wrote:

> Actually, it builds in 10.5.  Using the 10.4 SDK causes the problems.
> On Sep 11, 2008, at 9:26 AM, C.W. Betts wrote:
>
>> Now it complains about missing symbols:
>> Undefined symbols:
>>   "_sigwaitinfo", referenced from:
>>       _sigwait_compat in compatfd.o
>> ld: symbol(s) not found
>> collect2: ld returned 1 exit status
>> make: *** [qemu-img] Error 1
>> This happened both when trying to compile qemu-img and qemu-nbd.
>> On Sep 11, 2008, at 8:18 AM, Anthony Liguori wrote:
>>
>>> Revision: 5194
>>>          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5194
>>> Author:   aliguori
>>> Date:     2008-09-11 14:18:56 +0000 (Thu, 11 Sep 2008)
>>>
>>> Log Message:
>>> -----------
>>> Fix the build on non-Linux systems
>>>
>>> It turns out, we're never reading from the signalfd() which is  
>>> causing it to
>>> remain readable forever.  I'll fix this up but I thought I'd  
>>> commit this fix
>>> in the interim.
>>>
>>> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
>>>
>>> Modified Paths:
>>> --------------
>>>    trunk/compatfd.h
>>>
>>>
>>
>


[-- Attachment #2: Type: text/html, Size: 2626 bytes --]

Re: [Qemu-devel] [5194] Fix the build on non-Linux systems

[Anthony Liguori]

C.W. Betts wrote:
> And it also doesn't link on 64-bit…
> I don't know what library has the sigwaitinfo call on it, nor do I 
> know what headers define it.  Spotlight only found one file, 
> compatfd.c, and mail messages that reference it.

sigwaitinfo is part of POSIX.  Is sigtimedwait() available?  What about 
just sigwait()?

Regards,

Anthony Liguori

> On Sep 11, 2008, at 10:33 AM, C.W. Betts wrote:
>
>> Actually, it builds in 10.5.  Using the 10.4 SDK causes the problems.
>> On Sep 11, 2008, at 9:26 AM, C.W. Betts wrote:
>>
>>> Now it complains about missing symbols:
>>> Undefined symbols:
>>>   "_sigwaitinfo", referenced from:
>>>       _sigwait_compat in compatfd.o
>>> ld: symbol(s) not found
>>> collect2: ld returned 1 exit status
>>> make: *** [qemu-img] Error 1
>>> This happened both when trying to compile qemu-img and qemu-nbd.
>>> On Sep 11, 2008, at 8:18 AM, Anthony Liguori wrote:
>