From owner-svn-src-all@FreeBSD.ORG  Tue Apr 30 01:14:55 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 1F2F719B;
 Tue, 30 Apr 2013 01:14:55 +0000 (UTC)
 (envelope-from neel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1208B11CE;
 Tue, 30 Apr 2013 01:14:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3U1EshK079994;
 Tue, 30 Apr 2013 01:14:54 GMT (envelope-from neel@svn.freebsd.org)
Received: (from neel@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3U1EsFw079993;
 Tue, 30 Apr 2013 01:14:54 GMT (envelope-from neel@svn.freebsd.org)
Message-Id: <201304300114.r3U1EsFw079993@svn.freebsd.org>
From: Neel Natu <neel@FreeBSD.org>
Date: Tue, 30 Apr 2013 01:14:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r250086 - head/usr.sbin/bhyve
X-SVN-Group: head
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.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 30 Apr 2013 01:14:55 -0000

Author: neel
Date: Tue Apr 30 01:14:54 2013
New Revision: 250086
URL: http://svnweb.freebsd.org/changeset/base/250086

Log:
  Reset some more softc state when the guest resets the virtio network device.
  
  Obtained from:	NetApp

Modified:
  head/usr.sbin/bhyve/pci_virtio_net.c

Modified: head/usr.sbin/bhyve/pci_virtio_net.c
==============================================================================
--- head/usr.sbin/bhyve/pci_virtio_net.c	Tue Apr 30 00:49:30 2013	(r250085)
+++ head/usr.sbin/bhyve/pci_virtio_net.c	Tue Apr 30 01:14:54 2013	(r250086)
@@ -259,6 +259,7 @@ pci_vtnet_rxwait(struct pci_vtnet_softc 
 static void
 pci_vtnet_update_status(struct pci_vtnet_softc *sc, uint32_t value)
 {
+	int i;
 
 	if (value == 0) {
 		DPRINTF(("vtnet: device reset requested !\n"));
@@ -276,6 +277,12 @@ pci_vtnet_update_status(struct pci_vtnet
 		pci_vtnet_ring_reset(sc, VTNET_RXQ);
 		pci_vtnet_ring_reset(sc, VTNET_TXQ);
 
+		for (i = 0; i < VTNET_MAXQ; i++)
+			sc->vsc_msix_table_idx[i] = VIRTIO_MSI_NO_VECTOR;
+
+		sc->vsc_isr = 0;
+		sc->vsc_features = 0;
+
 		sc->resetting = 0;
 	}