 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpu.c,v 1.177 2019/11/27 06:24:33 maxv Exp $	*/
+/*	$NetBSD: cpu.c,v 1.178 2019/12/07 11:45:45 nonaka Exp $	*/
 /*
  * Copyright (c) 2000-2012 NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Bill Sommerfeld of RedBack Networks Inc, and by Andrew Doran.
+ *
  * 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.
 @@ -52,27 +52,27 @@
  * 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 AND 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.177 2019/11/27 06:24:33 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.178 2019/12/07 11:45:45 nonaka Exp $");
 #include "opt_ddb.h"
 #include "opt_mpbios.h"		/* for MPDEBUG */
 #include "opt_mtrr.h"
 #include "opt_multiprocessor.h"
 #include "opt_svs.h"
 #include "lapic.h"
 #include "ioapic.h"
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 @@ -108,26 +108,33 @@ __KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.17
 #if NLAPIC > 0
 #include <machine/apicvar.h>
 #include <machine/i82489reg.h>
 #include <machine/i82489var.h>
 #endif
 #include <dev/ic/mc146818reg.h>
 #include <i386/isa/nvram.h>
 #include <dev/isa/isareg.h>
 #include "tsc.h"
 #ifndef XEN
 #include "hyperv.h"
 #if NHYPERV > 0
 #include <x86/x86/hypervvar.h>
 #endif
 #endif
 static int	cpu_match(device_t, cfdata_t, void *);
 static void	cpu_attach(device_t, device_t, void *);
 static void	cpu_defer(device_t);
 static int	cpu_rescan(device_t, const char *, const int *);
 static void	cpu_childdetached(device_t, device_t);
 static bool	cpu_stop(device_t);
 static bool	cpu_suspend(device_t, const pmf_qual_t *);
 static bool	cpu_resume(device_t, const pmf_qual_t *);
 static bool	cpu_shutdown(device_t, int);
 struct cpu_softc {
 	device_t sc_dev;		/* device tree glue */
 	struct cpu_info *sc_info;	/* pointer to CPU info */
 @@ -853,26 +860,29 @@ cpu_hatch(void *v)
 	struct pcb *pcb;
 	int s, i;
 	/* ------------------------------------------------------------- */
 	/*
 	 * This section of code must be compiled with SSP disabled, to
 	 * prevent a race against cpu0. See sys/conf/ssp.mk.
 	 */
 	cpu_init_msrs(ci, true);
 	cpu_probe(ci);
 	cpu_speculation_init(ci);
 #if NHYPERV > 0
 	hyperv_init_cpu(ci);
 #endif
 	ci->ci_data.cpu_cc_freq = cpu_info_primary.ci_data.cpu_cc_freq;
 	/* cpu_get_tsc_freq(ci); */
 	KDASSERT((ci->ci_flags & CPUF_PRESENT) == 0);
 	/*
 	 * Synchronize the TSC for the first time. Note that interrupts are
 	 * off at this point.
 	 */
 	wbinvd();
 	atomic_or_32(&ci->ci_flags, CPUF_PRESENT);
 	tsc_sync_ap(ci);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: hyperv.c,v 1.5 2019/11/30 05:28:28 nonaka Exp $	*/
+/*	$NetBSD: hyperv.c,v 1.6 2019/12/07 11:45:45 nonaka Exp $	*/
 /*-
  * Copyright (c) 2009-2012,2016-2017 Microsoft Corp.
  * Copyright (c) 2012 NetApp Inc.
  * Copyright (c) 2012 Citrix Inc.
  * 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 unmodified, this list of conditions, and the following
  *    disclaimer.
 @@ -23,27 +23,27 @@
  * 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.
  */
 /**
  * Implements low-level interactions with Hyper-V/Azuree
  */
 #include <sys/cdefs.h>
 #ifdef __KERNEL_RCSID
-__KERNEL_RCSID(0, "$NetBSD: hyperv.c,v 1.5 2019/11/30 05:28:28 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hyperv.c,v 1.6 2019/12/07 11:45:45 nonaka Exp $");
 #endif
 #ifdef __FBSDID
 __FBSDID("$FreeBSD: head/sys/dev/hyperv/vmbus/hyperv.c 331757 2018-03-30 02:25:12Z emaste $");
 #endif
 #ifdef _KERNEL_OPT
 #include "lapic.h"
 #include "genfb.h"
 #include "opt_ddb.h"
 #include "vmbus.h"
 #include "wsdisplay.h"
 #endif
 @@ -103,26 +103,28 @@ static u_int hyperv_ver_major;
 static u_int hyperv_features;		/* CPUID_HV_MSR_ */
 static u_int hyperv_recommends;
 static u_int hyperv_pm_features;
 static u_int hyperv_features3;
 static char hyperv_version_str[64];
 static char hyperv_features_str[256];
 static char hyperv_pm_features_str[256];
 static char hyperv_features3_str[256];
 static int hyperv_idtvec;
 uint32_t hyperv_vcpuid[MAXCPUS];
 static struct timecounter hyperv_timecounter = {
 	.tc_get_timecount = hyperv_get_timecount,
 	.tc_counter_mask = 0xffffffff,
 	.tc_frequency = HYPERV_TIMER_FREQ,
 	.tc_name = "Hyper-V",
 	.tc_quality = 2000,
 };
 static void	hyperv_proc_dummy(void *, struct cpu_info *);
 struct hyperv_proc {
 	hyperv_proc_t	func;
 	void		*arg;
 @@ -485,32 +487,65 @@ hyperv_identify(void)
 		x86_cpuid(CPUID_LEAF_HV_HWFEATURES, regs);
 		aprint_verbose("  HW Features: %08x, AMD: %08x\n",
 		    regs[0], regs[3]);
+	}
 	return true;
+}
 void
 hyperv_early_init(void)
+{
 	u_int features, pm_features, features3;
 	u_int maxleaf;
 	int i;
 	if (!hyperv_probe(&maxleaf, &features, &pm_features, &features3))
 		return;
 	if (features & CPUID_HV_MSR_TIME_REFCNT)
 		x86_delay = delay_func = delay_msr;
 	if (features & CPUID_HV_MSR_VP_INDEX) {
 		/* Save virtual processor id. */
 		hyperv_vcpuid[0] = rdmsr(MSR_HV_VP_INDEX);
 	} else {
 		/* Set virtual processor id to 0 for compatibility. */
 		hyperv_vcpuid[0] = 0;
+	}
 	for (i = 1; i < MAXCPUS; i++)
 		hyperv_vcpuid[i] = hyperv_vcpuid[0];
+}
 void
 hyperv_init_cpu(struct cpu_info *ci)
+{
 	u_int features, pm_features, features3;
 	u_int maxleaf;
 	if (!hyperv_probe(&maxleaf, &features, &pm_features, &features3))
 		return;
 	if (features & CPUID_HV_MSR_VP_INDEX)
 		hyperv_vcpuid[ci->ci_index] = rdmsr(MSR_HV_VP_INDEX);
+}
 uint32_t
 hyperv_get_vcpuid(cpuid_t cpu)
+{
 	if (cpu < MAXCPUS)
 		return hyperv_vcpuid[cpu];
 	return 0;
+}
 static bool
 hyperv_init(void)
+{
 	if (!hyperv_identify()) {
 		/* Not Hyper-V; reset guest id to the generic one. */
 		if (vm_guest == VM_GUEST_HV)
 			vm_guest = VM_GUEST_VM;
 		return false;
+	}
 @@ -788,34 +823,26 @@ vmbus_deinit_interrupts_md(struct vmbus_
 		hyperv_idtvec = 0;
+	}
+}
 void
 vmbus_init_synic_md(struct vmbus_softc *sc, cpuid_t cpu)
+{
 	struct vmbus_percpu_data *pd;
 	uint64_t val, orig;
 	uint32_t sint;
 	pd = &sc->sc_percpu[cpu];
 	if (hyperv_features & CPUID_HV_MSR_VP_INDEX) {
 		/* Save virtual processor id. */
 		pd->vcpuid = rdmsr(MSR_HV_VP_INDEX);
 	} else {
 		/* Set virtual processor id to 0 for compatibility. */
 		pd->vcpuid = 0;
 	/*
 	 * Setup the SynIC message.
 	 */
 	orig = rdmsr(MSR_HV_SIMP);
 	val = MSR_HV_SIMP_ENABLE | (orig & MSR_HV_SIMP_RSVD_MASK) |
 	    (atop(hyperv_dma_get_paddr(&pd->simp_dma)) << MSR_HV_SIMP_PGSHIFT);
 	wrmsr(MSR_HV_SIMP, val);
 	/*
 	 * Setup the SynIC event flags.
 	 */
 	orig = rdmsr(MSR_HV_SIEFP);
 	val = MSR_HV_SIEFP_ENABLE | (orig & MSR_HV_SIEFP_RSVD_MASK) |

 @@ -1,14 +1,14 @@
-/*	$NetBSD: hypervvar.h,v 1.1 2019/05/24 14:28:48 nonaka Exp $	*/
+/*	$NetBSD: hypervvar.h,v 1.2 2019/12/07 11:45:45 nonaka Exp $	*/
 /*-
  * Copyright (c) 2009-2012,2016 Microsoft Corp.
  * Copyright (c) 2012 NetApp Inc.
  * Copyright (c) 2012 Citrix Inc.
  * 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 unmodified, this list of conditions, and the following
  *    disclaimer.
 @@ -22,16 +22,17 @@
  * IN NO EVENT SHALL THE AUTHOR 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.
  */
 #ifndef _X86_HYPERVVAR_H_
 #define _X86_HYPERVVAR_H_
 void		hyperv_early_init(void);
 void		hyperv_init_cpu(struct cpu_info *);
 device_t	device_hyperv_register(device_t, void *);
 #endif /* _X86_HYPERVVAR_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: hyperv_common.c,v 1.3 2019/12/06 12:46:06 nonaka Exp $	*/
+/*	$NetBSD: hyperv_common.c,v 1.4 2019/12/07 11:45:45 nonaka Exp $	*/
 /*-
  * Copyright (c) 2009-2012,2016-2017 Microsoft Corp.
  * Copyright (c) 2012 NetApp Inc.
  * Copyright (c) 2012 Citrix Inc.
  * 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 unmodified, this list of conditions, and the following
  *    disclaimer.
 @@ -19,53 +19,54 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hyperv_common.c,v 1.3 2019/12/06 12:46:06 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hyperv_common.c,v 1.4 2019/12/07 11:45:45 nonaka Exp $");
 #include "hyperv.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
 #include <sys/kmem.h>
 #include <dev/hyperv/hypervreg.h>
 #include <dev/hyperv/hypervvar.h>
 hyperv_tc64_t hyperv_tc64;
 int		hyperv_nullop(void);
 void		hyperv_voidop(void);
 uint64_t	hyperv_hypercall_error(uint64_t, paddr_t, paddr_t);
 __weak_alias(hyperv_hypercall, hyperv_hypercall_error);
 __weak_alias(hyperv_hypercall_enabled, hyperv_nullop);
 __weak_alias(hyperv_synic_supported, hyperv_nullop);
 __weak_alias(hyperv_is_gen1, hyperv_nullop);
 __weak_alias(hyperv_set_event_proc, hyperv_voidop);
 __weak_alias(hyperv_set_message_proc, hyperv_voidop);
 __weak_alias(hyperv_send_eom, hyperv_voidop);
 __weak_alias(hyperv_intr, hyperv_voidop);
 __weak_alias(hyperv_get_vcpuid, hyperv_nullop);
 __weak_alias(vmbus_init_interrupts_md, hyperv_voidop);
 __weak_alias(vmbus_deinit_interrupts_md, hyperv_voidop);
 __weak_alias(vmbus_init_synic_md, hyperv_voidop);
 __weak_alias(vmbus_deinit_synic_md, hyperv_voidop);
 int
 hyperv_nullop(void)
+{
 	return 0;
+}
 void
 hyperv_voidop(void)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: hypervvar.h,v 1.2 2019/05/24 14:28:48 nonaka Exp $	*/
+/*	$NetBSD: hypervvar.h,v 1.3 2019/12/07 11:45:45 nonaka Exp $	*/
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2009-2012,2016-2017 Microsoft Corp.
  * Copyright (c) 2012 NetApp Inc.
  * Copyright (c) 2012 Citrix Inc.
  * 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
 @@ -55,26 +55,27 @@ struct hyperv_reftsc {
 	volatile int64_t	tsc_ofs;
 } __packed __aligned(PAGE_SIZE);
 #ifdef __CTASSERT
 __CTASSERT(sizeof(struct hyperv_reftsc) == PAGE_SIZE);
 #endif
 #if defined(_KERNEL)
 int	hyperv_hypercall_enabled(void);
 int	hyperv_synic_supported(void);
 int	hyperv_is_gen1(void);
 void	hyperv_send_eom(void);
 void	hyperv_intr(void);
 uint32_t hyperv_get_vcpuid(cpuid_t);
 struct vmbus_softc;
 void	vmbus_init_interrupts_md(struct vmbus_softc *);
 void	vmbus_deinit_interrupts_md(struct vmbus_softc *);
 void	vmbus_init_synic_md(struct vmbus_softc *, cpuid_t);
 void	vmbus_deinit_synic_md(struct vmbus_softc *, cpuid_t);
 #define HYPERV_GUID_STRLEN	40
 struct hyperv_guid;
 int	hyperv_guid2str(const struct hyperv_guid *, char *, size_t);
 /*
  * hyperv_tc64 could be NULL, if there were no suitable Hyper-V

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vmbusvar.h,v 1.2 2019/05/24 14:28:48 nonaka Exp $	*/
+/*	$NetBSD: vmbusvar.h,v 1.3 2019/12/07 11:45:45 nonaka Exp $	*/
 /*	$OpenBSD: hypervvar.h,v 1.13 2017/06/23 19:05:42 mikeb Exp $	*/
 /*
  * Copyright (c) 2016 Mike Belopuhov <mike@esdenera.com>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 @@ -136,27 +136,26 @@ struct vmbus_attach_args {
 	bus_space_tag_t			aa_iot;
 	bus_space_tag_t			aa_memt;
 };
 struct vmbus_dev {
 	struct vmbus_attach_args	dv_aa;
 	SLIST_ENTRY(vmbus_dev)		dv_entry;
 };
 SLIST_HEAD(vmbus_devices, vmbus_dev);
 struct vmbus_percpu_data {
 	void			*simp;	/* Synthetic Interrupt Message Page */
 	void			*siep;	/* Synthetic Interrupt Event Flags Page */
 	uint32_t		vcpuid;	/* Virtual cpuid */
 	/* Rarely used fields */
 	struct hyperv_dma	simp_dma;
 	struct hyperv_dma	siep_dma;
 } __aligned(CACHE_LINE_SIZE);
 struct vmbus_softc {
 	device_t		sc_dev;
 	bus_space_tag_t		sc_iot;
 	bus_space_tag_t		sc_memt;
 	bus_dma_tag_t		sc_dmat;
 	pool_cache_t		sc_msgpool;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vmbus.c,v 1.6 2019/12/06 12:46:06 nonaka Exp $	*/
+/*	$NetBSD: vmbus.c,v 1.7 2019/12/07 11:45:45 nonaka Exp $	*/
 /*	$OpenBSD: hyperv.c,v 1.43 2017/06/27 13:56:15 mikeb Exp $	*/
 /*-
  * Copyright (c) 2009-2012 Microsoft Corp.
  * Copyright (c) 2012 NetApp Inc.
  * Copyright (c) 2012 Citrix Inc.
  * Copyright (c) 2016 Mike Belopuhov <mike@esdenera.com>
  * 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
 @@ -25,27 +25,27 @@
  * 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.
  */
 /*
  * The OpenBSD port was done under funding by Esdenera Networks GmbH.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vmbus.c,v 1.6 2019/12/06 12:46:06 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vmbus.c,v 1.7 2019/12/07 11:45:45 nonaka Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/atomic.h>
 #include <sys/bitops.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/intr.h>
 #include <sys/kmem.h>
 #include <sys/module.h>
 #include <sys/mutex.h>
 #include <sys/xcall.h>
 @@ -1083,27 +1083,27 @@ void
 vmbus_channel_cpu_set(struct vmbus_channel *ch, int cpu)
+{
 	struct vmbus_softc *sc = ch->ch_sc;
 	KASSERTMSG(cpu >= 0 && cpu < ncpu, "invalid cpu %d", cpu);
 	if (sc->sc_proto == VMBUS_VERSION_WS2008 ||
 	    sc->sc_proto == VMBUS_VERSION_WIN7) {
 		/* Only cpu0 is supported */
 		cpu = 0;
+	}
 	ch->ch_cpuid = cpu;
-	ch->ch_vcpu = sc->sc_percpu[cpu].vcpuid;
+	ch->ch_vcpu = hyperv_get_vcpuid(cpu);
+}
 void
 vmbus_channel_cpu_rr(struct vmbus_channel *ch)
+{
 	static uint32_t vmbus_channel_nextcpu;
 	int cpu;
 	cpu = atomic_add_32_nv(&vmbus_channel_nextcpu, 1) % ncpu;
 	vmbus_channel_cpu_set(ch, cpu);
+}
 static void