Date: Mon, 11 Jul 2016 06:29:57 +0000 (UTC) From: Sepherosa Ziehau <sephe@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r302545 - head/sys/dev/hyperv/vmbus Message-ID: <201607110629.u6B6TvEx044291@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607110629.u6B6TvEx044291>