Pass command line to rumprun_boot() and rumpconfig().

diff --git a/include/rumprun-base/config.h b/include/rumprun-base/config.h
index a0892c53489b45171fae8d28421134bd2d4b8978..76301b0c22e60015ca1e2859cf13c4d48b2d0819 100644 (file)
--- a/include/rumprun-base/config.h
+++ b/include/rumprun-base/config.h
@@ -26,7 +26,7 @@
 #ifndef _BMKCOMMON_RUMPRUN_CONFIG_H_
 #define _BMKCOMMON_RUMPRUN_CONFIG_H_
 
-void _rumprun_config(void);
+void _rumprun_config(const char *);
 void _rumprun_deconfig(void);
 
 #endif /* _BMKCOMMON_RUMPRUN_CONFIG_H_ */

diff --git a/include/rumprun-base/rumprun.h b/include/rumprun-base/rumprun.h
index 7e17739176595b32381f977ddb49fd73d9f99e8a..fa51b1a9389f286fc03e4c2151734c9192399ac4 100644 (file)
--- a/include/rumprun-base/rumprun.h
+++ b/include/rumprun-base/rumprun.h
@@ -26,7 +26,7 @@
 #ifndef _RUMPRUN_BASE_RUMPRUN_H_
 #define _RUMPRUN_BASE_RUMPRUN_H_
 
-void   rumprun_boot(void);
+void   rumprun_boot(const char *);
 
 void * rumprun(int (*)(int, char *[]), int, char *[]);
 int    rumprun_wait(void *);

diff --git a/lib/librumprun_base/rumprun.c b/lib/librumprun_base/rumprun.c
index adac39a05b6c72c57563137226ee57ab9c5886c7..9a553a873cb3aefe6c97a660ad3ec1c469f5e27e 100644 (file)
--- a/lib/librumprun_base/rumprun.c
+++ b/lib/librumprun_base/rumprun.c
@@ -47,7 +47,7 @@ static pthread_mutex_t w_mtx;
 static pthread_cond_t w_cv;
 
 void
-rumprun_boot(void)
+rumprun_boot(const char *cmdline)
 {
 
        rump_boot_setsigmodel(RUMP_SIGMODEL_IGNORE);
@@ -69,7 +69,7 @@ rumprun_boot(void)
 #ifdef RUMP_SYSPROXY
        rump_init_server("tcp://0:12345");
 #endif
-       _rumprun_config();
+       _rumprun_config(cmdline);
 
        /*
         * give all threads a chance to run, and ensure that the main

diff --git a/platform/baremetal/init.c b/platform/baremetal/init.c
index 0347e91d434ffcb2bb64ab7b2d5bbc4797fa9e07..88831a02a2153a920c1155264ebea78fd2cd4452 100644 (file)
--- a/platform/baremetal/init.c
+++ b/platform/baremetal/init.c
@@ -32,12 +32,12 @@
 #include <rumprun-base/rumprun.h>
 
 void
-bmk_mainthread(void *notused)
+bmk_mainthread(void *cmdline)
 {
         char *argv[] = {"bmk_main", 0};
        void *cookie;
 
-       rumprun_boot();
+       rumprun_boot(cmdline);
 
        cookie = rumprun(main, 1, argv);
        rumprun_wait(cookie);

diff --git a/platform/baremetal/kernel.c b/platform/baremetal/kernel.c
index de67c4080116dbc52dbb2302d0e337a186e38b72..bde5f806455904f934d9b999636d13d2449bcb65 100644 (file)
--- a/platform/baremetal/kernel.c
+++ b/platform/baremetal/kernel.c
@@ -202,7 +202,7 @@ bmk_main(struct multiboot_info *mbi)
        bmk_isr_init();
 
        /* enough bootstrap already, jump to main thread */
-       bmk_sched_init(bmk_mainthread, NULL);
+       bmk_sched_init(bmk_mainthread, (void *)mbi->cmdline);
 }
 
 /*

diff --git a/platform/baremetal/rumpconfig.c b/platform/baremetal/rumpconfig.c
index 4938cae3808043eb6a723d068dde4030053032de..8e7634f913532ea441dc12a07148fef15adc4723 100644 (file)
--- a/platform/baremetal/rumpconfig.c
+++ b/platform/baremetal/rumpconfig.c
@@ -36,7 +36,7 @@
  */
 
 void
-_rumprun_config(void)
+_rumprun_config(const char *cmdline)
 {
 
        /* le hack */

diff --git a/platform/xen/callmain.c b/platform/xen/callmain.c
index 352e5715729c92ed8235ef42a72f0f9d854e8ef7..8aa44d4ea0b37a5723424cd2d2b1f12b6347ca2d 100644 (file)
--- a/platform/xen/callmain.c
+++ b/platform/xen/callmain.c
@@ -95,7 +95,7 @@ __default_app_main(start_info_t *si)
        argv[nargs+1] = 0;
        argv[nargs+2] = 0;
 
-       rumprun_boot();
+       rumprun_boot(NULL); /* Xen doesn't use cmdline the same way (yet?) */
 
        cookie = rumprun(main, nargs+1, argv);
        rumprun_wait(cookie);

diff --git a/platform/xen/rumpconfig.c b/platform/xen/rumpconfig.c
index 6ee5bf5f689fead8739a159689355a8ab2927f4d..bc50f7f2dc8af00a598c30cdad72f4f499eb8012 100644 (file)
--- a/platform/xen/rumpconfig.c
+++ b/platform/xen/rumpconfig.c
@@ -475,7 +475,7 @@ out:
 }
 
 void
-_rumprun_config(void)
+_rumprun_config(const char *cmdline_unused)
 {
        char *err = NULL;
        xenbus_transaction_t txn;