[PATCH v2] rump kernels: use new platform macro

[PATCH v2] 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.

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>
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..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";
-- 
1.9.1

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

[Ian Jackson]

Wei Liu writes ("[PATCH v2] 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.

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

I will push shortly.

Ian.

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

[Ian Jackson]

Wei Liu writes ("[PATCH v2] 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.

Actually, I think there is a problem here.  Are we supposed to
backport this patch to previous (stable, released) versions of Xen ?
Obviously we can do that but I don't think we should be breaking the
rumpkernel build for old versions of Xen, at least until there has
been quite a while for the stable backports to make it into Xen.

If we apply Wei's patch to xen.git#staging, and it ends up in
xen.git#master, the osstest rumpuser-xen push gate will pass and push
the rumpkernel changes to the osstest push gate output.  That version
will then be used for tests of Xen 4.5, causing the Xen 4.5 push gate
to fail.

I think this shows that:
  - Wei's patch should not be applied to xen.git#staging yet
  - The rump kernel tree ought to continue to -D the old names for now
  - After that, Wei's patch should go into xen.git#staging and be
    a backport candidate
  - The rump kernel tree may remove the old -D's only (at least)
    after Wei's patch has made it to xen.git#stable-4.*; but preferably
    only after stable Xen releases have been made containing Wei's
    patch.

I'm sorry that I didn't spot in the rumpkernel-users messages about
this that it was intended to remove the old -D options.

Thanks,
Ian.

[rumpuserxen test] 34575: regressions - FAIL

[xen.org]

flight 34575 rumpuserxen real [real]
http://www.chiark.greenend.org.uk/~xensrcts/logs/34575/

Regressions :-(

Tests which did not succeed and are blocking,
including tests which could not be run:
 build-i386-rumpuserxen        6 xen-build                 fail REGR. vs. 33866
 build-amd64-rumpuserxen       6 xen-build                 fail REGR. vs. 33866

Tests which did not succeed, but are not blocking:
 test-amd64-amd64-rumpuserxen-amd64  1 build-check(1)               blocked n/a
 test-amd64-i386-rumpuserxen-i386  1 build-check(1)               blocked  n/a

version targeted for testing:
 rumpuserxen          40a43b875215c583b301631247439cfa33283758
baseline version:
 rumpuserxen          30d72f3fc5e35cd53afd82c8179cc0e0b11146ad

------------------------------------------------------------
People who touched revisions under test:
  Ian Jackson <Ian.Jackson@eu.citrix.com>
  Martin Lucina <martin@lucina.net>
------------------------------------------------------------

jobs:
 build-amd64                                                  pass    
 build-i386                                                   pass    
 build-amd64-pvops                                            pass    
 build-i386-pvops                                             pass    
 build-amd64-rumpuserxen                                      fail    
 build-i386-rumpuserxen                                       fail    
 test-amd64-amd64-rumpuserxen-amd64                           blocked 
 test-amd64-i386-rumpuserxen-i386                             blocked 


------------------------------------------------------------
sg-report-flight on osstest.cam.xci-test.com
logs: /home/xc_osstest/logs
images: /home/xc_osstest/images

Logs, config files, etc. are available at
    http://www.chiark.greenend.org.uk/~xensrcts/logs

Test harness code can be found at
    http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary


Not pushing.

------------------------------------------------------------
commit 40a43b875215c583b301631247439cfa33283758
Author: Martin Lucina <martin@lucina.net>
Date:   Sat Feb 14 18:47:38 2015 +0100

    Implement support for global constructors and destructors
    
    Based on @anttikantee's implementation in rumprun-baremetal.
    
    Signed-off-by: Martin Lucina <martin@lucina.net>

commit 8af836e751ed191f3e2918668649710dd307e0b5
Author: Martin Lucina <martin@lucina.net>
Date:   Tue Feb 10 10:49:23 2015 +0100

    Pull in latest buildrump.sh and src-netbsd
    
    For fixes to libc compat symbols missing (issue #21)

commit e28e2b9daf7ab2922913889d90ec438b9bee3d56
Author: Ian Jackson <ian.jackson@eu.citrix.com>
Date:   Wed Feb 4 16:29:26 2015 +0000

    app-tools: Support old -D__RUMPUSER_XEN__ for now
    
    Released versions of Xen (Xen 4.5) rely on __RUMPUSER_XEN__ being
    defined.
    
    A patch to change this in Xen upstream exists and will be backported,
    but until that makes it through to a stable point release of Xen 4.5,
    we should support both #defines.
    
    This commit partially reverts 91d56232d987
       Renaming platform macros, app-tools and autoconf target string
    
    Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
    CC: Martin Lucina <martin@lucina.net>
    CC: Ian Campbell <Ian.Campbell@eu.citrix.com>
    CC: Wei Liu <wei.liu2@citrix.com>

commit 05e06b0fe52918d6575e33b7d7551d85c93f7aff
Author: Martin Lucina <martin@lucina.net>
Date:   Mon Feb 2 18:01:52 2015 +0100

    Sync Travis CI configuration with app-tools rename
    
    Signed-off-by: Martin Lucina <martin@lucina.net>

commit 3b36d1f55a08e1849ccd5424afb0fbe29647bd6c
Author: Martin Lucina <martin@lucina.net>
Date:   Mon Feb 2 18:00:36 2015 +0100

    Remove even older rumpxen-app-* variants of app-tools
    
    Signed-off-by: Martin Lucina <martin@lucina.net>

commit 91d56232d987f5df594723ed46b9000b4d43e21a
Author: Martin Lucina <martin@lucina.net>
Date:   Mon Feb 2 17:52:41 2015 +0100

    Renaming platform macros, app-tools and autoconf target string
    
    As discussed at: http://thread.gmane.org/gmane.comp.rumpkernel.user/739
    
    This commit renames the platform macros, app-tools and autoconf target
    string to be consistent with current naming of the entire stack:
    
    app-tools/rumpapp-xen-* -> app-tools/rumprun-xen-*
    $ARCH-rumpxen-netbsd -> $ARCH-rumprun-netbsd
    -D__RUMPUSER_XEN__ -D__RUMPAPP__ -> -D__RUMPRUN__
    
    Signed-off-by: Martin Lucina <martin@lucina.net>

Re: [rumpuserxen test] 34575: regressions - FAIL

[Antti Kantee]

On 15/02/15 18:51, xen.org wrote:
> flight 34575 rumpuserxen real [real]
> http://www.chiark.greenend.org.uk/~xensrcts/logs/34575/
>
> Regressions :-(

This looks like a new failure:
=== snip ===
checking for ncurses.h... no
configure: error: Unable to find a suitable curses library
configure: error: ./configure failed for tools
=== snip ===

http://www.chiark.greenend.org.uk/~xensrcts/logs/34575/build-amd64-rumpuserxen/6.ts-xen-build.log

?

Can we work around it somehow?  I guess nobody wants to run the tools on 
a rump kernel.  Or am I completely misguessing what the tools are for?

[PATCH] tools/configure: detect $host_vendor of rumprun, not just rumpxen [and 1 more messages]

[Ian Jackson]

Antti Kantee writes ("Re: [rumpuserxen test] 34575: regressions - FAIL"):
> On 15/02/15 18:51, xen.org wrote:
> > flight 34575 rumpuserxen real [real]
> > http://www.chiark.greenend.org.uk/~xensrcts/logs/34575/
> >
> > Regressions :-(
> 
> This looks like a new failure:
> === snip ===
> checking for ncurses.h... no
> configure: error: Unable to find a suitable curses library
> configure: error: ./configure failed for tools

This is due to the configure host vendor rename in the rumpkernel
tree.  On Friday I pushed this patch to xen.git#staging:

Ian Jackson writes ("[PATCH] tools/configure: detect $host_vendor of rumprun, not just rumpxen"):
> This has been renamed by the rumpkernels upstream.
> 
> (This patch needs to be backported.)
...
>  case $host_vendor in
> -rumpxen) CONFIG_RUMP=y; rump=true ;;
> -*)       CONFIG_RUMP=n; rump=false ;;
> +rumpxen|rumprun) CONFIG_RUMP=y; rump=true ;;
> +*)               CONFIG_RUMP=n; rump=false ;;
>  esac

This passed the xen-unstable push gate this morning.  This is now
going to let the osstest rumpuser-xen push gate pass, I think.

I am about to backport this patch to the Xen 4.5 staging branch, as
this change will otherwise cause a regression there.

Ian.

------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=190641631&iu=/4140/ostg.clktrk

Re: [PATCH v2] rump kernels: use new platform macro [and 1 more messages]

[Ian Jackson]

Ian Jackson writes ("Re: [PATCH v2] rump kernels: use new platform macro"):
> Wei Liu writes ("[PATCH v2] 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.
...
> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

Ian Jackson writes ("[PATCH] tools/configure: detect $host_vendor of rumprun, not just rumpxen [and 1 more messages]"):
> Ian Jackson writes ("[PATCH] tools/configure: detect $host_vendor of rumprun, not just rumpxen"):
> > This has been renamed by the rumpkernels upstream.
> ...
> > +rumpxen|rumprun) CONFIG_RUMP=y; rump=true ;;
> > +*)               CONFIG_RUMP=n; rump=false ;;
...
> I am about to backport this patch to the Xen 4.5 staging branch, as
> this change will otherwise cause a regression there.

Now pushed to xen.git#staging-4.5.

Ian.

Re: [PATCH] tools/configure: detect $host_vendor of rumprun, not just rumpxen [and 1 more messages]

[Antti Kantee]

On 16/02/15 14:33, Ian Jackson wrote:
> Antti Kantee writes ("Re: [rumpuserxen test] 34575: regressions - FAIL"):
>> On 15/02/15 18:51, xen.org wrote:
>>> flight 34575 rumpuserxen real [real]
>>> http://www.chiark.greenend.org.uk/~xensrcts/logs/34575/
>>>
>>> Regressions :-(
>>
>> This looks like a new failure:
>> === snip ===
>> checking for ncurses.h... no
>> configure: error: Unable to find a suitable curses library
>> configure: error: ./configure failed for tools
>
> This is due to the configure host vendor rename in the rumpkernel
> tree.  On Friday I pushed this patch to xen.git#staging:
>
> Ian Jackson writes ("[PATCH] tools/configure: detect $host_vendor of rumprun, not just rumpxen"):
>> This has been renamed by the rumpkernels upstream.
>>
>> (This patch needs to be backported.)
> ...
>>   case $host_vendor in
>> -rumpxen) CONFIG_RUMP=y; rump=true ;;
>> -*)       CONFIG_RUMP=n; rump=false ;;
>> +rumpxen|rumprun) CONFIG_RUMP=y; rump=true ;;
>> +*)               CONFIG_RUMP=n; rump=false ;;
>>   esac
>
> This passed the xen-unstable push gate this morning.  This is now
> going to let the osstest rumpuser-xen push gate pass, I think.

Now, 1 week later, it appears things are still failing in the same place 
with the ncurses.h check:

http://www.chiark.greenend.org.uk/~xensrcts/logs/34949/build-amd64-rumpuserxen/6.ts-xen-build.log

> I am about to backport this patch to the Xen 4.5 staging branch, as
> this change will otherwise cause a regression there.

------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=190641631&iu=/4140/ostg.clktrk