diff options
author | dexuan <dexuan@FreeBSD.org> | 2016-11-30 07:22:46 +0000 |
---|---|---|
committer | dexuan <dexuan@FreeBSD.org> | 2016-11-30 07:22:46 +0000 |
commit | efbe09a9eca0be39102e58f7e3961618b5be3dc5 (patch) | |
tree | 536c1695a0ca3ad5ea8950d499aec235d4e4aaf7 /share | |
parent | 93e1e35ef2f30ec3ae26cabc2e61c96dd2f91582 (diff) | |
download | FreeBSD-src-efbe09a9eca0be39102e58f7e3961618b5be3dc5.zip FreeBSD-src-efbe09a9eca0be39102e58f7e3961618b5be3dc5.tar.gz |
MFC 308797-308799, 309082
r308797
update the hv_vmbus(4) manual by adding a dependency on pci
We enhanced the vmbus driver to support PCIe pass-through recently.
Reviewed by: sephe
Approved by: sephe (mentor)
Sponsored by: Microsoft
r308798
remove the hv_ata_pci_disengage(4) manual
A few months ago, we removed the driver, which was not necessary any longer.
Reviewed by: sephe
Approved by: sephe (mentor)
Sponsored by: Microsoft
r308799
fix share/man/man4/Makefile for hv_ata_pci_disengage.4
We need to remove the line since we removed the related manual just now.
Reviewed by: sephe
Approved by: sephe (mentor)
Sponsored by: Microsoft
r309082
share/man/man4/Makefile: Only install Hyper-V man pages on amd64 and i386
We shouldn't install them on the architectures not supported by Hyper-V.
And, hv_ata_pci_disengage.4.gz should be removed from all architectures:
1) It should have only applied to Hyper-V;
2) For Hyper-V platforms (amd64 and i386), the related driver was removed by
r306426 | sephe | 2016-09-29 09:41:52 +0800 (Thu, 29 Sep 2016),
because now we have a better mechanism to disble the ata driver for hard
disks when the VM runs on Hyper-V.
Reviewed by: sephe, andrew, jhb
Approved by: sephe (mentor)
Sponsored by: Microsoft
Differential Revision: https://reviews.freebsd.org/D8572
Diffstat (limited to 'share')
-rw-r--r-- | share/man/man4/Makefile | 16 | ||||
-rw-r--r-- | share/man/man4/hv_ata_pci_disengage.4 | 90 | ||||
-rw-r--r-- | share/man/man4/hv_vmbus.4 | 2 |
3 files changed, 11 insertions, 97 deletions
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index e94dff4..6423a82 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -187,12 +187,11 @@ MAN= aac.4 \ ${_hptmv.4} \ ${_hptnr.4} \ ${_hptrr.4} \ - hv_ata_pci_disengage.4 \ - hv_kvp.4 \ - hv_netvsc.4 \ - hv_storvsc.4 \ - hv_utils.4 \ - hv_vmbus.4 \ + ${_hv_kvp.4} \ + ${_hv_netvsc.4} \ + ${_hv_storvsc.4} \ + ${_hv_utils.4} \ + ${_hv_vmbus.4} \ hwpmc.4 \ ichsmb.4 \ ${_ichwd.4} \ @@ -776,6 +775,11 @@ _hptiop.4= hptiop.4 _hptmv.4= hptmv.4 _hptnr.4= hptnr.4 _hptrr.4= hptrr.4 +_hv_kvp.4= hv_kvp.4 +_hv_netvsc.4= hv_netvsc.4 +_hv_storvsc.4= hv_storvsc.4 +_hv_utils.4= hv_utils.4 +_hv_vmbus.4= hv_vmbus.4 _i8254.4= i8254.4 _ichwd.4= ichwd.4 _if_bxe.4= if_bxe.4 diff --git a/share/man/man4/hv_ata_pci_disengage.4 b/share/man/man4/hv_ata_pci_disengage.4 deleted file mode 100644 index e7a3352..0000000 --- a/share/man/man4/hv_ata_pci_disengage.4 +++ /dev/null @@ -1,90 +0,0 @@ -.\" $FreeBSD$ -.\" -.\" Copyright (c) 2012 Microsoft Corp. -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.Dd September 10, 2013 -.Dt HYPER-V 4 -.Os -.Sh NAME -.Nm hv_ata_pci_disengage -.Nd Hyper-V ATA PCI Disengage driver -.Sh SYNOPSIS -To compile this driver into the kernel, place the following lines in -the system kernel configuration file: -.Bd -ragged -offset indent -.Cd "device hyperv" -.Ed -.Sh DESCRIPTION -The -.Nm -driver prevents the native -.Fx -ATA driver from -loading in the presence of Hyper-V. -.Fx -guests running on Hyper-V can take advantage of the Hyper-V Storage -Virtual Consumer -.Pq Xr hv_storvsc 4 -for using their IDE devices. -Since the ATA -driver serves IDE devices as well, there is a chance that the ATA driver may -interfere with the operations of -.Xr hv_storvsc 4 . -The -.Nm -driver avoids -conflicts between the ATA driver and -.Xr hv_storvsc 4 -by disabling the ATA driver -when the -.Fx -guest is booting. -.Pp -A side effect of disabling the ATA driver is that CDROM may become -inoperational on -.Fx -guest partitions. -If CDROM access is a must then users may use -"set hw.ata.disk_enable=1" at boot time to prevent the ATA driver from being -disabled. -.Sh SEE ALSO -.Xr hv_netvsc 4 , -.Xr hv_storvsc 4 , -.Xr hv_utils 4 , -.Xr hv_vmbus 4 -.Sh HISTORY -Support for -.Nm -first appeared in -.Fx 10.0 . -The driver was developed through a joint effort between Citrix Incorporated, -Microsoft Corporation, and Network Appliance Incorporated. -.Sh AUTHORS -.An -nosplit -.Fx -support for -.Nm -was first added by -.An Microsoft BSD Integration Services Team Aq Mt bsdic@microsoft.com . diff --git a/share/man/man4/hv_vmbus.4 b/share/man/man4/hv_vmbus.4 index d992be5..eb661b8 100644 --- a/share/man/man4/hv_vmbus.4 +++ b/share/man/man4/hv_vmbus.4 @@ -35,6 +35,7 @@ To compile this driver into the kernel, place the following lines in the system kernel configuration file: .Bd -ragged -offset indent .Cd "device hyperv" +.Cd "device pci" .Ed .Sh DESCRIPTION The @@ -73,7 +74,6 @@ the interface that facilitate high performance bi-directional communication between the VSCs and VSPs. All VSCs utilize the VMBus driver. .Sh SEE ALSO -.Xr hv_ata_pci_disengage 4 , .Xr hv_netvsc 4 , .Xr hv_storvsc 4 , .Xr hv_utils 4 |