svn commit: r309317 - in stable/10: . share/man/man4

[Dexuan Cui]

Author: dexuan
Date: Wed Nov 30 07:51:46 2016
New Revision: 309317
URL: https://svnweb.freebsd.org/changeset/base/309317

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

Deleted:
  stable/10/share/man/man4/hv_ata_pci_disengage.4
Modified:
  stable/10/ObsoleteFiles.inc
  stable/10/share/man/man4/Makefile
  stable/10/share/man/man4/hv_vmbus.4
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/ObsoleteFiles.inc
==============================================================================
--- stable/10/ObsoleteFiles.inc	Wed Nov 30 07:45:05 2016	(r309316)
+++ stable/10/ObsoleteFiles.inc	Wed Nov 30 07:51:46 2016	(r309317)
@@ -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

Modified: stable/10/share/man/man4/Makefile
==============================================================================
--- stable/10/share/man/man4/Makefile	Wed Nov 30 07:45:05 2016	(r309316)
+++ stable/10/share/man/man4/Makefile	Wed Nov 30 07:51:46 2016	(r309317)
@@ -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

Modified: stable/10/share/man/man4/hv_vmbus.4
==============================================================================
--- stable/10/share/man/man4/hv_vmbus.4	Wed Nov 30 07:45:05 2016	(r309316)
+++ stable/10/share/man/man4/hv_vmbus.4	Wed Nov 30 07:51:46 2016	(r309317)
@@ -35,6 +35,7 @@ To compile this driver into the kernel, 
 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