MFC r308797-308799,309082

Approved by:	sephe (mentor)

    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

4 files changed, 22 insertions, 97 deletions

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 33565d8..87ae67c 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,17 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20161121: Hyper-V manuals only apply to amd64 and i386.
+.if ${TARGET_ARCH} != "amd64" && ${TARGET_ARCH} != "i386"
+OLD_FILES+=usr/share/man/man4/hv_kvp.4.gz
+OLD_FILES+=usr/share/man/man4/hv_netvsc.4.gz
+OLD_FILES+=usr/share/man/man4/hv_storvsc.4.gz
+OLD_FILES+=usr/share/man/man4/hv_utils.4.gz
+OLD_FILES+=usr/share/man/man4/hv_vmbus.4.gz
+OLD_FILES+=usr/share/man/man4/hv_vss.4.gz
+.endif
+# 20161118: Remove hv_ata_pci_disengage(4)
+OLD_FILES+=usr/share/man/man4/hv_ata_pci_disengage.4.gz
 # 20160723: stale MLINK removed
 OLD_FILES+=usr/share/man/man9/rman_await_resource.9.gz
 # 20160216: Remove obsolete unbound-control-setup
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 2dd3329..10b73cf 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -174,12 +174,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} \
@@ -749,6 +748,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 b8699f7..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_vmbus 4 ,
-.Xr hv_utils 4 ,
-.Xr hv_netvsc 4 ,
-.Xr hv_storvsc 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 bsdic@microsoft.com .
diff --git a/share/man/man4/hv_vmbus.4 b/share/man/man4/hv_vmbus.4
index 873cb28e..f50c42a 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
@@ -76,7 +77,6 @@ All VSCs utilize the VMBus driver.
 .Xr hv_utils 4 ,
 .Xr hv_netvsc 4 ,
 .Xr hv_storvsc 4 ,
-.Xr hv_ata_pci_disengage 4
 .Sh HISTORY
 Support for
 .Nm