Module Name: src
Committed By: jym
Date: Wed Apr 6 23:51:56 UTC 2011
Modified Files:
src/share/man/man4: xvif.4
src/sys/arch/xen/xen: xennetback_xenbus.c
Log Message:
Alright, set xvif(4) syntax once and for all. Tested with ipf(4) under
XEN3_DOM0 amd64.
Fixes PR misc/39376.
See http://mail-index.netbsd.org/port-xen/2011/04/06/msg006603.html
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/xvif.4
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/xen/xen/xennetback_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/share/man/man4/xvif.4
diff -u src/share/man/man4/xvif.4:1.3 src/share/man/man4/xvif.4:1.4
--- src/share/man/man4/xvif.4:1.3 Sun Apr 3 23:44:46 2011
+++ src/share/man/man4/xvif.4 Wed Apr 6 23:51:56 2011
@@ -1,4 +1,4 @@
-.\" $NetBSD: xvif.4,v 1.3 2011/04/03 23:44:46 jym Exp $
+.\" $NetBSD: xvif.4,v 1.4 2011/04/06 23:51:56 jym Exp $
.\"
.\" Copyright (c) 2011 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd April 4, 2011
+.Dd April 7, 2011
.Dt XVIF 4 xen
.Os
.Sh NAME
@@ -62,7 +62,7 @@
All
.Nm
interfaces follow the
-.Dq xvifX-Y
+.Dq xvifXiY
naming convention, where
.Sq X
represents the guest domain identifier, and
@@ -80,12 +80,12 @@
similar to two Ethernet cards connected via a crossover cable.
.Sh DIAGNOSTICS
.Bl -diag
-.It "xvif%d-%d: can't read %s/mac: %d"
+.It "xvif%di%d: can't read %s/mac: %d"
The MAC address for this interface could not be read from XenStore.
-.It "xvif%d-%d: %s is not a valid mac address"
+.It "xvif%di%d: %s is not a valid mac address"
The MAC address specified in the configuration file of the newly
created guest domain is invalid.
-.It "xvif%d-%d: Ethernet address %s"
+.It "xvif%di%d: Ethernet address %s"
MAC address of the
.Nm
interface.
Index: src/sys/arch/xen/xen/xennetback_xenbus.c
diff -u src/sys/arch/xen/xen/xennetback_xenbus.c:1.39 src/sys/arch/xen/xen/xennetback_xenbus.c:1.40
--- src/sys/arch/xen/xen/xennetback_xenbus.c:1.39 Sun Apr 3 23:21:37 2011
+++ src/sys/arch/xen/xen/xennetback_xenbus.c Wed Apr 6 23:51:55 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xennetback_xenbus.c,v 1.39 2011/04/03 23:21:37 jym Exp $ */
+/* $NetBSD: xennetback_xenbus.c,v 1.40 2011/04/06 23:51:55 jym Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -271,7 +271,7 @@
ifp = &xneti->xni_if;
ifp->if_softc = xneti;
- snprintf(ifp->if_xname, IFNAMSIZ, "xvif%d-%d",
+ snprintf(ifp->if_xname, IFNAMSIZ, "xvif%di%d",
(int)domid, (int)handle);
/* read mac address */
