From owner-svn-src-all@FreeBSD.ORG Fri Sep 13 18:47:59 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 9F33C662; Fri, 13 Sep 2013 18:47:59 +0000 (UTC) (envelope-from grehan@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 720F82A43; Fri, 13 Sep 2013 18:47:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8DIlxX1085993; Fri, 13 Sep 2013 18:47:59 GMT (envelope-from grehan@svn.freebsd.org) Received: (from grehan@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8DIlw3k085966; Fri, 13 Sep 2013 18:47:58 GMT (envelope-from grehan@svn.freebsd.org) Message-Id: <201309131847.r8DIlw3k085966@svn.freebsd.org> From: Peter Grehan Date: Fri, 13 Sep 2013 18:47:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255524 - in head/sys: amd64/conf conf dev/hyperv modules X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Sep 2013 18:47:59 -0000 Author: grehan Date: Fri Sep 13 18:47:58 2013 New Revision: 255524 URL: http://svnweb.freebsd.org/changeset/base/255524 Log: Import Hyper-V paravirtualized drivers from projects/hyperv branch into head. Approved by: re@ (hrs) Obtained from: Microsoft, NetApp, and Citrix. Added: head/sys/dev/hyperv/ - copied from r255521, projects/hyperv/sys/dev/hyperv/ - copied from r255521, projects/hyperv/sys/modules/hyperv/ Directory Properties: head/sys/modules/hyperv/ (props changed) Modified: head/sys/amd64/conf/GENERIC head/sys/conf/files.amd64 head/sys/modules/Makefile Modified: head/sys/amd64/conf/GENERIC ============================================================================== --- head/sys/amd64/conf/GENERIC Fri Sep 13 18:45:10 2013 (r255523) +++ head/sys/amd64/conf/GENERIC Fri Sep 13 18:47:58 2013 (r255524) @@ -340,3 +340,7 @@ device vtnet # VirtIO Ethernet device device virtio_blk # VirtIO Block device device virtio_scsi # VirtIO SCSI device device virtio_balloon # VirtIO Memory Balloon device + +# HyperV drivers +device hyperv # HyperV drivers + Modified: head/sys/conf/files.amd64 ============================================================================== --- head/sys/conf/files.amd64 Fri Sep 13 18:45:10 2013 (r255523) +++ head/sys/conf/files.amd64 Fri Sep 13 18:47:58 2013 (r255524) @@ -221,6 +221,18 @@ dev/hwpmc/hwpmc_uncore.c optional hwpmc dev/hwpmc/hwpmc_piv.c optional hwpmc dev/hwpmc/hwpmc_tsc.c optional hwpmc dev/hwpmc/hwpmc_x86.c optional hwpmc +dev/hyperv/netvsc/hv_net_vsc.c optional hyperv +dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c optional hyperv +dev/hyperv/netvsc/hv_rndis_filter.c optional hyperv +dev/hyperv/stordisengage/hv_ata_pci_disengage.c optional hyperv +dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c optional hyperv +dev/hyperv/utilities/hv_util.c optional hyperv +dev/hyperv/vmbus/hv_channel.c optional hyperv +dev/hyperv/vmbus/hv_channel_mgmt.c optional hyperv +dev/hyperv/vmbus/hv_connection.c optional hyperv +dev/hyperv/vmbus/hv_hv.c optional hyperv +dev/hyperv/vmbus/hv_ring_buffer.c optional hyperv +dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c optional hyperv dev/kbd/kbd.c optional atkbd | sc | ukbd dev/lindev/full.c optional lindev dev/lindev/lindev.c optional lindev Modified: head/sys/modules/Makefile ============================================================================== --- head/sys/modules/Makefile Fri Sep 13 18:45:10 2013 (r255523) +++ head/sys/modules/Makefile Fri Sep 13 18:47:58 2013 (r255524) @@ -126,6 +126,7 @@ SUBDIR= \ ${_hptnr} \ ${_hptrr} \ hwpmc \ + ${_hyperv} \ ${_i2c} \ ${_ibcs2} \ ${_ichwd} \ @@ -671,6 +672,7 @@ _hptmv= hptmv _hptnr= hptnr _hptrr= hptrr .endif +_hyperv= hyperv _i2c= i2c _ichwd= ichwd _ida= ida