summaryrefslogtreecommitdiff
path: root/device
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2011-02-07 03:18:50 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2011-02-07 03:18:50 +0100
commitaaf803372bd4b30b97a2039e4b1b36b07c0a7250 (patch)
tree55e7c21adb37f514c2d888f5d3141659eea67ced /device
parentd683da41fcfefcc8ba63b1fa1ab8af5b3078183f (diff)
Defer Xen device initialization to device_service_create
* device/device_init.c (device_service_create) [MACH_HYP]: Call hyp_dev_init. * xen/xen.c (hyp_init): Do not call hyp_block_init and hyp_net_init, now called in ... (hyp_dev_init): New function. * xen/xen.h (hyp_dev_init): New declaration.
Diffstat (limited to 'device')
-rw-r--r--device/device_init.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/device/device_init.c b/device/device_init.c
index 1da2a6f..e43a2a9 100644
--- a/device/device_init.c
+++ b/device/device_init.c
@@ -33,6 +33,7 @@
#include <ipc/ipc_space.h>
#include <kern/debug.h>
#include <kern/task.h>
+#include <xen/xen.h>
#include <device/device_types.h>
#include <device/device_port.h>
@@ -57,6 +58,9 @@ device_service_create()
panic("can't allocate master device port");
mach_device_init();
+#ifdef MACH_HYP
+ hyp_dev_init();
+#endif
dev_lookup_init();
net_io_init();
device_pager_init();