| Message ID | 1405942154-7312-1-git-send-email-ian.campbell@citrix.com |
|---|---|
| State | Accepted |
| Commit | 100546c0d2045943b721da9edac312397a87f761 |
| Headers | show |
On 21/07/14 12:29, Ian Campbell wrote: > The stubdom build system incorrectly picks up on the hosts > installation of Valgrind, which cannot work in a stubdom environment. > > Signed-off-by: Ian Campbell <ian.campbell@citrix.com> > Tested-by: Simon Martin <furryfuttock@gmail.com> Reviewed-by: Andrew Cooper<andrew.cooper3@citrix.com> > Cc: Samuel Thibault <samuel.thibault@ens-lyon.org> > --- > tools/libxc/xc_private.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/libxc/xc_private.h b/tools/libxc/xc_private.h > index ce7e81e..43826e5 100644 > --- a/tools/libxc/xc_private.h > +++ b/tools/libxc/xc_private.h > @@ -34,7 +34,7 @@ > > #include <xen/sys/privcmd.h> > > -#if defined(HAVE_VALGRIND_MEMCHECK_H) && !defined(NDEBUG) > +#if defined(HAVE_VALGRIND_MEMCHECK_H) && !defined(NDEBUG) && !define(__MINIOS__) > /* Compile in Valgrind client requests? */ > #include <valgrind/memcheck.h> > #else
Ian Campbell, le Mon 21 Jul 2014 12:29:14 +0100, a écrit : > The stubdom build system incorrectly picks up on the hosts > installation of Valgrind, which cannot work in a stubdom environment. > > Signed-off-by: Ian Campbell <ian.campbell@citrix.com> > Tested-by: Simon Martin <furryfuttock@gmail.com> > Cc: Andrew Cooper <andrew.cooper3@citrix.com> > Cc: Samuel Thibault <samuel.thibault@ens-lyon.org> Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org> > --- > tools/libxc/xc_private.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/libxc/xc_private.h b/tools/libxc/xc_private.h > index ce7e81e..43826e5 100644 > --- a/tools/libxc/xc_private.h > +++ b/tools/libxc/xc_private.h > @@ -34,7 +34,7 @@ > > #include <xen/sys/privcmd.h> > > -#if defined(HAVE_VALGRIND_MEMCHECK_H) && !defined(NDEBUG) > +#if defined(HAVE_VALGRIND_MEMCHECK_H) && !defined(NDEBUG) && !define(__MINIOS__) > /* Compile in Valgrind client requests? */ > #include <valgrind/memcheck.h> > #else > -- > 1.7.10.4 >
On Mon, 2014-07-21 at 13:34 +0200, Samuel Thibault wrote: > Ian Campbell, le Mon 21 Jul 2014 12:29:14 +0100, a écrit : > > The stubdom build system incorrectly picks up on the hosts > > installation of Valgrind, which cannot work in a stubdom environment. > > > > Signed-off-by: Ian Campbell <ian.campbell@citrix.com> > > Tested-by: Simon Martin <furryfuttock@gmail.com> > > Cc: Andrew Cooper <andrew.cooper3@citrix.com> > > Cc: Samuel Thibault <samuel.thibault@ens-lyon.org> > > Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org> No one spotted the deliberate error (define() vs defined()) ;-) I fixed that and applied, thanks. Ian.
diff --git a/tools/libxc/xc_private.h b/tools/libxc/xc_private.h index ce7e81e..43826e5 100644 --- a/tools/libxc/xc_private.h +++ b/tools/libxc/xc_private.h @@ -34,7 +34,7 @@ #include <xen/sys/privcmd.h> -#if defined(HAVE_VALGRIND_MEMCHECK_H) && !defined(NDEBUG) +#if defined(HAVE_VALGRIND_MEMCHECK_H) && !defined(NDEBUG) && !define(__MINIOS__) /* Compile in Valgrind client requests? */ #include <valgrind/memcheck.h> #else