Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/xen/xenbus previous fix does not work if there is e...



details:   https://anonhg.NetBSD.org/src/rev/3903a3d708c3
branches:  trunk
changeset: 764136:3903a3d708c3
user:      cegger <cegger%NetBSD.org@localhost>
date:      Tue Apr 12 05:09:32 2011 +0000

description:
previous fix does not work if there is exactly only one entry where continue
exits the loop.
Apply fix from Konrad Wilke on port-xen@
That makes NetBSD DomU boot on Linux Dom0 with xl.

diffstat:

 sys/arch/xen/xenbus/xenbus_probe.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r 5a714191ede4 -r 3903a3d708c3 sys/arch/xen/xenbus/xenbus_probe.c
--- a/sys/arch/xen/xenbus/xenbus_probe.c        Tue Apr 12 04:55:05 2011 +0000
+++ b/sys/arch/xen/xenbus/xenbus_probe.c        Tue Apr 12 05:09:32 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: xenbus_probe.c,v 1.30 2011/04/11 15:00:49 cegger Exp $ */
+/* $NetBSD: xenbus_probe.c,v 1.31 2011/04/12 05:09:32 cegger Exp $ */
 /******************************************************************************
  * Talks to Xen Store to figure out what devices we have.
  *
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xenbus_probe.c,v 1.30 2011/04/11 15:00:49 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenbus_probe.c,v 1.31 2011/04/12 05:09:32 cegger Exp $");
 
 #if 0
 #define DPRINTK(fmt, args...) \
@@ -317,6 +317,7 @@
                        printf("xenbus: can't get state "
                            "for %s (%d)\n", xbusd->xbusd_path, err);
                        free(xbusd, M_DEVBUF);
+                       err = 0;
                        continue;
                }
                if (state != XenbusStateInitialising) {



Home | Main Index | Thread Index | Old Index