diff options
author | Samuel Thibault <samuel.thibaut@ens-lyon.org> | 2013-01-09 08:43:53 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibaut@ens-lyon.org> | 2013-01-09 08:43:53 +0000 |
commit | 4813ceb154c194395dda8c6817e1f06c000470d2 (patch) | |
tree | 9dc921acbd3ffcba03cc929d8f41e251efec0879 /extras | |
parent | cc4707100aad115c0f384f576c020c6255e77ffb (diff) | |
download | xen-4813ceb154c194395dda8c6817e1f06c000470d2.tar.gz xen-4813ceb154c194395dda8c6817e1f06c000470d2.tar.bz2 xen-4813ceb154c194395dda8c6817e1f06c000470d2.zip |
mini-os: Notify shutdown through weak function call instead of wake queue
To allow for more flexibility, this notifies domain shutdown through a
function rather than a wake queue, to let the application use a wake
queue only if it wishes.
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Committed-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'extras')
-rw-r--r-- | extras/mini-os/include/kernel.h | 3 | ||||
-rw-r--r-- | extras/mini-os/kernel.c | 18 | ||||
-rw-r--r-- | extras/mini-os/test.c | 13 |
3 files changed, 21 insertions, 13 deletions
diff --git a/extras/mini-os/include/kernel.h b/extras/mini-os/include/kernel.h index 78692e6c12..b36f172ed8 100644 --- a/extras/mini-os/include/kernel.h +++ b/extras/mini-os/include/kernel.h @@ -1,9 +1,6 @@ #ifndef _KERNEL_H_ #define _KERNEL_H_ -extern unsigned int do_shutdown; -extern unsigned int shutdown_reason; -extern struct wait_queue_head shutdown_queue; extern void do_exit(void) __attribute__((noreturn)); extern void stop_kernel(void); diff --git a/extras/mini-os/kernel.c b/extras/mini-os/kernel.c index 0313ec8715..e9402b911d 100644 --- a/extras/mini-os/kernel.c +++ b/extras/mini-os/kernel.c @@ -48,12 +48,6 @@ uint8_t xen_features[XENFEAT_NR_SUBMAPS * 32]; -#ifdef CONFIG_XENBUS -unsigned int do_shutdown = 0; -unsigned int shutdown_reason; -DECLARE_WAIT_QUEUE_HEAD(shutdown_queue); -#endif - void setup_xen_features(void) { xen_feature_info_t fi; @@ -71,12 +65,19 @@ void setup_xen_features(void) } #ifdef CONFIG_XENBUS +/* This should be overridden by the application we are linked against. */ +__attribute__((weak)) void app_shutdown(unsigned reason) +{ + printk("Shutdown requested: %d\n", reason); +} + static void shutdown_thread(void *p) { const char *path = "control/shutdown"; const char *token = path; xenbus_event_queue events = NULL; char *shutdown, *err; + unsigned int shutdown_reason; xenbus_watch_path_token(XBT_NIL, path, token, &events); while ((err = xenbus_read(XBT_NIL, path, &shutdown)) != NULL) { @@ -94,10 +95,7 @@ static void shutdown_thread(void *p) else /* Unknown */ shutdown_reason = SHUTDOWN_crash; - wmb(); - do_shutdown = 1; - wmb(); - wake_up(&shutdown_queue); + app_shutdown(shutdown_reason); } #endif diff --git a/extras/mini-os/test.c b/extras/mini-os/test.c index 95e2d697f8..0f348d2aac 100644 --- a/extras/mini-os/test.c +++ b/extras/mini-os/test.c @@ -45,6 +45,10 @@ #include <xen/features.h> #include <xen/version.h> +static unsigned int do_shutdown = 0; +static unsigned int shutdown_reason; +static DECLARE_WAIT_QUEUE_HEAD(shutdown_queue); + static struct netfront_dev *net_dev; static struct semaphore net_sem = __SEMAPHORE_INITIALIZER(net_sem, 0); @@ -487,6 +491,15 @@ void shutdown_frontends(void) #endif } +void app_shutdown(unsigned reason) +{ + shutdown_reason = reason; + wmb(); + do_shutdown = 1; + wmb(); + wake_up(&shutdown_queue); +} + static void shutdown_thread(void *p) { DEFINE_WAIT(w); |