[PATCH] kvm tool: Remove the __stringify* defination from the util.h

[PATCH] kvm tool: Remove the __stringify* defination from the util.h

[Prasad Joshi]

Include the Linux kernel header file linux/stringify.h file instead of
redefining the __stringify* macros

Signed-off-by: Prasad Joshi <prasadjoshi124@gmail.com>
---
 tools/kvm/include/kvm/util.h |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/tools/kvm/include/kvm/util.h b/tools/kvm/include/kvm/util.h
index ae033cc..c308f3f 100644
--- a/tools/kvm/include/kvm/util.h
+++ b/tools/kvm/include/kvm/util.h
@@ -1,3 +1,5 @@
+#include "../../../../include/linux/stringify.h"
+
 #ifndef KVM__UTIL_H
 #define KVM__UTIL_H
 
@@ -27,9 +29,6 @@
 #endif
 #endif
 
-#define __stringify_1(x)	#x
-#define __stringify(x)		__stringify_1(x)
-
 extern void die(const char *err, ...) NORETURN __attribute__((format (printf, 1, 2)));
 extern void die_perror(const char *s) NORETURN;
 extern int error(const char *err, ...) __attribute__((format (printf, 1, 2)));
-- 
1.7.1

Re: [PATCH] kvm tool: Remove the __stringify* defination from the util.h

[Pekka Enberg]

On Fri, Apr 15, 2011 at 10:43 PM, Prasad Joshi <prasadjoshi124@gmail.com> wrote:
> Include the Linux kernel header file linux/stringify.h file instead of
> redefining the __stringify* macros
>
> Signed-off-by: Prasad Joshi <prasadjoshi124@gmail.com>
> ---
>  tools/kvm/include/kvm/util.h |    5 ++---
>  1 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/tools/kvm/include/kvm/util.h b/tools/kvm/include/kvm/util.h
> index ae033cc..c308f3f 100644
> --- a/tools/kvm/include/kvm/util.h
> +++ b/tools/kvm/include/kvm/util.h
> @@ -1,3 +1,5 @@
> +#include "../../../../include/linux/stringify.h"

#include <linux/stringify.h> should just work, no?

> +
>  #ifndef KVM__UTIL_H
>  #define KVM__UTIL_H
>
> @@ -27,9 +29,6 @@
>  #endif
>  #endif
>
> -#define __stringify_1(x)       #x
> -#define __stringify(x)         __stringify_1(x)
> -
>  extern void die(const char *err, ...) NORETURN __attribute__((format (printf, 1, 2)));
>  extern void die_perror(const char *s) NORETURN;
>  extern int error(const char *err, ...) __attribute__((format (printf, 1, 2)));
> --
> 1.7.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>

Re: [PATCH] kvm tool: Remove the __stringify* defination from the util.h

[Ingo Molnar]

* Pekka Enberg <penberg@kernel.org> wrote:

> On Fri, Apr 15, 2011 at 10:43 PM, Prasad Joshi <prasadjoshi124@gmail.com> wrote:
> > Include the Linux kernel header file linux/stringify.h file instead of
> > redefining the __stringify* macros
> >
> > Signed-off-by: Prasad Joshi <prasadjoshi124@gmail.com>
> > ---
> >  tools/kvm/include/kvm/util.h |    5 ++---
> >  1 files changed, 2 insertions(+), 3 deletions(-)
> >
> > diff --git a/tools/kvm/include/kvm/util.h b/tools/kvm/include/kvm/util.h
> > index ae033cc..c308f3f 100644
> > --- a/tools/kvm/include/kvm/util.h
> > +++ b/tools/kvm/include/kvm/util.h
> > @@ -1,3 +1,5 @@
> > +#include "../../../../include/linux/stringify.h"
> 
> #include <linux/stringify.h> should just work, no?

Only if kernel headers are installed. Also, and perhaps more importantly, in 
the context of perf it was more robust to use the same kernel repo's source 
code that perf resides in - should there be any fixes needed it's a lot easier 
to remedy things.

Thanks,

	Ingo

Re: [PATCH] kvm tool: Remove the __stringify* defination from the util.h

[Pekka Enberg]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 1144 bytes --]

On Sat, 16 Apr 2011, Ingo Molnar wrote:

>
> * Pekka Enberg <penberg@kernel.org> wrote:
>
>> On Fri, Apr 15, 2011 at 10:43 PM, Prasad Joshi <prasadjoshi124@gmail.com> wrote:
>>> Include the Linux kernel header file linux/stringify.h file instead of
>>> redefining the __stringify* macros
>>>
>>> Signed-off-by: Prasad Joshi <prasadjoshi124@gmail.com>
>>> ---
>>>  tools/kvm/include/kvm/util.h |    5 ++---
>>>  1 files changed, 2 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/tools/kvm/include/kvm/util.h b/tools/kvm/include/kvm/util.h
>>> index ae033cc..c308f3f 100644
>>> --- a/tools/kvm/include/kvm/util.h
>>> +++ b/tools/kvm/include/kvm/util.h
>>> @@ -1,3 +1,5 @@
>>> +#include "../../../../include/linux/stringify.h"
>>
>> #include <linux/stringify.h> should just work, no?
>
> Only if kernel headers are installed. Also, and perhaps more importantly, in
> the context of perf it was more robust to use the same kernel repo's source
> code that perf resides in - should there be any fixes needed it's a lot easier
> to remedy things.

We do this in the Makefile:

-I../../include -I../../arch/$(ARCH)/include/

so it should just work.

Re: [PATCH] kvm tool: Remove the __stringify* defination from the util.h

[Ingo Molnar]

* Pekka Enberg <penberg@kernel.org> wrote:

> On Sat, 16 Apr 2011, Ingo Molnar wrote:
> 
> >
> >* Pekka Enberg <penberg@kernel.org> wrote:
> >
> >>On Fri, Apr 15, 2011 at 10:43 PM, Prasad Joshi <prasadjoshi124@gmail.com> wrote:
> >>>Include the Linux kernel header file linux/stringify.h file instead of
> >>>redefining the __stringify* macros
> >>>
> >>>Signed-off-by: Prasad Joshi <prasadjoshi124@gmail.com>
> >>>---
> >>> tools/kvm/include/kvm/util.h |    5 ++---
> >>> 1 files changed, 2 insertions(+), 3 deletions(-)
> >>>
> >>>diff --git a/tools/kvm/include/kvm/util.h b/tools/kvm/include/kvm/util.h
> >>>index ae033cc..c308f3f 100644
> >>>--- a/tools/kvm/include/kvm/util.h
> >>>+++ b/tools/kvm/include/kvm/util.h
> >>>@@ -1,3 +1,5 @@
> >>>+#include "../../../../include/linux/stringify.h"
> >>
> >>#include <linux/stringify.h> should just work, no?
> >
> >Only if kernel headers are installed. Also, and perhaps more importantly, in
> >the context of perf it was more robust to use the same kernel repo's source
> >code that perf resides in - should there be any fixes needed it's a lot easier
> >to remedy things.
> 
> We do this in the Makefile:
> 
> -I../../include -I../../arch/$(ARCH)/include/
> 
> so it should just work.

Oh, nice! :-)

Thanks,

	Ingo