From owner-svn-src-head@freebsd.org  Wed Jul 13 05:19:47 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 45B71B97426;
 Wed, 13 Jul 2016 05:19:47 +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 09E9414C6;
 Wed, 13 Jul 2016 05:19:46 +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 u6D5JklJ093251;
 Wed, 13 Jul 2016 05:19:46 GMT (envelope-from sephe@FreeBSD.org)
Received: (from sephe@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6D5JkO8093249;
 Wed, 13 Jul 2016 05:19:46 GMT (envelope-from sephe@FreeBSD.org)
Message-Id: <201607130519.u6D5JkO8093249@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: Wed, 13 Jul 2016 05:19:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r302700 - in head/sys/dev/hyperv: include vmbus
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Jul 2016 05:19:47 -0000

Author: sephe
Date: Wed Jul 13 05:19:45 2016
New Revision: 302700
URL: https://svnweb.freebsd.org/changeset/base/302700

Log:
  hyperv/vmbus: Add channel ivar accessor.
  
  This makes life easier during the transition period to nuke the hv_device.
  
  MFC after:	1 week
  Sponsored by:	Microsoft OSTC
  Differential Revision:	https://reviews.freebsd.org/D7026

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

Modified: head/sys/dev/hyperv/include/hyperv.h
==============================================================================
--- head/sys/dev/hyperv/include/hyperv.h	Wed Jul 13 05:11:45 2016	(r302699)
+++ head/sys/dev/hyperv/include/hyperv.h	Wed Jul 13 05:19:45 2016	(r302700)
@@ -403,14 +403,18 @@ enum {
 	HV_VMBUS_IVAR_TYPE,
 	HV_VMBUS_IVAR_INSTANCE,
 	HV_VMBUS_IVAR_NODE,
-	HV_VMBUS_IVAR_DEVCTX
+	HV_VMBUS_IVAR_DEVCTX,
+	HV_VMBUS_IVAR_CHAN,
 };
 
 #define HV_VMBUS_ACCESSOR(var, ivar, type) \
 		__BUS_ACCESSOR(vmbus, var, HV_VMBUS, ivar, type)
 
+struct hv_vmbus_channel;
+
 HV_VMBUS_ACCESSOR(type, TYPE,  const char *)
 HV_VMBUS_ACCESSOR(devctx, DEVCTX,  struct hv_device *)
+HV_VMBUS_ACCESSOR(channel, CHAN, struct hv_vmbus_channel *)
 
 
 /*

Modified: head/sys/dev/hyperv/vmbus/vmbus.c
==============================================================================
--- head/sys/dev/hyperv/vmbus/vmbus.c	Wed Jul 13 05:11:45 2016	(r302699)
+++ head/sys/dev/hyperv/vmbus/vmbus.c	Wed Jul 13 05:19:45 2016	(r302700)
@@ -978,6 +978,10 @@ vmbus_read_ivar(device_t dev, device_t c
 	case HV_VMBUS_IVAR_NODE:
 		*result = (uintptr_t)child_dev_ctx->device;
 		return (0);
+
+	case HV_VMBUS_IVAR_CHAN:
+		*result = (uintptr_t)child_dev_ctx->channel;
+		return (0);
 	}
 	return (ENOENT);
 }