Skip to contentSkip to conversation

rump kernels: use new platform macro

PATCH Superseded Wei Liu 2 participants 3 messages Feb 3, 2015

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Wei Liu

author
#0 lore raw

PATCH 1/1 rump kernels: use new platform macro

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

Cc Ian Campbell <[email protected]>
Cc Ian Jackson <[email protected]>
---
 tools/libxc/xc_private.c | 2 +-
 tools/xenstore/xs_lib.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
tools/libxc/xc_private.c +1 -1
index e2441ad..bc680ff 100644
@@ -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
 
tools/xenstore/xs_lib.c +1 -1
index d166497..40aa324 100644
@@ -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";
Signature · 1 line
1.9.1
#1 lore raw
Quoted 3 lines · 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.

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.

author
#2 lore raw
Quoted 7 lines · Ian Campbell
Quoted 3 lines · 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.

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.

Quoted 7 lines

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.

Quoted 3 lines

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.

Quoted 2 lines

Ian.