From owner-svn-src-head@freebsd.org  Fri Jul 28 21:47:11 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 C6BF2DD07E2;
 Fri, 28 Jul 2017 21:47:11 +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 949C47328D;
 Fri, 28 Jul 2017 21:47:11 +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 v6SLlAJ4089266;
 Fri, 28 Jul 2017 21:47:10 GMT (envelope-from rlibby@FreeBSD.org)
Received: (from rlibby@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6SLlAub089265;
 Fri, 28 Jul 2017 21:47:10 GMT (envelope-from rlibby@FreeBSD.org)
Message-Id: <201707282147.v6SLlAub089265@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: Fri, 28 Jul 2017 21:47:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r321669 - head/usr.sbin/bhyve
X-SVN-Group: head
X-SVN-Commit-Author: rlibby
X-SVN-Commit-Paths: head/usr.sbin/bhyve
X-SVN-Commit-Revision: 321669
X-SVN-Commit-Repository: base
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.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Jul 2017 21:47:11 -0000

Author: rlibby
Date: Fri Jul 28 21:47:10 2017
New Revision: 321669
URL: https://svnweb.freebsd.org/changeset/base/321669

Log:
  bhyve/vga.c: fix atc_color_select_67 bit shift
  
  Gcc noticed that the result of the bit shift is always zero.  Shift so
  that the ATC_CS_C67 bits end up in bits 6 & 7.
  
  Reviewed by:	grehan, tychon
  Approved by:	markj (mentor)
  Sponsored by:	Dell EMC Isilon
  Differential Revision:	https://reviews.freebsd.org/D11775

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

Modified: head/usr.sbin/bhyve/vga.c
==============================================================================
--- head/usr.sbin/bhyve/vga.c	Fri Jul 28 21:42:59 2017	(r321668)
+++ head/usr.sbin/bhyve/vga.c	Fri Jul 28 21:47:10 2017	(r321669)
@@ -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);