From owner-svn-src-all@FreeBSD.ORG  Thu Jan  9 07:17:21 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B083393;
 Thu,  9 Jan 2014 07:17:21 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9C44014C6;
 Thu,  9 Jan 2014 07:17:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s097HLVb000102;
 Thu, 9 Jan 2014 07:17:21 GMT (envelope-from grehan@svn.freebsd.org)
Received: (from grehan@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s097HLbU000101;
 Thu, 9 Jan 2014 07:17:21 GMT (envelope-from grehan@svn.freebsd.org)
Message-Id: <201401090717.s097HLbU000101@svn.freebsd.org>
From: Peter Grehan <grehan@FreeBSD.org>
Date: Thu, 9 Jan 2014 07:17:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r260469 - 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.17
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: Thu, 09 Jan 2014 07:17:21 -0000

Author: grehan
Date: Thu Jan  9 07:17:21 2014
New Revision: 260469
URL: http://svnweb.freebsd.org/changeset/base/260469

Log:
  Fix issue with the virtio descriptor region being truncated
  if it was above 4GB. This was seen with CentOS 6.5 guests with
  large RAM, since the block drivers are loaded late in the
  boot sequence and end up allocating descriptor memory from
  high addresses.
  
  Reported by:	Michael Dexter
  MFC after:	3 days

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

Modified: head/usr.sbin/bhyve/virtio.c
==============================================================================
--- head/usr.sbin/bhyve/virtio.c	Thu Jan  9 03:33:12 2014	(r260468)
+++ head/usr.sbin/bhyve/virtio.c	Thu Jan  9 07:17:21 2014	(r260469)
@@ -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);