Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci vmx(4) should be MI. moved to sys/dev/pci from s...



details:   https://anonhg.NetBSD.org/src/rev/7cbacb630429
branches:  trunk
changeset: 955847:7cbacb630429
user:      ryo <ryo%NetBSD.org@localhost>
date:      Wed Oct 14 10:19:10 2020 +0000

description:
vmx(4) should be MI. moved to sys/dev/pci from sys/arch/x86/pci

diffstat:

 distrib/sets/lists/man/mi        |     8 +-
 share/man/man4/Makefile          |     4 +-
 share/man/man4/man4.x86/Makefile |     4 +-
 share/man/man4/man4.x86/vmx.4    |   115 -
 share/man/man4/vmx.4             |   115 +
 sys/arch/x86/pci/files.pci       |     7 +-
 sys/arch/x86/pci/if_vmx.c        |  3658 --------------------------------------
 sys/arch/x86/pci/if_vmxreg.h     |   336 ---
 sys/dev/pci/files.pci            |     8 +-
 sys/dev/pci/if_vmx.c             |  3658 ++++++++++++++++++++++++++++++++++++++
 sys/dev/pci/if_vmxreg.h          |   336 +++
 11 files changed, 4125 insertions(+), 4124 deletions(-)

diffs (truncated from 8371 to 300 lines):

diff -r 54e01c3da3c7 -r 7cbacb630429 distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Wed Oct 14 08:49:04 2020 +0000
+++ b/distrib/sets/lists/man/mi Wed Oct 14 10:19:10 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1704 2020/09/27 13:31:04 roy Exp $
+# $NetBSD: mi,v 1.1705 2020/10/14 10:19:10 ryo Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -2024,6 +2024,7 @@
 ./usr/share/man/cat4/vlan.0                    man-sys-catman          .cat
 ./usr/share/man/cat4/vmmon.0                   man-sys-catman          .cat
 ./usr/share/man/cat4/vmnet.0                   man-sys-catman          .cat
+./usr/share/man/cat4/vmx.0                     man-sys-catman          .cat
 ./usr/share/man/cat4/vnd.0                     man-sys-catman          .cat
 ./usr/share/man/cat4/voodoofb.0                        man-sys-catman          .cat
 ./usr/share/man/cat4/vr.0                      man-sys-catman          .cat
@@ -2089,7 +2090,6 @@
 ./usr/share/man/cat4/x86/tprof_amdpmi.0                man-obsolete            obsolete
 ./usr/share/man/cat4/x86/tprof_pmi.0           man-obsolete            obsolete
 ./usr/share/man/cat4/x86/vmt.0                 man-sys-catman          .cat
-./usr/share/man/cat4/x86/vmx.0                 man-sys-catman          .cat
 ./usr/share/man/cat4/xbd.0                     man-sys-catman          .cat
 ./usr/share/man/cat4/xbdback.0                 man-sys-catman          .cat
 ./usr/share/man/cat4/xbox.0                    man-sys-catman          .cat
@@ -5163,6 +5163,7 @@
 ./usr/share/man/html4/vlan.html                        man-sys-htmlman         html
 ./usr/share/man/html4/vmmon.html               man-sys-htmlman         html
 ./usr/share/man/html4/vmnet.html               man-sys-htmlman         html
+./usr/share/man/html4/vmx.html                 man-sys-htmlman         html
 ./usr/share/man/html4/vnd.html                 man-sys-htmlman         html
 ./usr/share/man/html4/voodoofb.html            man-sys-htmlman         html
 ./usr/share/man/html4/vr.html                  man-sys-htmlman         html
@@ -5228,7 +5229,6 @@
 ./usr/share/man/html4/x86/tprof_amdpmi.html    man-obsolete            obsolete
 ./usr/share/man/html4/x86/tprof_pmi.html       man-obsolete            obsolete
 ./usr/share/man/html4/x86/vmt.html             man-sys-htmlman         html
-./usr/share/man/html4/x86/vmx.html             man-sys-htmlman         html
 ./usr/share/man/html4/xbd.html                 man-sys-htmlman         html
 ./usr/share/man/html4/xbdback.html             man-sys-htmlman         html
 ./usr/share/man/html4/xbox.html                        man-sys-htmlman         html
@@ -8234,6 +8234,7 @@
 ./usr/share/man/man4/vlan.4                    man-sys-man             .man
 ./usr/share/man/man4/vmmon.4                   man-sys-man             .man
 ./usr/share/man/man4/vmnet.4                   man-sys-man             .man
+./usr/share/man/man4/vmx.4                     man-sys-man             .man
 ./usr/share/man/man4/vnd.4                     man-sys-man             .man
 ./usr/share/man/man4/voodoofb.4                        man-sys-man             .man
 ./usr/share/man/man4/vr.4                      man-sys-man             .man
@@ -8299,7 +8300,6 @@
 ./usr/share/man/man4/x86/tprof_amdpmi.4                man-obsolete            obsolete
 ./usr/share/man/man4/x86/tprof_pmi.4           man-obsolete            obsolete
 ./usr/share/man/man4/x86/vmt.4                 man-sys-man             .man
-./usr/share/man/man4/x86/vmx.4                 man-sys-man             .man
 ./usr/share/man/man4/xbd.4                     man-sys-man             .man
 ./usr/share/man/man4/xbdback.4                 man-sys-man             .man
 ./usr/share/man/man4/xbox.4                    man-sys-man             .man
diff -r 54e01c3da3c7 -r 7cbacb630429 share/man/man4/Makefile
--- a/share/man/man4/Makefile   Wed Oct 14 08:49:04 2020 +0000
+++ b/share/man/man4/Makefile   Wed Oct 14 10:19:10 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.709 2020/09/27 13:31:04 roy Exp $
+#      $NetBSD: Makefile,v 1.710 2020/10/14 10:19:11 ryo Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/18/93
 
 MAN=   aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -69,7 +69,7 @@
        unix.4 userconf.4 \
        vald.4 valz.4 veriexec.4 vga.4 vge.4 viaide.4 video.4 \
        vio9p.4 vioif.4 viomb.4 viornd.4 vioscsi.4 virt.4 virtio.4 \
-       vether.4 vlan.4 vmmon.4 vmnet.4 vnd.4 voodoofb.4 vr.4 vte.4 \
+       vether.4 vlan.4 vmmon.4 vmnet.4 vmx.4 vnd.4 voodoofb.4 vr.4 vte.4 \
        wapbl.4 wb.4 wbsio.4 wd.4 wdc.4 wg.4 wi.4 wm.4 wpi.4 \
        wsbell.4 wscons.4 wsdisplay.4 wsfont.4 wskbd.4 wsmouse.4 wsmux.4 \
        xbox.4 xge.4 \
diff -r 54e01c3da3c7 -r 7cbacb630429 share/man/man4/man4.x86/Makefile
--- a/share/man/man4/man4.x86/Makefile  Wed Oct 14 08:49:04 2020 +0000
+++ b/share/man/man4/man4.x86/Makefile  Wed Oct 14 10:19:10 2020 +0000
@@ -1,8 +1,8 @@
-#      $NetBSD: Makefile,v 1.19 2018/07/21 09:51:20 kre Exp $
+#      $NetBSD: Makefile,v 1.20 2020/10/14 10:19:11 ryo Exp $
 
 MAN=   amdpcib.4 apic.4 balloon.4 coretemp.4 est.4 fdc.4 \
        fwhrng.4 hpet.4 ichlpcib.4 imcsmb.4 lpt.4 mem.4 odcm.4 powernow.4 \
-       soekrisgpio.4 tco.4 vmt.4 vmx.4 \
+       soekrisgpio.4 tco.4 vmt.4 \
        amdsmn.4 amdzentemp.4
 
 MLINKS+=apic.4 ioapic.4 \
diff -r 54e01c3da3c7 -r 7cbacb630429 share/man/man4/man4.x86/vmx.4
--- a/share/man/man4/man4.x86/vmx.4     Wed Oct 14 08:49:04 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,115 +0,0 @@
-.\"    $NetBSD: vmx.4,v 1.2 2014/06/10 07:26:19 wiz Exp $
-.\"    $OpenBSD: vmx.4,v 1.1 2013/05/31 20:18:44 reyk Exp $
-.\"
-.\" Copyright (c) 2006,2013 Reyk Floeter <reyk%openbsd.org@localhost>
-.\"
-.\" Permission to use, copy, modify, and distribute this software for any
-.\" purpose with or without fee is hereby granted, provided that the above
-.\" copyright notice and this permission notice appear in all copies.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.\"
-.Dd June 7, 2014
-.Dt VMX 4
-.Os
-.Sh NAME
-.Nm vmx
-.Nd VMware VMXNET3 Virtual Interface Controller device
-.Sh SYNOPSIS
-.Cd "vmx* at pci? dev ? function ?"
-.Sh DESCRIPTION
-The
-.Nm
-driver provides support for the VMXNET3 virtual NIC available in virtual
-machines by VMware.
-It appears as a simple Ethernet device but is actually a virtual network
-interface to the underlying host operating system.
-.Pp
-This driver supports the
-.Ic VMXNET3
-driver protocol, as an alternative to the emulated
-.Xr pcn 4 ,
-.Xr wm 4
-interfaces also available in the VMware environment.
-The
-.Nm vmx
-driver is optimized for the virtual machine, it can provide advanced
-capabilities depending on the underlying host operating system and
-the physical network interface controller of the host.
-In comparison to the earlier VMXNET versions,
-VMXNET3 supports additional features like multiqueue support, IPv6
-checksum offloading, MSI/MSI-X support and hardware VLAN tagging in
-VMware's VLAN Guest Tagging (VGT) mode.
-.Pp
-The
-.Nm
-driver supports VMXNET3 VMware virtual NICs provided by the virtual
-machine hardware version 7 or newer, as provided by the following
-products:
-.Pp
-.Bl -bullet -compact -offset indent
-.It
-VMware ESX/ESXi 4.0 and newer
-.It
-VMware Server 2.0 and newer
-.It
-VMware Workstation 6.5 and newer
-.It
-VMware Fusion 2.0 and newer
-.El
-.Pp
-The
-.Nm
-driver supports the following media types:
-.Bl -tag -width autoselect
-.It autoselect
-Enable autoselection of the media type and options.
-The driver always uses the fastest available speed and the media
-options provided by the underlying host of the virtual machine.
-.It 10GbaseT mediaopt full-duplex
-Set 10Gbps operation.
-.It 1000baseT mediaopt full-duplex
-Set 1000Mbps operation.
-.El
-.Pp
-For more information on configuring this device, see
-.Xr ifconfig 8 .
-.Sh EXAMPLES
-The following entry must be added to the VMware configuration file
-to provide the
-.Nm
-device:
-.Bd -literal -offset indent
-ethernet0.virtualDev = "vmxnet3"
-.Ed
-.Sh SEE ALSO
-.Xr arp 4 ,
-.Xr ifmedia 4 ,
-.Xr intro 4 ,
-.Xr netintro 4 ,
-.Xr pci 4 ,
-.Xr pcn 4 ,
-.Xr wm 4 ,
-.Xr ifconfig 8
-.Sh HISTORY
-The
-.Nm
-device driver first appeared in
-.Ox 5.5
-and was ported for
-.Nx 7.0 .
-.Sh AUTHORS
-.An -nosplit
-The
-.Nm
-driver was originally written by
-.An Tsubai Masanari .
-.Nx porting was done by
-.An Hikaru ABE
-.Aq Mt hikaru%NetBSD.org@localhost .
diff -r 54e01c3da3c7 -r 7cbacb630429 share/man/man4/vmx.4
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/share/man/man4/vmx.4      Wed Oct 14 10:19:10 2020 +0000
@@ -0,0 +1,115 @@
+.\"    $NetBSD: vmx.4,v 1.1 2020/10/14 10:19:11 ryo Exp $
+.\"    $OpenBSD: vmx.4,v 1.1 2013/05/31 20:18:44 reyk Exp $
+.\"
+.\" Copyright (c) 2006,2013 Reyk Floeter <reyk%openbsd.org@localhost>
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd June 7, 2014
+.Dt VMX 4
+.Os
+.Sh NAME
+.Nm vmx
+.Nd VMware VMXNET3 Virtual Interface Controller device
+.Sh SYNOPSIS
+.Cd "vmx* at pci? dev ? function ?"
+.Sh DESCRIPTION
+The
+.Nm
+driver provides support for the VMXNET3 virtual NIC available in virtual
+machines by VMware.
+It appears as a simple Ethernet device but is actually a virtual network
+interface to the underlying host operating system.
+.Pp
+This driver supports the
+.Ic VMXNET3
+driver protocol, as an alternative to the emulated
+.Xr pcn 4 ,
+.Xr wm 4
+interfaces also available in the VMware environment.
+The
+.Nm vmx
+driver is optimized for the virtual machine, it can provide advanced
+capabilities depending on the underlying host operating system and
+the physical network interface controller of the host.
+In comparison to the earlier VMXNET versions,
+VMXNET3 supports additional features like multiqueue support, IPv6
+checksum offloading, MSI/MSI-X support and hardware VLAN tagging in
+VMware's VLAN Guest Tagging (VGT) mode.
+.Pp
+The
+.Nm
+driver supports VMXNET3 VMware virtual NICs provided by the virtual
+machine hardware version 7 or newer, as provided by the following
+products:
+.Pp
+.Bl -bullet -compact -offset indent
+.It
+VMware ESX/ESXi 4.0 and newer
+.It
+VMware Server 2.0 and newer
+.It
+VMware Workstation 6.5 and newer
+.It
+VMware Fusion 2.0 and newer
+.El
+.Pp
+The
+.Nm
+driver supports the following media types:
+.Bl -tag -width autoselect
+.It autoselect
+Enable autoselection of the media type and options.
+The driver always uses the fastest available speed and the media
+options provided by the underlying host of the virtual machine.
+.It 10GbaseT mediaopt full-duplex
+Set 10Gbps operation.
+.It 1000baseT mediaopt full-duplex
+Set 1000Mbps operation.
+.El
+.Pp
+For more information on configuring this device, see
+.Xr ifconfig 8 .
+.Sh EXAMPLES
+The following entry must be added to the VMware configuration file
+to provide the
+.Nm
+device:
+.Bd -literal -offset indent



Home | Main Index | Thread Index | Old Index