From: Wei Liu Date: Tue, 3 Feb 2015 13:47:08 +0000 (+0000) Subject: rump kernels: use new platform macro X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~3791 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=441256a532dd737905ce335506d2ffcf0ff0db7c;p=xen.git 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 Cc: Ian Campbell Acked-by: Ian Jackson --- diff --git a/tools/libxc/xc_private.c b/tools/libxc/xc_private.c index e2441ad7ec..df6cd9b535 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 d1664976d4..47951625c1 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";