From owner-svn-src-all@FreeBSD.ORG  Sun Nov  2 16:04:49 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5972F49E;
 Sun,  2 Nov 2014 16:04:49 +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 4570138C;
 Sun,  2 Nov 2014 16:04:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA2G4nK7088430;
 Sun, 2 Nov 2014 16:04:49 GMT (envelope-from dumbbell@FreeBSD.org)
Received: (from dumbbell@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA2G4n1R088429;
 Sun, 2 Nov 2014 16:04:49 GMT (envelope-from dumbbell@FreeBSD.org)
Message-Id: <201411021604.sA2G4n1R088429@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: dumbbell set sender to
 dumbbell@FreeBSD.org using -f
From: Jean-Sebastien Pedron <dumbbell@FreeBSD.org>
Date: Sun, 2 Nov 2014 16:04:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r273973 - head/sys/dev/vt
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.18-1
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: Sun, 02 Nov 2014 16:04:49 -0000

Author: dumbbell
Date: Sun Nov  2 16:04:48 2014
New Revision: 273973
URL: https://svnweb.freebsd.org/changeset/base/273973

Log:
  vt(4): Fix keyboard allocation when kbdmux(4) isn't used
  
  The problem was that only the kbdmux keyboard index was saved in
  vd->vd_keyboard. This index is -1 when kbdmux isn't used. In this
  case, the keyboard was correctly allocated, but the returned index was
  discarded.
  
  PR:		194718
  MFC after:	1 week

Modified:
  head/sys/dev/vt/vt_core.c

Modified: head/sys/dev/vt/vt_core.c
==============================================================================
--- head/sys/dev/vt/vt_core.c	Sun Nov  2 14:28:20 2014	(r273972)
+++ head/sys/dev/vt/vt_core.c	Sun Nov  2 16:04:48 2014	(r273973)
@@ -866,7 +866,6 @@ vt_allocate_keyboard(struct vt_device *v
 	keyboard_info_t	 ki;
 
 	idx0 = kbd_allocate("kbdmux", -1, vd, vt_kbdevent, vd);
-	vd->vd_keyboard = idx0;
 	if (idx0 >= 0) {
 		DPRINTF(20, "%s: kbdmux allocated, idx = %d\n", __func__, idx0);
 		k0 = kbd_get_keyboard(idx0);
@@ -894,6 +893,7 @@ vt_allocate_keyboard(struct vt_device *v
 			return (-1);
 		}
 	}
+	vd->vd_keyboard = idx0;
 	DPRINTF(20, "%s: vd_keyboard = %d\n", __func__, vd->vd_keyboard);
 
 	return (idx0);