rump kernels: Build with RUMP_DEV_XEN_DEBUG and filter out debug messages

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

diff --git a/ts-rumprun-build b/ts-rumprun-build
index 1913f29f14a05346c818a354bf489aba48c6ad87..f408359405763637fa6c0770714032a55dd6f72d 100755 (executable)
--- a/ts-rumprun-build
+++ b/ts-rumprun-build
@@ -44,7 +44,10 @@ sub massage() {
 }
 
 sub build() {
-    target_cmd_build($ho, 7200, $rux, <<END);
+    my $debug_build = $r{rumprun_build_debug} || 'y';
+    target_cmd_build($ho, 7200, $rux, ($debug_build ? <<END : ''). <<END);
+        export RUMP_DEV_XEN_DEBUG=1
+END
         export XEN_HEADERS=$xendist/usr/local/include/xen
         (./build-rr.sh xen && touch ../build-ok-stamp) |tee ../log
         test -f ../build-ok-stamp #/

diff --git a/ts-rumprun-demo-xenstorels b/ts-rumprun-demo-xenstorels
index b5f3b287d00577619a3b4ac113771ad6a0908664..4c4568856c54326ee206d0e33130f6d55b94c8da 100755 (executable)
--- a/ts-rumprun-demo-xenstorels
+++ b/ts-rumprun-demo-xenstorels
@@ -84,6 +84,8 @@ sub their_xenstorels () {
        $output{theirs} = $`;
        die "EXIT STATUS $1 ?" if $1 ne '0';
        $output{theirs} =~ s{^STUB \`\`\w+'' called\n}{}mg;
+       $output{theirs} =~ s{^/dev/xen/xenbus[:[].*\n}{}mg;
+       $output{theirs} =~ s{^xen devsw:.*\n}{}mg;
     }, <<END);
         cat /var/log/xen/console/guest-$gn.log
 END