[PATCH] rump kernels: use new platform macro

[PATCH] rump kernels: use new platform macro

[Wei Liu]

Starting from rump kernel changeset 91d5623 ("Renaming platform macros,
app-tools and autoconf target string"), __RUMPUSER_XEN__ and __RUMPAPP__
are deleted. We are supposed to use __RUMPRUN__ instead.

Related discussion:
http://thread.gmane.org/gmane.comp.rumpkernel.user/739

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
 tools/libxc/xc_private.c | 2 +-
 tools/xenstore/xs_lib.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/libxc/xc_private.c b/tools/libxc/xc_private.c
index e2441ad..bc680ff 100644
--- a/tools/libxc/xc_private.c
+++ b/tools/libxc/xc_private.c
@@ -33,7 +33,7 @@
 
 #define XENCTRL_OSDEP "XENCTRL_OSDEP"
 
-#if !defined (__MINIOS__) && !defined(__RUMPUSER_XEN__)
+#if !defined (__MINIOS__) && !defined(__RUMPRUN__)
 #define DO_DYNAMIC_OSDEP
 #endif
 
diff --git a/tools/xenstore/xs_lib.c b/tools/xenstore/xs_lib.c
index d166497..40aa324 100644
--- a/tools/xenstore/xs_lib.c
+++ b/tools/xenstore/xs_lib.c
@@ -79,7 +79,7 @@ const char *xs_domain_dev(void)
 	char *s = getenv("XENSTORED_PATH");
 	if (s)
 		return s;
-#if defined(__RUMPUSER_XEN__)
+#if defined(__RUMPRUN__)
 	return "/dev/xen/xenbus";
 #elif defined(__linux__)
 	return "/proc/xen/xenbus";
-- 
1.9.1

Re: [PATCH] rump kernels: use new platform macro

[Ian Campbell]

On Tue, 2015-02-03 at 13:10 +0000, Wei Liu wrote:
> Starting from rump kernel changeset 91d5623 ("Renaming platform macros,
> app-tools and autoconf target string"), __RUMPUSER_XEN__ and __RUMPAPP__
> are deleted. We are supposed to use __RUMPRUN__ instead.

How much do we care about forward/backwards compat here?

One specific potential wrinkle:

I suspect rumpkernel changeset 91d5623 cannot pass the rump kernel push
gate without this change in the xen being used (which is the output opf
the Xen gate), and this change cannot pass the xen-unstable push gate
without the rumpkernel one, so we have an impasse.

I think we probably need libxc to handle both __RUMPRUN__ and
__RUMPUSER_XEN_, at least for the time being (which might be a very
short time while the other change passes its gate).

Ian.

Re: [PATCH] rump kernels: use new platform macro

[Wei Liu]

On Tue, Feb 03, 2015 at 01:27:54PM +0000, Ian Campbell wrote:
> On Tue, 2015-02-03 at 13:10 +0000, Wei Liu wrote:
> > Starting from rump kernel changeset 91d5623 ("Renaming platform macros,
> > app-tools and autoconf target string"), __RUMPUSER_XEN__ and __RUMPAPP__
> > are deleted. We are supposed to use __RUMPRUN__ instead.
> 
> How much do we care about forward/backwards compat here?
> 

I don't think rump kernel ever declared a macro stable for a specific
version. In fact, rump kernel is not yet officially released AFAICT.

> One specific potential wrinkle:
> 
> I suspect rumpkernel changeset 91d5623 cannot pass the rump kernel push
> gate without this change in the xen being used (which is the output opf
> the Xen gate), and this change cannot pass the xen-unstable push gate
> without the rumpkernel one, so we have an impasse.
> 

Ah, yes. I missed that xen-unstable is also gated by rump kernel build.

> I think we probably need libxc to handle both __RUMPRUN__ and
> __RUMPUSER_XEN_, at least for the time being (which might be a very
> short time while the other change passes its gate).

I will resend a patch to have both __RUMPRUN__ and __RUMPUSER_XEN__.

Wei.

> 
> Ian.