aboutsummaryrefslogtreecommitdiffstats
path: root/extras
diff options
context:
space:
mode:
Diffstat (limited to 'extras')
-rw-r--r--extras/mini-os/pcifront.c19
1 files changed, 14 insertions, 5 deletions
diff --git a/extras/mini-os/pcifront.c b/extras/mini-os/pcifront.c
index ed402a8a19..718abf1d73 100644
--- a/extras/mini-os/pcifront.c
+++ b/extras/mini-os/pcifront.c
@@ -276,15 +276,24 @@ void pcifront_scan(struct pcifront_dev *dev, void (*func)(unsigned int domain, u
{
char *path;
int i, n, len;
- char *s, *msg;
+ char *s, *msg = NULL, *err = NULL;
unsigned int domain, bus, slot, fun;
if (!dev)
dev = pcidev;
- if (!dev)
- dev = init_pcifront(NULL);
- if (!dev)
- return;
+ if (!dev) {
+ xenbus_event_queue events = NULL;
+ char *fe_state = "device/pci/0/state";
+ xenbus_watch_path_token(XBT_NIL, fe_state, fe_state, &events);
+ while ((err = xenbus_read(XBT_NIL, fe_state, &msg)) != NULL || msg[0] != '4') {
+ free(msg);
+ free(err);
+ printk("pcifront_scan: waiting for pcifront to become ready\n");
+ xenbus_wait_for_watch(&events);
+ }
+ xenbus_unwatch_path_token(XBT_NIL, fe_state, fe_state);
+ dev = pcidev;
+ }
len = strlen(dev->backend) + 1 + 5 + 10 + 1;
path = (char *) malloc(len);