From owner-freebsd-xen@FreeBSD.ORG  Mon Jan 17 10:28:54 2011
Return-Path: <owner-freebsd-xen@FreeBSD.ORG>
Delivered-To: freebsd-xen@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2A42F106566B
	for <freebsd-xen@freebsd.org>; Mon, 17 Jan 2011 10:28:54 +0000 (UTC)
	(envelope-from snabb@epipe.com)
Received: from tiktik.epipe.com (tiktik.epipe.com [IPv6:2001:1828:0:3::2])
	by mx1.freebsd.org (Postfix) with ESMTP id C827B8FC12
	for <freebsd-xen@freebsd.org>; Mon, 17 Jan 2011 10:28:53 +0000 (UTC)
Received: from tiktik.epipe.com (tiktik.epipe.com [IPv6:2001:1828:0:3::2])
	by tiktik.epipe.com (8.14.4/8.14.4) with ESMTP id p0HASrbU033243
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
	for <freebsd-xen@freebsd.org>; Mon, 17 Jan 2011 10:28:53 GMT
	(envelope-from snabb@epipe.com)
X-DKIM: Sendmail DKIM Filter v2.8.3 tiktik.epipe.com p0HASrbU033243
DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=epipe.com; s=default;
	t=1295260133; x=1295864933;
	bh=2mwFdTNZDxHCUgx/uXTXRSvigLBA+9C9lkwgc3/umE4=;
	h=Date:From:To:Subject:In-Reply-To:Message-ID:References:
	MIME-Version:Content-Type;
	b=V51uxgaw2PAujW/EdtjQEgyVlXKpbDPhOqi/h+YIpQCblTi5k6fYvkKdWIwBCLu9Y
	MKPf7gu5xqPivTXUm9HqMrCADoJwHK0qAsRDn5IVE/DJcCzL2Kk+umbqL6F0WNhvtM
	Zsksu8YgAoBjrMdGl7qO2YAkPCiRepAjr4j8VzJQ=
Date: Mon, 17 Jan 2011 10:28:53 +0000 (UTC)
From: Janne Snabb <snabb@epipe.com>
To: freebsd-xen@freebsd.org
In-Reply-To: <alpine.BSF.2.00.1101171018400.20212@tiktik.epipe.com>
Message-ID: <alpine.BSF.2.00.1101171026200.20212@tiktik.epipe.com>
References: <alpine.BSF.2.00.1101150731240.20212@tiktik.epipe.com>
	<alpine.BSF.2.00.1101151002450.20212@tiktik.epipe.com>
	<alpine.BSF.2.00.1101171018400.20212@tiktik.epipe.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.2.6
	(tiktik.epipe.com [IPv6:2001:1828:0:3::2]);
	Mon, 17 Jan 2011 10:28:53 +0000 (UTC)
Subject: Re: xn0: Error 2 parsing device/vif/0/mac [PATCH]
X-BeenThere: freebsd-xen@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussion of the freebsd port to xen - implementation and usage
	<freebsd-xen.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-xen>,
	<mailto:freebsd-xen-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-xen>
List-Post: <mailto:freebsd-xen@freebsd.org>
List-Help: <mailto:freebsd-xen-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-xen>,
	<mailto:freebsd-xen-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Jan 2011 10:28:54 -0000

On Mon, 17 Jan 2011, Janne Snabb wrote:

> This patch might be a bit neater.

Oops, bug. A bracket at the wrong place. This one should be better.

Sorry about the noise,
--
Janne Snabb / EPIPE Communications
snabb@epipe.com - http://epipe.com/


--- sys/dev/xen/netfront/netfront.c.orig	2010-12-21 17:09:25.000000000 +0000
+++ sys/dev/xen/netfront/netfront.c	2011-01-17 10:11:06.000000000 +0000
@@ -401,13 +401,14 @@
 xen_net_read_mac(device_t dev, uint8_t mac[])
 {
 	int error, i;
 	char *s, *e, *macstr;
 
-	error = xs_read(XST_NIL, xenbus_get_node(dev), "mac", NULL,
-	    (void **) &macstr);
-	if (error)
+	if ((error = xs_read(XST_NIL, xenbus_get_node(dev), "mac", NULL,
+	    (void **) &macstr)) != 0 &&
+	    (error = xs_read(XST_NIL, xenbus_get_otherend_path(dev), 
+	    "mac", NULL, (void **) &macstr)) != 0)
 		return (error);
 
 	s = macstr;
 	for (i = 0; i < ETHER_ADDR_LEN; i++) {
 		mac[i] = strtoul(s, &e, 16);