From owner-svn-src-projects@FreeBSD.ORG  Wed Nov 21 00:14:04 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 48EEF2AB;
 Wed, 21 Nov 2012 00:14:04 +0000 (UTC)
 (envelope-from neel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2F9B48FC13;
 Wed, 21 Nov 2012 00:14:04 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAL0E4t3022326;
 Wed, 21 Nov 2012 00:14:04 GMT (envelope-from neel@svn.freebsd.org)
Received: (from neel@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAL0E4CH022325;
 Wed, 21 Nov 2012 00:14:04 GMT (envelope-from neel@svn.freebsd.org)
Message-Id: <201211210014.qAL0E4CH022325@svn.freebsd.org>
From: Neel Natu <neel@FreeBSD.org>
Date: Wed, 21 Nov 2012 00:14:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r243349 - projects/bhyve/usr.sbin/bhyve
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Wed, 21 Nov 2012 00:14:04 -0000

Author: neel
Date: Wed Nov 21 00:14:03 2012
New Revision: 243349
URL: http://svnweb.freebsd.org/changeset/base/243349

Log:
  Mask the %eax register properly based on whether the "out" instruction is
  operating on 1, 2 or 4 bytes.
  
  There could be garbage in the unused bytes so zero them off.
  
  Obtained from:	NetApp

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

Modified: projects/bhyve/usr.sbin/bhyve/inout.c
==============================================================================
--- projects/bhyve/usr.sbin/bhyve/inout.c	Tue Nov 20 21:26:13 2012	(r243348)
+++ projects/bhyve/usr.sbin/bhyve/inout.c	Wed Nov 21 00:14:03 2012	(r243349)
@@ -74,6 +74,7 @@ emulate_inout(struct vmctx *ctx, int vcp
 	      uint32_t *eax, int strict)
 {
 	int flags;
+	uint32_t mask;
 	inout_func_t handler;
 	void *arg;
 
@@ -84,6 +85,21 @@ emulate_inout(struct vmctx *ctx, int vcp
 	if (strict && handler == default_inout)
 		return (-1);
 
+	if (!in) {
+		switch (bytes) {
+		case 1:
+			mask = 0xff;
+			break;
+		case 2:
+			mask = 0xffff;
+			break;
+		default:
+			mask = 0xffffffff;
+			break;
+		}
+		*eax = *eax & mask;
+	}
+
 	flags = inout_handlers[port].flags;
 	arg = inout_handlers[port].arg;