From mboxrd@z Thu Jan  1 00:00:00 1970
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Subject: [PATCH 1 of 3] If Xen backend modules are not loaded,
	load them before starting Xend
Date: Tue, 22 Dec 2009 16:48:56 -0000
Message-ID: <7bd805a543da685a3dba.1261500536@phenom.dumpdata.com>
References: <patchbomb.1261500535@phenom.dumpdata.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <patchbomb.1261500535@phenom.dumpdata.com>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel@lists.xensource.com, keir.fraser@eu.citrix.com
Cc: konrad.wilk@oracle.com
List-Id: xen-devel@lists.xenproject.org

# HG changeset patch
# User konrad@phenom.dumpdata.com
# Date 1261439503 18000
# Node ID 7bd805a543da685a3dba7b8b0c4e3e7052c863b3
# Parent  fc27db3a2ddb3f0843841748684547f6e2ed1f02
If Xen backend modules are not loaded, load them before starting Xend.

The privileged domain can now have more Xen drivers be modules.
Lets take advantage of that and load them if they had not been
loaded yet.

diff -r fc27db3a2ddb -r 7bd805a543da tools/hotplug/Linux/init.d/xend
--- a/tools/hotplug/Linux/init.d/xend	Mon Dec 21 18:32:22 2009 -0500
+++ b/tools/hotplug/Linux/init.d/xend	Mon Dec 21 18:51:43 2009 -0500
@@ -28,6 +28,7 @@
      grep '	xenfs$' /proc/filesystems >/dev/null && \
    ! grep '^xenfs ' /proc/mounts >/dev/null;
 then
+	modprobe -q xenfs
 	mount -t xenfs xenfs /proc/xen
 fi
 
@@ -35,6 +36,14 @@
 	exit 0
 fi
 
+# Load the proper modules
+function load_modules
+{
+	test -d /sys/module/xen_blkback || modprobe -q xen_blkback
+	test -d /sys/module/xen_netback || modprobe -q xen_netback
+	test -d /sys/module/xen_evtchn || modprobe -q xen_evtchn
+	test -d /sys/module/pciback || modprobe -q xen_pciback
+}
 # Wait for Xend to be up
 function await_daemons_up
 {
@@ -57,6 +66,7 @@
 	test -z "$XENCONSOLED_TRACE" || export XENCONSOLED_TRACE
 	[[ "$XENSTORED_TRACE" == @(yes|on|1) ]] && export XENSTORED_TRACE
 	[[ "$XENBACKENDD_DEBUG" == @(yes|on|1) ]] && export XENBACKENDD_DEBUG
+	load_modules
 	xend start
 	await_daemons_up
 	;;