svn commit: r301954 - in stable/10/sys/dev/hyperv: netvsc vmbus

[Sepherosa Ziehau]

Author: sephe
Date: Thu Jun 16 06:34:12 2016
New Revision: 301954
URL: https://svnweb.freebsd.org/changeset/base/301954

Log:
  MFC 298039,298042
  
  298039
      hyperv/vmbus: Put multi-channel offer logging under bootverbose
  
      Suggested by:       Dexuan Cui <decui microsoft com>
      MFC after:  1 week
      Sponsored by:       Microsoft OSTC
  
  298042
      hyperv/hn: Hide ring to channel linkage message under bootverbose
  
      Suggested by:       Dexuan Cui <decui microsoft com>
      MFC after:  1 week
      Sponsored by:       Microsoft OSTC

Modified:
  stable/10/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
  stable/10/sys/dev/hyperv/vmbus/hv_channel_mgmt.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
==============================================================================
--- stable/10/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c	Thu Jun 16 06:26:09 2016	(r301953)
+++ stable/10/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c	Thu Jun 16 06:34:12 2016	(r301954)
@@ -2872,8 +2872,10 @@ hn_channel_attach(struct hn_softc *sc, s
 	rxr->hn_rx_flags |= HN_RX_FLAG_ATTACHED;
 
 	chan->hv_chan_rxr = rxr;
-	if_printf(sc->hn_ifp, "link RX ring %d to channel%u\n",
-	    idx, chan->offer_msg.child_rel_id);
+	if (bootverbose) {
+		if_printf(sc->hn_ifp, "link RX ring %d to channel%u\n",
+		    idx, chan->offer_msg.child_rel_id);
+	}
 
 	if (idx < sc->hn_tx_ring_inuse) {
 		struct hn_tx_ring *txr = &sc->hn_tx_ring[idx];
@@ -2884,8 +2886,10 @@ hn_channel_attach(struct hn_softc *sc, s
 
 		chan->hv_chan_txr = txr;
 		txr->hn_chan = chan;
-		if_printf(sc->hn_ifp, "link TX ring %d to channel%u\n",
-		    idx, chan->offer_msg.child_rel_id);
+		if (bootverbose) {
+			if_printf(sc->hn_ifp, "link TX ring %d to channel%u\n",
+			    idx, chan->offer_msg.child_rel_id);
+		}
 	}
 
 	/* Bind channel to a proper CPU */

Modified: stable/10/sys/dev/hyperv/vmbus/hv_channel_mgmt.c
==============================================================================
--- stable/10/sys/dev/hyperv/vmbus/hv_channel_mgmt.c	Thu Jun 16 06:26:09 2016	(r301953)
+++ stable/10/sys/dev/hyperv/vmbus/hv_channel_mgmt.c	Thu Jun 16 06:34:12 2016	(r301954)
@@ -222,10 +222,14 @@ vmbus_channel_process_offer(hv_vmbus_cha
 			    sc_list_entry);
 			mtx_unlock(&channel->sc_lock);
 
+			if (bootverbose) {
+				printf("VMBUS get multi-channel offer, "
+				    "rel=%u, sub=%u\n",
+				    new_channel->offer_msg.child_rel_id,
+				    new_channel->offer_msg.offer.sub_channel_index);	
+			}
+
 			/* Insert new channel into channel_anchor. */
-			printf("VMBUS get multi-channel offer, rel=%u,sub=%u\n",
-			    new_channel->offer_msg.child_rel_id,
-			    new_channel->offer_msg.offer.sub_channel_index);	
 			mtx_lock(&hv_vmbus_g_connection.channel_lock);
 			TAILQ_INSERT_TAIL(&hv_vmbus_g_connection.channel_anchor,
 			    new_channel, list_entry);