From owner-svn-src-stable@FreeBSD.ORG Mon Jul 21 02:17:29 2014 Return-Path: Delivered-To: svn-src-stable@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 D3E7DBF0; Mon, 21 Jul 2014 02:17:29 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A8A7D25E3; Mon, 21 Jul 2014 02:17:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6L2HTkt024772; Mon, 21 Jul 2014 02:17:29 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6L2HTaK024769; Mon, 21 Jul 2014 02:17:29 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201407210217.s6L2HTaK024769@svn.freebsd.org> From: John Baldwin Date: Mon, 21 Jul 2014 02:17:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r268934 - stable/10/usr.sbin/bhyve X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jul 2014 02:17:29 -0000 Author: jhb Date: Mon Jul 21 02:17:28 2014 New Revision: 268934 URL: http://svnweb.freebsd.org/changeset/base/268934 Log: MFC 264916,267611: Provide a very basic stub for the 8042 PS/2 keyboard controller. Added: stable/10/usr.sbin/bhyve/atkbdc.c - copied, changed from r264916, head/usr.sbin/bhyve/atkbdc.c Modified: stable/10/usr.sbin/bhyve/Makefile stable/10/usr.sbin/bhyve/bhyverun.c Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/bhyve/Makefile ============================================================================== --- stable/10/usr.sbin/bhyve/Makefile Mon Jul 21 00:21:56 2014 (r268933) +++ stable/10/usr.sbin/bhyve/Makefile Mon Jul 21 02:17:28 2014 (r268934) @@ -9,6 +9,7 @@ DEBUG_FLAGS= -g -O0 MAN= bhyve.8 SRCS= \ + atkbdc.c \ acpi.c \ bhyverun.c \ block_if.c \ Copied and modified: stable/10/usr.sbin/bhyve/atkbdc.c (from r264916, head/usr.sbin/bhyve/atkbdc.c) ============================================================================== --- head/usr.sbin/bhyve/atkbdc.c Fri Apr 25 13:38:18 2014 (r264916, copy source) +++ stable/10/usr.sbin/bhyve/atkbdc.c Mon Jul 21 02:17:28 2014 (r268934) @@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$"); #define KBD_DATA_PORT 0x60 #define KBD_STS_CTL_PORT 0x64 -#define KDB_SYS_FLAG 0x4 +#define KBD_SYS_FLAG 0x4 #define KBDC_RESET 0xfe @@ -66,7 +66,7 @@ atkbdc_sts_ctl_handler(struct vmctx *ctx retval = INOUT_OK; if (in) { - *eax = KDB_SYS_FLAG; /* system passed POST */ + *eax = KBD_SYS_FLAG; /* system passed POST */ } else { switch (*eax) { case KBDC_RESET: /* Pulse "reset" line. */ Modified: stable/10/usr.sbin/bhyve/bhyverun.c ============================================================================== --- stable/10/usr.sbin/bhyve/bhyverun.c Mon Jul 21 00:21:56 2014 (r268933) +++ stable/10/usr.sbin/bhyve/bhyverun.c Mon Jul 21 02:17:28 2014 (r268934) @@ -315,10 +315,6 @@ vmexit_inout(struct vmctx *ctx, struct v if (vme->u.inout.string || vme->u.inout.rep) return (VMEXIT_ABORT); - /* Special case of guest reset */ - if (out && port == 0x64 && (uint8_t)eax == 0xFE) - return (vmexit_catch_reset()); - /* Extra-special case of host notifications */ if (out && port == GUEST_NIO_PORT) return (vmexit_handle_notify(ctx, vme, pvcpu, eax));