[src/trunk]: src Alright, set xvif(4) syntax once and for all. Tested with ip...

[jym <jym%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/af365a2b7f09
branches:  trunk
changeset: 763912:af365a2b7f09
user:      jym <jym%NetBSD.org@localhost>
date:      Wed Apr 06 23:51:55 2011 +0000

description:
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

diffstat:

 share/man/man4/xvif.4                |  12 ++++++------
 sys/arch/xen/xen/xennetback_xenbus.c |   4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (61 lines):

diff -r 92eee075b046 -r af365a2b7f09 share/man/man4/xvif.4
--- a/share/man/man4/xvif.4     Wed Apr 06 21:55:36 2011 +0000
+++ b/share/man/man4/xvif.4     Wed Apr 06 23:51:55 2011 +0000
@@ -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.
diff -r 92eee075b046 -r af365a2b7f09 sys/arch/xen/xen/xennetback_xenbus.c
--- a/sys/arch/xen/xen/xennetback_xenbus.c      Wed Apr 06 21:55:36 2011 +0000
+++ b/sys/arch/xen/xen/xennetback_xenbus.c      Wed Apr 06 23:51:55 2011 +0000
@@ -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 */