From owner-svn-src-all@FreeBSD.ORG  Thu Sep 19 04:20:19 2013
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 ESMTP id 56BC8A70;
 Thu, 19 Sep 2013 04:20:19 +0000 (UTC)
 (envelope-from grehan@FreeBSD.org)
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 457BD2E7F;
 Thu, 19 Sep 2013 04:20:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8J4KJiO088548;
 Thu, 19 Sep 2013 04:20:19 GMT (envelope-from grehan@svn.freebsd.org)
Received: (from grehan@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8J4KJOO088547;
 Thu, 19 Sep 2013 04:20:19 GMT (envelope-from grehan@svn.freebsd.org)
Message-Id: <201309190420.r8J4KJOO088547@svn.freebsd.org>
From: Peter Grehan <grehan@FreeBSD.org>
Date: Thu, 19 Sep 2013 04:20:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r255688 - 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.14
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, 19 Sep 2013 04:20:19 -0000

Author: grehan
Date: Thu Sep 19 04:20:18 2013
New Revision: 255688
URL: http://svnweb.freebsd.org/changeset/base/255688

Log:
  Use correct offset for the high byte of high memory written to
  RTC NVRAM.
  
  Submitted by:	Bela Lubkin   bela dot lubkin at tidalscale dot com
  Approved by:	re@ (blanket)

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

Modified: head/usr.sbin/bhyve/rtc.c
==============================================================================
--- head/usr.sbin/bhyve/rtc.c	Thu Sep 19 02:41:00 2013	(r255687)
+++ head/usr.sbin/bhyve/rtc.c	Thu Sep 19 04:20:18 2013	(r255688)
@@ -322,7 +322,7 @@ rtc_init(struct vmctx *ctx)
 		himem /= m_64KB;
 		rtc_nvram[nvoff(RTC_HMEM_LSB)] = himem;
 		rtc_nvram[nvoff(RTC_HMEM_SB)]  = himem >> 8;
-		rtc_nvram[nvoff(RTC_NVRAM_START)] = himem >> 16;
+		rtc_nvram[nvoff(RTC_HMEM_MSB)] = himem >> 16;
 	}
 }