From owner-p4-projects@FreeBSD.ORG  Sat Jan  5 07:48:05 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8455516A46B; Sat,  5 Jan 2008 07:48:05 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 49F6616A418
	for <perforce@freebsd.org>; Sat,  5 Jan 2008 07:48:05 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 487E413C44B
	for <perforce@freebsd.org>; Sat,  5 Jan 2008 07:48:05 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m057m5d3026152
	for <perforce@freebsd.org>; Sat, 5 Jan 2008 07:48:05 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m057m5tN026149
	for perforce@freebsd.org; Sat, 5 Jan 2008 07:48:05 GMT
	(envelope-from kmacy@freebsd.org)
Date: Sat, 5 Jan 2008 07:48:05 GMT
Message-Id: <200801050748.m057m5tN026149@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 132558 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Jan 2008 07:48:05 -0000

http://perforce.freebsd.org/chv.cgi?CH=132558

Change 132558 by kmacy@pandemonium:kmacy:xen31 on 2008/01/05 07:47:38

	return error in initialization failure
	set initial state to initializing

Affected files ...

.. //depot/projects/xen31/sys/xen/xenbus/xenbus_probe.c#5 edit

Differences ...

==== //depot/projects/xen31/sys/xen/xenbus/xenbus_probe.c#5 (text+ko) ====

@@ -600,7 +600,11 @@
 	char *tmpstring;
 
 	XenbusState state = xenbus_read_driver_state(nodename);
+
+	if (bus->error)
+			return (bus->error);
 	
+	
 	if (state != XenbusStateInitialising) {
 		/* Device is not new, so ignore it.  This can happen if a
 		   device is going away after switching to Closed.  */
@@ -612,6 +616,7 @@
 	if (!xendev)
 		return -ENOMEM;
 	memset(xendev, 0, sizeof(*xendev));
+	xendev->state = XenbusStateInitialising;
 	
 	/* Copy the strings into the extra space. */