From owner-svn-src-all@freebsd.org Wed Oct 12 03:37:45 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 5A1CFC0EE16;
Wed, 12 Oct 2016 03:37:45 +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 1E2D4D74;
Wed, 12 Oct 2016 03:37:45 +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 u9C3bi7r073414;
Wed, 12 Oct 2016 03:37:44 GMT (envelope-from sephe@FreeBSD.org)
Received: (from sephe@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9C3bhjR073407;
Wed, 12 Oct 2016 03:37:43 GMT (envelope-from sephe@FreeBSD.org)
Message-Id: <201610120337.u9C3bhjR073407@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, 12 Oct 2016 03:37:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r307099 - in stable/10/sys/dev/hyperv: netvsc vmbus
X-SVN-Group: stable-10
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.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <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: Wed, 12 Oct 2016 03:37:45 -0000
Author: sephe
Date: Wed Oct 12 03:37:43 2016
New Revision: 307099
URL: https://svnweb.freebsd.org/changeset/base/307099
Log:
MFC 303283
hyperv/vmbus: Rename hv_vmbus_priv.h to vmbus_brvar.h
It only contains bufring related bits for a while.
Sponsored by: Microsoft OSTC
Differential Revision: https://reviews.freebsd.org/D7281
Added:
stable/10/sys/dev/hyperv/vmbus/vmbus_brvar.h
- copied unchanged from r303283, head/sys/dev/hyperv/vmbus/vmbus_brvar.h
Deleted:
stable/10/sys/dev/hyperv/vmbus/hv_vmbus_priv.h
Modified:
stable/10/sys/dev/hyperv/netvsc/hv_rndis_filter.c
stable/10/sys/dev/hyperv/vmbus/hv_ring_buffer.c
stable/10/sys/dev/hyperv/vmbus/hyperv.c
stable/10/sys/dev/hyperv/vmbus/hyperv_reg.h
stable/10/sys/dev/hyperv/vmbus/vmbus.c
stable/10/sys/dev/hyperv/vmbus/vmbus_chan.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/hyperv/netvsc/hv_rndis_filter.c
==============================================================================
--- stable/10/sys/dev/hyperv/netvsc/hv_rndis_filter.c Wed Oct 12 03:36:46 2016 (r307098)
+++ stable/10/sys/dev/hyperv/netvsc/hv_rndis_filter.c Wed Oct 12 03:37:43 2016 (r307099)
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
#include <vm/pmap.h>
#include <dev/hyperv/include/hyperv.h>
-#include <dev/hyperv/vmbus/hv_vmbus_priv.h>
#include "hv_net_vsc.h"
#include "hv_rndis.h"
#include "hv_rndis_filter.h"
Modified: stable/10/sys/dev/hyperv/vmbus/hv_ring_buffer.c
==============================================================================
--- stable/10/sys/dev/hyperv/vmbus/hv_ring_buffer.c Wed Oct 12 03:36:46 2016 (r307098)
+++ stable/10/sys/dev/hyperv/vmbus/hv_ring_buffer.c Wed Oct 12 03:37:43 2016 (r307099)
@@ -34,8 +34,8 @@ __FBSDID("$FreeBSD$");
#include <sys/mutex.h>
#include <sys/sysctl.h>
-#include "hv_vmbus_priv.h"
#include <dev/hyperv/vmbus/vmbus_reg.h>
+#include <dev/hyperv/vmbus/vmbus_brvar.h>
/* Amount of space to write to */
#define HV_BYTES_AVAIL_TO_WRITE(r, w, z) \
Modified: stable/10/sys/dev/hyperv/vmbus/hyperv.c
==============================================================================
--- stable/10/sys/dev/hyperv/vmbus/hyperv.c Wed Oct 12 03:36:46 2016 (r307098)
+++ stable/10/sys/dev/hyperv/vmbus/hyperv.c Wed Oct 12 03:37:43 2016 (r307099)
@@ -43,12 +43,14 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_param.h>
#include <vm/pmap.h>
+#include <dev/hyperv/include/hyperv.h>
#include <dev/hyperv/include/hyperv_busdma.h>
-#include <dev/hyperv/vmbus/hv_vmbus_priv.h>
#include <dev/hyperv/vmbus/hyperv_machdep.h>
#include <dev/hyperv/vmbus/hyperv_reg.h>
#include <dev/hyperv/vmbus/hyperv_var.h>
+#if 0
#include <dev/hyperv/vmbus/vmbus_var.h>
+#endif
#define HYPERV_FREEBSD_BUILD 0ULL
#define HYPERV_FREEBSD_VERSION ((uint64_t)__FreeBSD_version)
Modified: stable/10/sys/dev/hyperv/vmbus/hyperv_reg.h
==============================================================================
--- stable/10/sys/dev/hyperv/vmbus/hyperv_reg.h Wed Oct 12 03:36:46 2016 (r307098)
+++ stable/10/sys/dev/hyperv/vmbus/hyperv_reg.h Wed Oct 12 03:37:43 2016 (r307099)
@@ -30,6 +30,7 @@
#define _HYPERV_REG_H_
#include <sys/param.h>
+#include <sys/systm.h>
/*
* Hyper-V Synthetic MSRs
Modified: stable/10/sys/dev/hyperv/vmbus/vmbus.c
==============================================================================
--- stable/10/sys/dev/hyperv/vmbus/vmbus.c Wed Oct 12 03:36:46 2016 (r307098)
+++ stable/10/sys/dev/hyperv/vmbus/vmbus.c Wed Oct 12 03:37:43 2016 (r307099)
@@ -60,11 +60,11 @@ __FBSDID("$FreeBSD$");
#include <machine/apicvar.h>
#include <dev/hyperv/include/hyperv.h>
-#include <dev/hyperv/vmbus/hv_vmbus_priv.h>
#include <dev/hyperv/vmbus/hyperv_reg.h>
#include <dev/hyperv/vmbus/hyperv_var.h>
#include <dev/hyperv/vmbus/vmbus_reg.h>
#include <dev/hyperv/vmbus/vmbus_var.h>
+#include <dev/hyperv/vmbus/vmbus_chanvar.h>
#include <contrib/dev/acpica/include/acpi.h>
#include "acpi_if.h"
Copied: stable/10/sys/dev/hyperv/vmbus/vmbus_brvar.h (from r303283, head/sys/dev/hyperv/vmbus/vmbus_brvar.h)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/10/sys/dev/hyperv/vmbus/vmbus_brvar.h Wed Oct 12 03:37:43 2016 (r307099, copy of r303283, head/sys/dev/hyperv/vmbus/vmbus_brvar.h)
@@ -0,0 +1,85 @@
+/*-
+ * 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.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * 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.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef __HYPERV_PRIV_H__
+#define __HYPERV_PRIV_H__
+
+#include <sys/param.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
+#include <sys/sema.h>
+#include <sys/_iovec.h>
+
+#include <dev/hyperv/vmbus/vmbus_chanvar.h>
+
+struct vmbus_softc;
+
+/*
+ * Private, VM Bus functions
+ */
+struct sysctl_ctx_list;
+struct sysctl_oid;
+
+void vmbus_br_sysctl_create(struct sysctl_ctx_list *ctx,
+ struct sysctl_oid *br_tree, hv_vmbus_ring_buffer_info *br,
+ const char *name);
+
+int hv_vmbus_ring_buffer_init(
+ hv_vmbus_ring_buffer_info *ring_info,
+ void *buffer,
+ uint32_t buffer_len);
+
+void hv_ring_buffer_cleanup(
+ hv_vmbus_ring_buffer_info *ring_info);
+
+int hv_ring_buffer_write(
+ hv_vmbus_ring_buffer_info *ring_info,
+ const struct iovec iov[],
+ uint32_t iovlen,
+ boolean_t *need_sig);
+
+int hv_ring_buffer_peek(
+ hv_vmbus_ring_buffer_info *ring_info,
+ void *buffer,
+ uint32_t buffer_len);
+
+int hv_ring_buffer_read(
+ hv_vmbus_ring_buffer_info *ring_info,
+ void *buffer,
+ uint32_t buffer_len,
+ uint32_t offset);
+
+void hv_ring_buffer_read_begin(
+ hv_vmbus_ring_buffer_info *ring_info);
+
+uint32_t hv_ring_buffer_read_end(
+ hv_vmbus_ring_buffer_info *ring_info);
+
+#endif /* __HYPERV_PRIV_H__ */
Modified: stable/10/sys/dev/hyperv/vmbus/vmbus_chan.c
==============================================================================
--- stable/10/sys/dev/hyperv/vmbus/vmbus_chan.c Wed Oct 12 03:36:46 2016 (r307098)
+++ stable/10/sys/dev/hyperv/vmbus/vmbus_chan.c Wed Oct 12 03:37:43 2016 (r307099)
@@ -46,10 +46,11 @@ __FBSDID("$FreeBSD$");
#include <vm/pmap.h>
#include <dev/hyperv/include/hyperv_busdma.h>
-#include <dev/hyperv/vmbus/hv_vmbus_priv.h>
#include <dev/hyperv/vmbus/hyperv_var.h>
#include <dev/hyperv/vmbus/vmbus_reg.h>
#include <dev/hyperv/vmbus/vmbus_var.h>
+#include <dev/hyperv/vmbus/vmbus_brvar.h>
+#include <dev/hyperv/vmbus/vmbus_chanvar.h>
static void vmbus_chan_update_evtflagcnt(struct vmbus_softc *,
const struct vmbus_channel *);