From aaf803372bd4b30b97a2039e4b1b36b07c0a7250 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon, 7 Feb 2011 03:18:50 +0100
Subject: 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.
---
 device/device_init.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'device/device_init.c')

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();
-- 
cgit v1.2.3