diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2009-11-23 07:14:33 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2009-11-23 07:14:33 +0000 |
| commit | 5c3c739758bab8439be9c20cb99483d0a822abaf (patch) | |
| tree | 4572bb0f8e13caeadfb4967b6362bd24a9b6fa1f | |
| parent | 41c532e4e5016d0e6aea5bc79a6a62d293eb5e15 (diff) | |
| download | xen-5c3c739758bab8439be9c20cb99483d0a822abaf.tar.gz xen-5c3c739758bab8439be9c20cb99483d0a822abaf.tar.bz2 xen-5c3c739758bab8439be9c20cb99483d0a822abaf.zip | |
pcifront: fix multiple initialization bug
Now that we have pcifront_watches to dynamically initialize pcifront
we don't need a call to init_pcifront in pcilib and pcifront_scan
anymore; we should just wait for the frontend to connect to the
backend instead.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
| -rw-r--r-- | extras/mini-os/pcifront.c | 19 | ||||
| -rw-r--r-- | stubdom/pciutils.patch | 4 |
2 files changed, 15 insertions, 8 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); diff --git a/stubdom/pciutils.patch b/stubdom/pciutils.patch index 93510bf562..ce9e987b2c 100644 --- a/stubdom/pciutils.patch +++ b/stubdom/pciutils.patch @@ -64,7 +64,7 @@ diff -urN pciutils-2.2.9.orig/lib/access.c pciutils-2.2.9/lib/access.c --- pciutils-2.2.9.orig/lib/minios.c 1970-01-01 01:00:00.000000000 +0100 +++ pciutils-2.2.9/lib/minios.c 2008-07-01 12:31:40.554260000 +0100 -@@ -0,0 +1,108 @@ +@@ -0,0 +1,106 @@ +/* + * The PCI Library -- MiniOS PCI frontend access + * @@ -87,8 +87,6 @@ diff -urN pciutils-2.2.9.orig/lib/access.c pciutils-2.2.9/lib/access.c +static void +minios_init(struct pci_access *a) +{ -+ if (!init_pcifront(NULL)) -+ a->warning("minios_init open failed"); +} + +static void |