From owner-svn-src-head@FreeBSD.ORG  Fri Feb 21 01:15:27 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 2F555E5B;
 Fri, 21 Feb 2014 01:15:27 +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 1B25B18BF;
 Fri, 21 Feb 2014 01:15:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1L1FQMw056588;
 Fri, 21 Feb 2014 01:15:26 GMT (envelope-from tychon@svn.freebsd.org)
Received: (from tychon@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1L1FQ5n056587;
 Fri, 21 Feb 2014 01:15:26 GMT (envelope-from tychon@svn.freebsd.org)
Message-Id: <201402210115.s1L1FQ5n056587@svn.freebsd.org>
From: Tycho Nightingale <tychon@FreeBSD.org>
Date: Fri, 21 Feb 2014 01:15:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r262274 - 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-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Feb 2014 01:15:27 -0000

Author: tychon
Date: Fri Feb 21 01:15:26 2014
New Revision: 262274
URL: http://svnweb.freebsd.org/changeset/base/262274

Log:
  Avoid clobbering the counter mode when issuing a latch command.
  
  Approved by:	grehan (co-mentor)

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

Modified: head/usr.sbin/bhyve/pit_8254.c
==============================================================================
--- head/usr.sbin/bhyve/pit_8254.c	Thu Feb 20 23:43:49 2014	(r262273)
+++ head/usr.sbin/bhyve/pit_8254.c	Fri Feb 21 01:15:26 2014	(r262274)
@@ -216,11 +216,12 @@ pit_8254_handler(struct vmctx *ctx, int 
 		
 		c = &counter[sel >> 6];
 		c->ctx = ctx;
-		c->mode = mode;
 		if (rw == TIMER_LATCH)
 			pit_update_counter(c, 1);
-		else
+		else {
+			c->mode = mode;
 			c->olbyte = 0;	/* reset latch after reprogramming */
+		}
 		
 		return (0);
 	}