From owner-svn-src-all@freebsd.org  Mon Jul 11 06:29:58 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 062F5B9136E;
 Mon, 11 Jul 2016 06:29:58 +0000 (UTC)
 (envelope-from sephe@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id CB7551F6A;
 Mon, 11 Jul 2016 06:29:57 +0000 (UTC)
 (envelope-from sephe@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6B6TvU8044292;
 Mon, 11 Jul 2016 06:29:57 GMT (envelope-from sephe@FreeBSD.org)
Received: (from sephe@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6B6TvEx044291;
 Mon, 11 Jul 2016 06:29:57 GMT (envelope-from sephe@FreeBSD.org)
Message-Id: <201607110629.u6B6TvEx044291@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sephe set sender to
 sephe@FreeBSD.org using -f
From: Sepherosa Ziehau <sephe@FreeBSD.org>
Date: Mon, 11 Jul 2016 06:29:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r302545 - head/sys/dev/hyperv/vmbus
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.22
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Jul 2016 06:29:58 -0000

Author: sephe
Date: Mon Jul 11 06:29:56 2016
New Revision: 302545
URL: https://svnweb.freebsd.org/changeset/base/302545

Log:
  hyperv/vmbus: Function renaming.
  
  And pass vmbus_softc to vmbus_doattach()
  
  MFC after:	1 week
  Sponsored by:	Microsoft OSTC
  Differential Revision:	https://reviews.freebsd.org/D6842

Modified:
  head/sys/dev/hyperv/vmbus/vmbus.c

Modified: head/sys/dev/hyperv/vmbus/vmbus.c
==============================================================================
--- head/sys/dev/hyperv/vmbus/vmbus.c	Mon Jul 11 06:23:01 2016	(r302544)
+++ head/sys/dev/hyperv/vmbus/vmbus.c	Mon Jul 11 06:29:56 2016	(r302545)
@@ -975,9 +975,8 @@ vmbus_probe(device_t dev)
  * - retrieve the channel offers
  */
 static int
-vmbus_bus_init(void)
+vmbus_doattach(struct vmbus_softc *sc)
 {
-	struct vmbus_softc *sc = vmbus_get_softc();
 	int ret;
 
 	if (sc->vmbus_flags & VMBUS_FLAG_ATTACHED)
@@ -1082,7 +1081,7 @@ vmbus_attach(device_t dev)
 	 */
 	if (!cold)
 #endif
-		vmbus_bus_init();
+		vmbus_doattach(vmbus_sc);
 
 	bus_generic_probe(dev);
 	return (0);
@@ -1091,7 +1090,9 @@ vmbus_attach(device_t dev)
 static void
 vmbus_sysinit(void *arg __unused)
 {
-	if (vm_guest != VM_GUEST_HV || vmbus_get_softc() == NULL)
+	struct vmbus_softc *sc = vmbus_get_softc();
+
+	if (vm_guest != VM_GUEST_HV || sc == NULL)
 		return;
 
 #ifndef EARLY_AP_STARTUP
@@ -1103,7 +1104,7 @@ vmbus_sysinit(void *arg __unused)
 	 */
 	if (!cold) 
 #endif
-		vmbus_bus_init();
+		vmbus_doattach(sc);
 }
 
 static int