Merge branch 'master' into master-gdb_stubs

Conflicts:
	i386/i386at/com.c

1 files changed, 8 insertions, 4 deletions

diff --git a/xen/xen.c b/xen/xen.c
index 062ee4d5..f8f964eb 100644
--- a/xen/xen.c
+++ b/xen/xen.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2007 Samuel Thibault <samuel.thibault@ens-lyon.org>
+ *  Copyright (C) 2007-2011 Samuel Thibault <samuel.thibault@ens-lyon.org>
  *
  * This program is free software ; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -46,13 +46,17 @@ void hyp_init(void)
 { 
         hyp_grant_init(); 
         hyp_store_init(); 
-	/* these depend on the above */
-        hyp_block_init(); 
-        hyp_net_init(); 
 	evtchn_port_t port = hyp_event_channel_bind_virq(VIRQ_DEBUG, 0);
 	hyp_evt_handler(port, hyp_debug, 0, SPL7);
 } 
 
+void hyp_dev_init(void)
+{
+	/* these depend on hyp_init() and working threads */
+	hyp_block_init(); 
+	hyp_net_init(); 
+}
+
 void _hyp_halt(void)
 {
 	hyp_halt();