From owner-svn-src-all@FreeBSD.ORG Thu Dec 4 17:05:08 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CD82FC58; Thu, 4 Dec 2014 17:05:08 +0000 (UTC) Received: from mail.myota.org (mail.myota.org [85.10.206.105]) by mx1.freebsd.org (Postfix) with ESMTP id 60931373; Thu, 4 Dec 2014 17:05:07 +0000 (UTC) Received: from mobile.client (58.7.167.190.d.dyn.codetel.net.do [190.167.7.58] (may be forged)) (authenticated bits=128) by mail.myota.org (8.14.9/8.14.9) with ESMTP id sB4H12LY007499; Thu, 4 Dec 2014 18:01:09 +0100 (CET) (envelope-from mail@ma20.ata.myota.org) Received: from submit.client ([127.0.0.1]) by schlappy.local (8.14.9/8.14.9) with ESMTP id sB4H0n5W001864; Thu, 4 Dec 2014 18:00:50 +0100 (CET) (envelope-from mail@ma20.ata.myota.org) Received: (from user@localhost) by schlappy.local (8.14.9/8.14.9/Submit) id sB4H0nCp001863; Thu, 4 Dec 2014 18:00:49 +0100 (CET) (envelope-from mail@ma20.ata.myota.org) Date: Thu, 4 Dec 2014 18:00:49 +0100 From: Andre Albsmeier To: Jean-Sebastien Pedron Subject: Re: svn commit: r273973 - head/sys/dev/vt Message-ID: <20141204170049.GA1832@schlappy> References: <201411021604.sA2G4n1R088429@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201411021604.sA2G4n1R088429@svn.freebsd.org> X-Echelon: IRA, Secure, unix, 15kg, president X-Advice: Drop that crappy M$-Outlook, I'm tired of your viruses! User-Agent: Mutt/1.5.21 (2010-09-15) X-Greylist: Not delayed on 85.10.206.105, ACL: AUTH(59), Origin: DO, OS: FreeBSD 9.x X-Virus-Scanned: clamav-milter 0.98.5 at colo X-Virus-Status: Clean Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Dec 2014 17:05:08 -0000 On Sun, 02-Nov-2014 at 16:04:49 +0000, Jean-Sebastien Pedron wrote: > 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 Could someone please MFC this to 9? The patch is slightly different here but works: --- sys/dev/vt/vt_core.c.ORI 2014-07-22 17:29:27.000000000 +0200 +++ sys/dev/vt/vt_core.c 2014-12-04 17:04:12.000000000 +0100 @@ -559,7 +559,6 @@ idx0 = kbd_allocate("kbdmux", -1, (void *)&vd->vd_keyboard, vt_kbdevent, vd); /* XXX: kb_token lost */ - vd->vd_keyboard = idx0; if (idx0 != -1) { DPRINTF(20, "%s: kbdmux allocated, idx = %d\n", __func__, idx0); k0 = kbd_get_keyboard(idx0); @@ -583,6 +582,7 @@ idx0 = kbd_allocate("*", -1, (void *)&vd->vd_keyboard, vt_kbdevent, vd); } + vd->vd_keyboard = idx0; DPRINTF(20, "%s: vd_keyboard = %d\n", __func__, vd->vd_keyboard); return (idx0); Thanks, -Andre