Module Name: src
Committed By: jym
Date: Sat Oct 16 00:18:06 UTC 2010
Modified Files:
src/sys/arch/xen/xen: if_xennet_xenbus.c
Log Message:
Handle error case (avoid changing to XenbusStateConnected when resume
failed)
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/xen/xen/if_xennet_xenbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/xen/xen/if_xennet_xenbus.c
diff -u src/sys/arch/xen/xen/if_xennet_xenbus.c:1.42 src/sys/arch/xen/xen/if_xennet_xenbus.c:1.43
--- src/sys/arch/xen/xen/if_xennet_xenbus.c:1.42 Sat Oct 16 00:12:08 2010
+++ src/sys/arch/xen/xen/if_xennet_xenbus.c Sat Oct 16 00:18:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xennet_xenbus.c,v 1.42 2010/10/16 00:12:08 jym Exp $ */
+/* $NetBSD: if_xennet_xenbus.c,v 1.43 2010/10/16 00:18:06 jym Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -85,7 +85,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.42 2010/10/16 00:12:08 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.43 2010/10/16 00:18:06 jym Exp $");
#include "opt_xen.h"
#include "opt_nfs_boot.h"
@@ -530,8 +530,9 @@
xenbus_switch_state(sc->sc_xbusd, NULL, XenbusStateClosed);
break;
case XenbusStateInitWait:
- xennet_xenbus_resume(sc);
- xenbus_switch_state(sc->sc_xbusd, NULL, XenbusStateConnected);
+ if (xennet_xenbus_resume(sc) == 0)
+ xenbus_switch_state(sc->sc_xbusd, NULL,
+ XenbusStateConnected);
break;
case XenbusStateUnknown:
default:
