From owner-svn-src-all@FreeBSD.ORG  Mon May 11 21:24:10 2015
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])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id DECDA12F;
 Mon, 11 May 2015 21:24:10 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 CD2901E69;
 Mon, 11 May 2015 21:24:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4BLOAtV093941;
 Mon, 11 May 2015 21:24:10 GMT (envelope-from grehan@FreeBSD.org)
Received: (from grehan@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4BLOAC9093940;
 Mon, 11 May 2015 21:24:10 GMT (envelope-from grehan@FreeBSD.org)
Message-Id: <201505112124.t4BLOAC9093940@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: grehan set sender to
 grehan@FreeBSD.org using -f
From: Peter Grehan <grehan@FreeBSD.org>
Date: Mon, 11 May 2015 21:24:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r282784 - 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.20
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: Mon, 11 May 2015 21:24:11 -0000

Author: grehan
Date: Mon May 11 21:24:10 2015
New Revision: 282784
URL: https://svnweb.freebsd.org/changeset/base/282784

Log:
  Handling indirect descriptors is a capability of the host and
  not one that needs to be negotiated. Use the host capabilities
  field and not the negotiated field when verifying that indirect
  descriptors are supported.
  
  Found with the Redhat Windows viostor driver, which clears
  the indirect capability in the negotiated caps and then starts
  using them.
  
  Reported and tested by: Leon Dang (ldang@nahannisys.com)
  MFC after:   2 weeks

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

Modified: head/usr.sbin/bhyve/virtio.c
==============================================================================
--- head/usr.sbin/bhyve/virtio.c	Mon May 11 20:58:05 2015	(r282783)
+++ head/usr.sbin/bhyve/virtio.c	Mon May 11 21:24:10 2015	(r282784)
@@ -316,7 +316,7 @@ vq_getchain(struct vqueue_info *vq, uint
 		if ((vdir->vd_flags & VRING_DESC_F_INDIRECT) == 0) {
 			_vq_record(i, vdir, ctx, iov, n_iov, flags);
 			i++;
-		} else if ((vs->vs_negotiated_caps &
+		} else if ((vs->vs_vc->vc_hv_caps &
 		    VIRTIO_RING_F_INDIRECT_DESC) == 0) {
 			fprintf(stderr,
 			    "%s: descriptor has forbidden INDIRECT flag, "