[Xen-changelog] [xen stable-4.5] rump kernels: use new platform macro

[patchbot@xxxxxxx]

commit 9fd6292ca3310bb712a82850d47d7e9a1f168e9f
Author:     Wei Liu <wei.liu2@xxxxxxxxxx>
AuthorDate: Tue Feb 3 13:47:08 2015 +0000
Commit:     Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
CommitDate: Mon Feb 16 14:47:14 2015 +0000

    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@xxxxxxxxxx>
    Cc: Ian Campbell <ian.campbell@xxxxxxxxxx>
    Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
    (cherry picked from commit 441256a532dd737905ce335506d2ffcf0ff0db7c)
---
 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..df6cd9b 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(__RUMPUSER_XEN__) && 
!defined(__RUMPRUN__)
 #define DO_DYNAMIC_OSDEP
 #endif
 
diff --git a/tools/xenstore/xs_lib.c b/tools/xenstore/xs_lib.c
index d166497..4795162 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(__RUMPUSER_XEN__) || defined(__RUMPRUN__)
        return "/dev/xen/xenbus";
 #elif defined(__linux__)
        return "/proc/xen/xenbus";
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.5

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog