9 a.m.
Hi,
statstest.c needs to check if USE_XEN > 0, otherwise compilation breaks
on --without-xen builds. Please apply if appropriate. Patch is against
current cvs.
Cheers,
-- Guido
9:14 a.m.
Guido Guenther <agx(a)sigxcpu.org> wrote:
statstest.c needs to check if USE_XEN > 0, otherwise compilation
breaks
on --without-xen builds. Please apply if appropriate. Patch is against
current cvs.
Thanks for the report, but your patch didn't make it to the list.
That has happened to me when I've included the output
of e.g., git format-patch in the message. Its headers
confuse the old version of Mailman that this list is using.
If you think something like that happened here, please
send me a copy of your original message and I'll look into it.
11:17 a.m.
On Thu, Jan 31, 2008 at 04:14:09PM +0100, Jim Meyering wrote:
Guido Guenther <agx(a)sigxcpu.org> wrote:
> statstest.c needs to check if USE_XEN > 0, otherwise compilation breaks
> on --without-xen builds. Please apply if appropriate. Patch is against
> current cvs.
Thanks for the report, but your patch didn't make it to the list.
That has happened to me when I've included the output
of e.g., git format-patch in the message. Its headers
confuse the old version of Mailman that this list is using.
If you think something like that happened here, please
send me a copy of your original message and I'll look into it.
Yes, I actually
used git. Here it is without the headers:
diff --git a/tests/statstest.c b/tests/statstest.c
index 4c19833..6213da8 100644
--- a/tests/statstest.c
+++ b/tests/statstest.c
@@ -12,7 +12,7 @@ static void testQuietError(void *userData ATTRIBUTE_UNUSED, virErrorPtr
error AT
/* nada */
}
-#ifdef __linux__
+#if __linux__ && WITH_XEN
static int testDevice(const char *path, int expect)
{
int actual = xenLinuxDomainDeviceID(NULL, 1, path);
@@ -31,7 +31,7 @@ int
main(void)
{
int ret = 0;
-#ifdef __linux__
+#if __linux__ && WITH_XEN
/* Some of our tests delibrately test failure cases, so
* register a handler to stop error messages cluttering
* up display
1:01 p.m.
Guido Guenther wrote:
On Thu, Jan 31, 2008 at 04:14:09PM +0100, Jim Meyering wrote:
> Guido Guenther <agx(a)sigxcpu.org> wrote:
>> statstest.c needs to check if USE_XEN > 0, otherwise compilation breaks
>> on --without-xen builds. Please apply if appropriate. Patch is against
>> current cvs.
> Thanks for the report, but your patch didn't make it to the list.
> That has happened to me when I've included the output
> of e.g., git format-patch in the message. Its headers
> confuse the old version of Mailman that this list is using.
>
> If you think something like that happened here, please
> send me a copy of your original message and I'll look into it.
Yes, I actually used git. Here it is without the headers:
diff --git a/tests/statstest.c b/tests/statstest.c
index 4c19833..6213da8 100644
--- a/tests/statstest.c
+++ b/tests/statstest.c
@@ -12,7 +12,7 @@ static void testQuietError(void *userData ATTRIBUTE_UNUSED, virErrorPtr
error AT
/* nada */
}
-#ifdef __linux__
+#if __linux__ && WITH_XEN
static int testDevice(const char *path, int expect)
{
int actual = xenLinuxDomainDeviceID(NULL, 1, path);
@@ -31,7 +31,7 @@ int
main(void)
{
int ret = 0;
-#ifdef __linux__
+#if __linux__ && WITH_XEN
/* Some of our tests delibrately test failure cases, so
* register a handler to stop error messages cluttering
* up display
Looks good to me.
Rich.
--
Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/
Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod
Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in
England and Wales under Company Registration No. 03798903
1:18 p.m.
"Richard W.M. Jones" <rjones(a)redhat.com> wrote:
Guido Guenther wrote:
> On Thu, Jan 31, 2008 at 04:14:09PM +0100, Jim Meyering wrote:
>> Guido Guenther <agx(a)sigxcpu.org> wrote:
>>> statstest.c needs to check if USE_XEN > 0, otherwise compilation breaks
>>> on --without-xen builds. Please apply if appropriate. Patch is against
...
Looks good to me.
Same here.
This is what I expect to apply in an hour or so:
Thu Jan 31 20:12:40 CET 2008 Guido Guenther <agx(a)sigxcpu.org>
Avoid compilation failure when building --without-xen.
* tests/statstest.c (testDevice) [!WITH_XEN]: #ifdef-out.
(main) [!WITH_XEN]: #ifdef-out the body.
Signed-off-by: Jim Meyering <meyering(a)redhat.com>
---
ChangeLog | 6 ++++++
tests/statstest.c | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 27e5089..1c46da7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jan 31 20:12:40 CET 2008 Guido Guenther <agx(a)sigxcpu.org>
+
+ Avoid compilation failure when building --without-xen.
+ * tests/statstest.c (testDevice) [!WITH_XEN]: #ifdef-out.
+ (main) [!WITH_XEN]: #ifdef-out the body.
+
Wed Jan 30 20:49:34 CET 2008 Jim Meyering <meyering(a)redhat.com>
Avoid virsh leaks due to missing virDomainFree(dom) calls
diff --git a/tests/statstest.c b/tests/statstest.c
index 4c19833..6213da8 100644
--- a/tests/statstest.c
+++ b/tests/statstest.c
@@ -12,7 +12,7 @@ static void testQuietError(void *userData ATTRIBUTE_UNUSED, virErrorPtr
error AT
/* nada */
}
-#ifdef __linux__
+#if __linux__ && WITH_XEN
static int testDevice(const char *path, int expect)
{
int actual = xenLinuxDomainDeviceID(NULL, 1, path);
@@ -31,7 +31,7 @@ int
main(void)
{
int ret = 0;
-#ifdef __linux__
+#if __linux__ && WITH_XEN
/* Some of our tests delibrately test failure cases, so
* register a handler to stop error messages cluttering
* up display
--
1.5.4.rc5.1.ge6bfe
6140
days inactive
6140
days old
4 comments
3 participants
participants (3)
-
Guido Guenther -
Jim Meyering -
Richard W.M. Jones