From 7203b89c15311d9a8bb7d6d645403170ce009b6c Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Tue, 4 May 2010 12:15:28 +0100 Subject: mini-os: Revert 21106:b20f897d6010 "Fix xenbus initialisation" Jeremy Fitzhardinge (jeremy@goop.org) reports that this fixes HVM+stubdom. Signed-off-by: Keir Fraser --- extras/mini-os/netfront.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'extras/mini-os/netfront.c') diff --git a/extras/mini-os/netfront.c b/extras/mini-os/netfront.c index bc70b98b4a..5674c4ae0f 100644 --- a/extras/mini-os/netfront.c +++ b/extras/mini-os/netfront.c @@ -407,9 +407,9 @@ again: } snprintf(path, sizeof(path), "%s/state", nodename); - err = xenbus_switch_state(xbt, path, XenbusStateInitialised); + err = xenbus_switch_state(xbt, path, XenbusStateConnected); if (err) { - printk("error writing net initialized: %s\n", err); + message = "switching state"; goto abort_transaction; } @@ -445,7 +445,6 @@ done: { XenbusState state; char path[strlen(dev->backend) + 1 + 5 + 1]; - char frontpath[strlen(nodename) + 1 + 6 + 1]; snprintf(path, sizeof(path), "%s/state", dev->backend); xenbus_watch_path_token(XBT_NIL, path, path, &dev->events); @@ -464,16 +463,6 @@ done: snprintf(path, sizeof(path), "%s/ip", dev->backend); xenbus_read(XBT_NIL, path, ip); } - - printk("%s connected\n", dev->backend); - - snprintf(frontpath, sizeof(frontpath), "%s/state", nodename); - if((err = xenbus_switch_state(XBT_NIL, frontpath, XenbusStateConnected)) - != NULL) { - printk("error switching state: %s\n", err); - xenbus_unwatch_path_token(XBT_NIL, path, path); - goto error; - } } printk("**************************\n"); @@ -492,7 +481,6 @@ done: &rawmac[5]); return dev; - error: free(msg); free(err); -- cgit v1.2.3