abort minios driver initialisation if xenbus not ready - xenstore stubdom doesn't need them anyway
PATCH 19/24 abort minios driver initialisation if xenbus not ready - xenstore stubdom doesn't need them anyway
Aborts initializing some drivers if xenbus is not available.
The only situation in which xenbus will not be available is when the mini-os domain is a xenstored stubdom - in which case none of the affected drivers (fs-front, lwip-net, netfront) are used anyway.
So this patch is really just defensive coding.
Signed-off-by Diego Ongaro <[email protected]>
Signed-off-by Alex Zeffertt <[email protected]>
---
extras/mini-os/fs-front.c +4 -0
@@ -1231,6 +1231,10 @@ {struct minios_list_head *entry;struct fs_import *import =NULL ; + +if (!is_xenbus_ready ()) +return ; +printk ("Initing FS fronend(s).\n" );//exports = probe_exports();
extras/mini-os/lwip-net.c +3 -1
@@ -350,7 +350,9 @@tprintk ("Waiting for network.\n" ); dev =init_netfront (NULL ,NULL , rawmac, &ip); - +if (dev ==NULL ) +tprintk ("start_networking abort: init_netfront failed\n" ); +if (ip) { ipaddr.addr =inet_addr (ip);if (IN_CLASSA (ntohl (ipaddr.addr)))
extras/mini-os/netfront.c +3 -0
@@ -311,6 +311,9 @@struct netfront_dev *dev;char path[strlen (nodename) +1 +10 +1 ]; + +if (!is_xenbus_ready ()) +return NULL ;if (!thenetif_rx) thenetif_rx = netif_rx;
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel