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.

We still keep __RUMPUSER_XEN__ for now in order to make xen-unstable
pass osstest push gate. I will remove __RUMPUSER_XEN__ later.

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>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/tools/libxc/xc_private.c b/tools/libxc/xc_private.c
index e2441ad7ecd127894c8db7290ad7686a4e9996d9..df6cd9b53525cb4b5a712966d210ccca21550f8d 100644 (file)
--- 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(__RUMPUSER_XEN__) && !defined(__RUMPRUN__)
 #define DO_DYNAMIC_OSDEP
 #endif
 

diff --git a/tools/xenstore/xs_lib.c b/tools/xenstore/xs_lib.c
index d1664976d4b9fdd3c431f3788affbe820b08a3e0..47951625c1d63460d5d24d6ba9004f64c50ab811 100644 (file)
--- 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(__RUMPUSER_XEN__) || defined(__RUMPRUN__)
        return "/dev/xen/xenbus";
 #elif defined(__linux__)
        return "/proc/xen/xenbus";