From owner-svn-src-stable-11@freebsd.org  Mon Sep 11 07:22:54 2017
Return-Path: <owner-svn-src-stable-11@freebsd.org>
Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5D0FCE20965;
 Mon, 11 Sep 2017 07:22:54 +0000 (UTC)
 (envelope-from rlibby@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 2A33F74464;
 Mon, 11 Sep 2017 07:22:54 +0000 (UTC)
 (envelope-from rlibby@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8B7Mrrg092165;
 Mon, 11 Sep 2017 07:22:53 GMT (envelope-from rlibby@FreeBSD.org)
Received: (from rlibby@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8B7MrW0092164;
 Mon, 11 Sep 2017 07:22:53 GMT (envelope-from rlibby@FreeBSD.org)
Message-Id: <201709110722.v8B7MrW0092164@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rlibby set sender to
 rlibby@FreeBSD.org using -f
From: Ryan Libby <rlibby@FreeBSD.org>
Date: Mon, 11 Sep 2017 07:22:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r323426 - stable/11/usr.sbin/bhyve
X-SVN-Group: stable-11
X-SVN-Commit-Author: rlibby
X-SVN-Commit-Paths: stable/11/usr.sbin/bhyve
X-SVN-Commit-Revision: 323426
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-11@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for only the 11-stable src tree
 <svn-src-stable-11.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-11/>
List-Post: <mailto:svn-src-stable-11@freebsd.org>
List-Help: <mailto:svn-src-stable-11-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Sep 2017 07:22:54 -0000

Author: rlibby
Date: Mon Sep 11 07:22:53 2017
New Revision: 323426
URL: https://svnweb.freebsd.org/changeset/base/323426

Log:
  MFC r321669:
  
    bhyve/vga.c: fix atc_color_select_67 bit shift

Modified:
  stable/11/usr.sbin/bhyve/vga.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.sbin/bhyve/vga.c
==============================================================================
--- stable/11/usr.sbin/bhyve/vga.c	Mon Sep 11 07:21:34 2017	(r323425)
+++ stable/11/usr.sbin/bhyve/vga.c	Mon Sep 11 07:22:53 2017	(r323426)
@@ -1069,7 +1069,7 @@ vga_port_out_handler(struct vmctx *ctx, int in, int po
 				sc->vga_atc.atc_color_select_45 =
 					(val & ATC_CS_C45) << 4;
 				sc->vga_atc.atc_color_select_67 =
-					(val & ATC_CS_C67) << 6;
+					((val & ATC_CS_C67) >> 2) << 6;
 				break;
 			default:
 				//printf("XXX VGA ATC: outb 0x%04x, 0x%02x at index %d\n", port, val, sc->vga_atc.atc_index);