aboutsummaryrefslogtreecommitdiffstats
path: root/extras/mini-os/fbfront.c
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2010-04-06 07:13:19 +0100
committerKeir Fraser <keir.fraser@citrix.com>2010-04-06 07:13:19 +0100
commit453c7b64421b0520de33fdc130863f60a0f1bf9c (patch)
tree11c0c137e30bc58c5bb596d69c9ec7941b63aceb /extras/mini-os/fbfront.c
parentefdf57d6133754c78a095ae15174f83f88039fb8 (diff)
downloadxen-453c7b64421b0520de33fdc130863f60a0f1bf9c.tar.gz
xen-453c7b64421b0520de33fdc130863f60a0f1bf9c.tar.bz2
xen-453c7b64421b0520de33fdc130863f60a0f1bf9c.zip
mini-os: Fix xenbus initialisation
This fixes xenbus initialization of blkfront, netfront and pcifront by uniformizing with fbfront: after writing parameters, set state to initialised, then wait for backend to switch to connect state, and then only read its parameter and switch to the connect state. Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Diffstat (limited to 'extras/mini-os/fbfront.c')
-rw-r--r--extras/mini-os/fbfront.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/extras/mini-os/fbfront.c b/extras/mini-os/fbfront.c
index 7ab4778e67..fa4fc428cc 100644
--- a/extras/mini-os/fbfront.c
+++ b/extras/mini-os/fbfront.c
@@ -126,8 +126,8 @@ again:
snprintf(path, sizeof(path), "%s/state", nodename);
err = xenbus_switch_state(xbt, path, XenbusStateInitialised);
if (err) {
- printk("error writing initialized: %s\n", err);
- free(err);
+ printk("error writing fb initialized: %s\n", err);
+ goto abort_transaction;
}
err = xenbus_transaction_end(xbt, 0, &retry);
@@ -189,6 +189,7 @@ done:
printk("************************** KBDFRONT\n");
return dev;
+
error:
free(msg);
free(err);