From owner-svn-src-all@FreeBSD.ORG  Fri May 23 19:06:36 2014
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 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 80161AFD;
 Fri, 23 May 2014 19:06:36 +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 6CF3B2CD4;
 Fri, 23 May 2014 19:06:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4NJ6aQB098553;
 Fri, 23 May 2014 19:06:36 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4NJ6a9Z098552;
 Fri, 23 May 2014 19:06:36 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201405231906.s4NJ6a9Z098552@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Fri, 23 May 2014 19:06:36 +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: r266592 - stable/10/usr.sbin/bhyve
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.18
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: Fri, 23 May 2014 19:06:36 -0000

Author: jhb
Date: Fri May 23 19:06:35 2014
New Revision: 266592
URL: http://svnweb.freebsd.org/changeset/base/266592

Log:
  MFC 260469:
  Fix issue with the virtio descriptor region being truncated
  if it was above 4GB.

Modified:
  stable/10/usr.sbin/bhyve/virtio.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/bhyve/virtio.c
==============================================================================
--- stable/10/usr.sbin/bhyve/virtio.c	Fri May 23 17:47:49 2014	(r266591)
+++ stable/10/usr.sbin/bhyve/virtio.c	Fri May 23 19:06:35 2014	(r266592)
@@ -160,7 +160,7 @@ vi_vq_init(struct virtio_softc *vs, uint
 
 	vq = &vs->vs_queues[vs->vs_curq];
 	vq->vq_pfn = pfn;
-	phys = pfn << VRING_PFN;
+	phys = (uint64_t)pfn << VRING_PFN;
 	size = vring_size(vq->vq_qsize);
 	base = paddr_guest2host(vs->vs_pi->pi_vmctx, phys, size);