[Qemu-devel] [PATCH 1/2] build: check if libm is needed in configure

[Qemu-devel] [PATCH 1/2] build: check if libm is needed in configure

[Roger Pau Monne]

Remove the hardcoded use of libm and instead rely on configure to
check for it. It is needed at least for qemu-ga and qemu-system.

Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu>
---
 Makefile.target |    4 ----
 configure       |   14 ++++++++++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Makefile.target b/Makefile.target
index a111521..1bfd419 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -33,10 +33,6 @@ endif
 PROGS=$(QEMU_PROG)
 STPFILES=
 
-ifndef CONFIG_HAIKU
-LIBS+=-lm
-endif
-
 config-target.h: config-target.h-timestamp
 config-target.h-timestamp: config-target.mak
 
diff --git a/configure b/configure
index b113f60..7bcd547 100755
--- a/configure
+++ b/configure
@@ -2447,6 +2447,20 @@ elif compile_prog "" "-lrt" ; then
   LIBS="-lrt $LIBS"
 fi
 
+##########################################
+# Do we need libm
+cat > $TMPC <<EOF
+#include <math.h>
+int main(void) { double a, b; return modf(a, &b);}
+EOF
+
+if compile_prog "" "" ; then
+  :
+elif compile_prog "" "-lm" ; then
+  LIBS="-lm $LIBS"
+  libs_qga="-lm $libs_qga"
+fi
+
 if test "$darwin" != "yes" -a "$mingw32" != "yes" -a "$solaris" != yes -a \
         "$aix" != "yes" -a "$haiku" != "yes" ; then
     libs_softmmu="-lutil $libs_softmmu"
-- 
1.7.9

[Qemu-devel] [PATCH 2/2] build: replace librt check function

[Roger Pau Monne]

Replace clock_gettime with timer_gettime, since at least under
uclibc 0.9.33 the clock_getttime function can be used without linking
against librt (although the manual page states the opposite).

Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu>
---
 configure |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/configure b/configure
index 7bcd547..fb99632 100755
--- a/configure
+++ b/configure
@@ -2438,7 +2438,8 @@ fi
 cat > $TMPC <<EOF
 #include <signal.h>
 #include <time.h>
-int main(void) { clockid_t id; return clock_gettime(id, NULL); }
+int main(void) { timer_t tid; struct itimerspec it; \
+                 return timer_gettime(tid, &it); }
 EOF
 
 if compile_prog "" "" ; then
-- 
1.7.9

Re: [Qemu-devel] [PATCH 2/2] build: replace librt check function

[Anthony Liguori]

On 02/20/2012 06:11 AM, Roger Pau Monne wrote:
> Replace clock_gettime with timer_gettime, since at least under
> uclibc 0.9.33 the clock_getttime function can be used without linking
> against librt (although the manual page states the opposite).
>
> Signed-off-by: Roger Pau Monne<roger.pau@entel.upc.edu>

I don't think this is against qemu.git.  Please do not send patches to 
qemu-devel that are not against qemu.git without clearly indicating this.

Regards,

Anthony Liguori

> ---
>   configure |    3 ++-
>   1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/configure b/configure
> index 7bcd547..fb99632 100755
> --- a/configure
> +++ b/configure
> @@ -2438,7 +2438,8 @@ fi
>   cat>  $TMPC<<EOF
>   #include<signal.h>
>   #include<time.h>
> -int main(void) { clockid_t id; return clock_gettime(id, NULL); }
> +int main(void) { timer_t tid; struct itimerspec it; \
> +                 return timer_gettime(tid,&it); }
>   EOF
>
>   if compile_prog "" "" ; then

Re: [Qemu-devel] [PATCH 2/2] build: replace librt check function

[Roger Pau Monné]

2012/2/22 Anthony Liguori <anthony@codemonkey.ws>:
> On 02/20/2012 06:11 AM, Roger Pau Monne wrote:
>>
>> Replace clock_gettime with timer_gettime, since at least under
>> uclibc 0.9.33 the clock_getttime function can be used without linking
>> against librt (although the manual page states the opposite).
>>
>> Signed-off-by: Roger Pau Monne<roger.pau@entel.upc.edu>
>
>
> I don't think this is against qemu.git.  Please do not send patches to
> qemu-devel that are not against qemu.git without clearly indicating this.

Sorry, this is against qemu-xen-upstream, should I add a tag to my
patches and resend them to qemu-devel?

Thanks, Roger.

> Regards,
>
> Anthony Liguori
>
>
>> ---
>>  configure |    3 ++-
>>  1 files changed, 2 insertions(+), 1 deletions(-)
>>
>> diff --git a/configure b/configure
>> index 7bcd547..fb99632 100755
>> --- a/configure
>> +++ b/configure
>> @@ -2438,7 +2438,8 @@ fi
>>  cat>  $TMPC<<EOF
>>  #include<signal.h>
>>  #include<time.h>
>> -int main(void) { clockid_t id; return clock_gettime(id, NULL); }
>> +int main(void) { timer_t tid; struct itimerspec it; \
>> +                 return timer_gettime(tid,&it); }
>>  EOF
>>
>>  if compile_prog "" "" ; then
>
>

Re: [Qemu-devel] [Xen-devel] [PATCH 2/2] build: replace librt check function

[Ian Campbell]

On Thu, 2012-02-23 at 13:34 +0000, Roger Pau Monné wrote:
> 2012/2/22 Anthony Liguori <anthony@codemonkey.ws>:
> > On 02/20/2012 06:11 AM, Roger Pau Monne wrote:
> >>
> >> Replace clock_gettime with timer_gettime, since at least under
> >> uclibc 0.9.33 the clock_getttime function can be used without linking
> >> against librt (although the manual page states the opposite).
> >>
> >> Signed-off-by: Roger Pau Monne<roger.pau@entel.upc.edu>
> >
> >
> > I don't think this is against qemu.git.  Please do not send patches to
> > qemu-devel that are not against qemu.git without clearly indicating this.
> 
> Sorry, this is against qemu-xen-upstream, should I add a tag to my
> patches and resend them to qemu-devel?

qemu-xen-upstream is based upon the upstream qemu stable branch, not the
development branch.

However patches for qemu-xen-upstream should have already been applied
upstream. This means that patches should be against the mainline (e.g.
development branch) version of qemu and sent to qemu-devel. Once
committed there they will be backported as required to the stable branch
maintained by Xen.org as qemu-xen-upstream.

(Stefano, is that correct? Is there somewhere we can (or do!) document
this? Perhaps http://wiki.xen.org/xenwiki/QEMUUpstream linked to from
Submitting_Xen_Patches? The backport policy should also be covered, e.g.
http://marc.info/?l=xen-devel&m=132872001218724 )

Ian.

> 
> Thanks, Roger.
> 
> > Regards,
> >
> > Anthony Liguori
> >
> >
> >> ---
> >>  configure |    3 ++-
> >>  1 files changed, 2 insertions(+), 1 deletions(-)
> >>
> >> diff --git a/configure b/configure
> >> index 7bcd547..fb99632 100755
> >> --- a/configure
> >> +++ b/configure
> >> @@ -2438,7 +2438,8 @@ fi
> >>  cat>  $TMPC<<EOF
> >>  #include<signal.h>
> >>  #include<time.h>
> >> -int main(void) { clockid_t id; return clock_gettime(id, NULL); }
> >> +int main(void) { timer_t tid; struct itimerspec it; \
> >> +                 return timer_gettime(tid,&it); }
> >>  EOF
> >>
> >>  if compile_prog "" "" ; then
> >
> >
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel

Re: [Qemu-devel] [Xen-devel] [PATCH 2/2] build: replace librt check function

[Roger Pau Monné]

2012/2/27 Ian Campbell <Ian.Campbell@citrix.com>:
> On Thu, 2012-02-23 at 13:34 +0000, Roger Pau Monné wrote:
>> 2012/2/22 Anthony Liguori <anthony@codemonkey.ws>:
>> > On 02/20/2012 06:11 AM, Roger Pau Monne wrote:
>> >>
>> >> Replace clock_gettime with timer_gettime, since at least under
>> >> uclibc 0.9.33 the clock_getttime function can be used without linking
>> >> against librt (although the manual page states the opposite).
>> >>
>> >> Signed-off-by: Roger Pau Monne<roger.pau@entel.upc.edu>
>> >
>> >
>> > I don't think this is against qemu.git.  Please do not send patches to
>> > qemu-devel that are not against qemu.git without clearly indicating this.
>>
>> Sorry, this is against qemu-xen-upstream, should I add a tag to my
>> patches and resend them to qemu-devel?
>
> qemu-xen-upstream is based upon the upstream qemu stable branch, not the
> development branch.
>
> However patches for qemu-xen-upstream should have already been applied
> upstream. This means that patches should be against the mainline (e.g.
> development branch) version of qemu and sent to qemu-devel. Once
> committed there they will be backported as required to the stable branch
> maintained by Xen.org as qemu-xen-upstream.

Ok, I'm going to rework this against qemu development branch, thanks
for the tip.

> (Stefano, is that correct? Is there somewhere we can (or do!) document
> this? Perhaps http://wiki.xen.org/xenwiki/QEMUUpstream linked to from
> Submitting_Xen_Patches? The backport policy should also be covered, e.g.
> http://marc.info/?l=xen-devel&m=132872001218724 )
>
> Ian.
>
>>
>> Thanks, Roger.
>>
>> > Regards,
>> >
>> > Anthony Liguori
>> >
>> >
>> >> ---
>> >>  configure |    3 ++-
>> >>  1 files changed, 2 insertions(+), 1 deletions(-)
>> >>
>> >> diff --git a/configure b/configure
>> >> index 7bcd547..fb99632 100755
>> >> --- a/configure
>> >> +++ b/configure
>> >> @@ -2438,7 +2438,8 @@ fi
>> >>  cat>  $TMPC<<EOF
>> >>  #include<signal.h>
>> >>  #include<time.h>
>> >> -int main(void) { clockid_t id; return clock_gettime(id, NULL); }
>> >> +int main(void) { timer_t tid; struct itimerspec it; \
>> >> +                 return timer_gettime(tid,&it); }
>> >>  EOF
>> >>
>> >>  if compile_prog "" "" ; then
>> >
>> >
>>
>> _______________________________________________
>> Xen-devel mailing list
>> Xen-devel@lists.xen.org
>> http://lists.xen.org/xen-devel
>
>

Re: [Qemu-devel] [Xen-devel] [PATCH 2/2] build: replace librt check function

[Stefano Stabellini]

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

On Mon, 27 Feb 2012, Ian Campbell wrote:
> On Thu, 2012-02-23 at 13:34 +0000, Roger Pau Monné wrote:
> > 2012/2/22 Anthony Liguori <anthony@codemonkey.ws>:
> > > On 02/20/2012 06:11 AM, Roger Pau Monne wrote:
> > >>
> > >> Replace clock_gettime with timer_gettime, since at least under
> > >> uclibc 0.9.33 the clock_getttime function can be used without linking
> > >> against librt (although the manual page states the opposite).
> > >>
> > >> Signed-off-by: Roger Pau Monne<roger.pau@entel.upc.edu>
> > >
> > >
> > > I don't think this is against qemu.git.  Please do not send patches to
> > > qemu-devel that are not against qemu.git without clearly indicating this.
> > 
> > Sorry, this is against qemu-xen-upstream, should I add a tag to my
> > patches and resend them to qemu-devel?
> 
> qemu-xen-upstream is based upon the upstream qemu stable branch, not the
> development branch.
> 
> However patches for qemu-xen-upstream should have already been applied
> upstream. This means that patches should be against the mainline (e.g.
> development branch) version of qemu and sent to qemu-devel. Once
> committed there they will be backported as required to the stable branch
> maintained by Xen.org as qemu-xen-upstream.
> 
> (Stefano, is that correct? Is there somewhere we can (or do!) document
> this? Perhaps http://wiki.xen.org/xenwiki/QEMUUpstream linked to from
> Submitting_Xen_Patches? The backport policy should also be covered, e.g.
> http://marc.info/?l=xen-devel&m=132872001218724 )

Yes, it is correct.

I added few lines to
http://wiki.xen.org/wiki?title=Submitting_Xen_Patches to explain this
concept. I have also linked http://wiki.qemu.org/Contribute/SubmitAPatch
that is the reference on how to submit patches to qemu-devel.