frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

linux: Refactor VT switch on {re,}generation and shutdown 

This makes more things fatal than were fatal before, but that's correct;
if you need the VT, then failing to get it on regeneration means things
are about to go very very badly.

Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson 2010-05-11 09:16:19 -04:00
parent 0def735c6a
commit 7ee965a300
1 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
hw/xfree86/os-support/linux/lnx_init.c
View File

@ -59,6 +59,16 @@ drain_console(int fd, void *closure)
} }
} }
static void
switch_to(int vt, const char *from)
{
if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, vt) < 0)
FatalError("%s: VT_ACTIVATE failed: %s\n", from, strerror(errno));
if (ioctl(xf86Info.consoleFd, VT_WAITACTIVE, vt) < 0)
FatalError("%s: VT_WAITACTIVE failed: %s\n", from, strerror(errno));
}
void void
xf86OpenConsole(void) xf86OpenConsole(void)
{ {
@ -174,13 +184,7 @@ xf86OpenConsole(void)
/* /*
* now get the VT. This _must_ succeed, or else fail completely. * now get the VT. This _must_ succeed, or else fail completely.
*/ */
if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno) < 0) switch_to(xf86Info.vtno, "xf86OpenConsole");
FatalError("xf86OpenConsole: VT_ACTIVATE failed: %s\n",
strerror(errno));
if (ioctl(xf86Info.consoleFd, VT_WAITACTIVE, xf86Info.vtno) < 0)
FatalError("xf86OpenConsole: VT_WAITACTIVE failed: %s\n",
strerror(errno));
if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) < 0) if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) < 0)
FatalError("xf86OpenConsole: VT_GETMODE failed %s\n", FatalError("xf86OpenConsole: VT_GETMODE failed %s\n",
@ -227,16 +231,8 @@ xf86OpenConsole(void)
} else { /* serverGeneration != 1 */ } else { /* serverGeneration != 1 */
if (!ShareVTs && VTSwitch) if (!ShareVTs && VTSwitch)
{ {
/* /* now get the VT */
* now get the VT switch_to(xf86Info.vtno, "xf86OpenConsole");
*/
if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno) < 0)
xf86Msg(X_WARNING, "xf86OpenConsole: VT_ACTIVATE failed %s\n",
strerror(errno));
if (ioctl(xf86Info.consoleFd, VT_WAITACTIVE, xf86Info.vtno) < 0)
xf86Msg(X_WARNING, "xf86OpenConsole: VT_WAITACTIVE failed %s\n",
strerror(errno));
} }
} }
} }
@ -281,13 +277,7 @@ xf86CloseConsole(void)
* Perform a switch back to the active VT when we were started * Perform a switch back to the active VT when we were started
*/ */
if (activeVT >= 0) { if (activeVT >= 0) {
if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, activeVT) < 0) switch_to(activeVT, "xf86CloseConsole");
xf86Msg(X_WARNING, "xf86CloseConsole: VT_ACTIVATE failed: %s\n",
strerror(errno));
if (ioctl(xf86Info.consoleFd, VT_WAITACTIVE, activeVT) < 0)
xf86Msg(X_WARNING,
"xf86CloseConsole: VT_WAITACTIVE failed: %s\n",
strerror(errno));
activeVT = -1; activeVT = -1;
} }
} }