From owner-svn-src-projects@FreeBSD.ORG  Tue May 24 01:08:53 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 83AAD106566B;
	Tue, 24 May 2011 01:08:53 +0000 (UTC)
	(envelope-from grehan@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 73E1B8FC13;
	Tue, 24 May 2011 01:08:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4O18rsO045420;
	Tue, 24 May 2011 01:08:53 GMT (envelope-from grehan@svn.freebsd.org)
Received: (from grehan@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4O18rro045418;
	Tue, 24 May 2011 01:08:53 GMT (envelope-from grehan@svn.freebsd.org)
Message-Id: <201105240108.p4O18rro045418@svn.freebsd.org>
From: Peter Grehan <grehan@FreeBSD.org>
Date: Tue, 24 May 2011 01:08:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r222238 - projects/bhyve/usr.sbin/bhyve
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 May 2011 01:08:53 -0000

Author: grehan
Date: Tue May 24 01:08:53 2011
New Revision: 222238
URL: http://svn.freebsd.org/changeset/base/222238

Log:
  Catch up with CURRENTs different timer usage compared to 8.1. A counter
  value of 0 in rategen mode is equivalent to a max initial value.
  The TSC is now correctly calibrated on a 9.0 guest.
  
  Obtained from:	NetApp

Modified:
  projects/bhyve/usr.sbin/bhyve/pit_8254.c

Modified: projects/bhyve/usr.sbin/bhyve/pit_8254.c
==============================================================================
--- projects/bhyve/usr.sbin/bhyve/pit_8254.c	Mon May 23 23:58:02 2011	(r222237)
+++ projects/bhyve/usr.sbin/bhyve/pit_8254.c	Tue May 24 01:08:53 2011	(r222238)
@@ -183,6 +183,8 @@ pit_8254_handler(struct vmctx *ctx, int 
 		if (c->crbyte == 2) {
 			c->crbyte = 0;
 			c->initial = c->cr[0] | (uint16_t)c->cr[1] << 8;
+			if (c->initial == 0)
+				c->initial = 0xffff;
 			gettimeofday(&c->tv, NULL);
 		}
 	}