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

xfree86: os-support: use LogMessageVerb() instead of xf86Msg() 

Both are doing same job, so no need to keep using an duplicated implementation.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1681>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-09-10 16:56:35 +02:00 committed by Marge Bot
parent 1f93ec5c33
commit 4ba0cf1f55
13 changed files with 156 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hw/xfree86/os-support/bsd/alpha_video.c
View File

@ -67,7 +67,7 @@ dense_base(void)
init_abw(); init_abw();
/* XXX check abst_flags for ABST_DENSE just to be safe? */ /* XXX check abst_flags for ABST_DENSE just to be safe? */
xf86Msg(X_INFO, "dense base = %#lx\n", abw[0].abw_abst.abst_sys_start); /* XXXX */ LogMessageVerb(X_INFO, 1, "dense base = %#lx\n", abw[0].abw_abst.abst_sys_start);
return abw[0].abw_abst.abst_sys_start; return abw[0].abw_abst.abst_sys_start;
} }
@ -112,14 +112,14 @@ checkDevMem(Bool warn)
if (base != MAP_FAILED) { if (base != MAP_FAILED) {
munmap((caddr_t) base, 4096); munmap((caddr_t) base, 4096);
devMemFd = fd; devMemFd = fd;
xf86Msg(X_INFO, "checkDevMem: using aperture driver %s\n", LogMessageVerb(X_INFO, 1, "checkDevMem: using aperture driver %s\n",
DEV_APERTURE); DEV_APERTURE);
return; return;
} }
else { else {
if (warn) { if (warn) {
xf86Msg(X_WARNING, "checkDevMem: failed to mmap %s (%s)\n", LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to mmap %s (%s)\n",
DEV_APERTURE, strerror(errno)); DEV_APERTURE, strerror(errno));
} }
} }
} }
@ -136,23 +136,23 @@ checkDevMem(Bool warn)
} }
else { else {
if (warn) { if (warn) {
xf86Msg(X_WARNING, "checkDevMem: failed to mmap %s (%s)\n", LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to mmap %s (%s)\n",
DEV_MEM, strerror(errno)); DEV_MEM, strerror(errno));
} }
} }
} }
if (warn) { if (warn) {
#ifndef HAS_APERTURE_DRV #ifndef HAS_APERTURE_DRV
xf86Msg(X_WARNING, "checkDevMem: failed to open/mmap %s (%s)\n", LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to open/mmap %s (%s)\n",
DEV_MEM, strerror(errno)); DEV_MEM, strerror(errno));
#else #else
#ifndef __OpenBSD__ #ifndef __OpenBSD__
xf86Msg(X_WARNING, "checkDevMem: failed to open %s and %s\n" LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to open %s and %s\n"
"\t(%s)\n", DEV_APERTURE, DEV_MEM, strerror(errno)); "\t(%s)\n", DEV_APERTURE, DEV_MEM, strerror(errno));
#else /* __OpenBSD__ */ #else /* __OpenBSD__ */
xf86Msg(X_WARNING, "checkDevMem: failed to open %s and %s\n" LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to open %s and %s\n"
"\t(%s)\n%s", DEV_APERTURE, DEV_MEM, strerror(errno), "\t(%s)\n%s", DEV_APERTURE, DEV_MEM, strerror(errno),
SYSCTL_MSG); SYSCTL_MSG);
#endif /* __OpenBSD__ */ #endif /* __OpenBSD__ */
#endif #endif
xf86ErrorF("\tlinear framebuffer access unavailable\n"); xf86ErrorF("\tlinear framebuffer access unavailable\n");

22
hw/xfree86/os-support/bsd/arm_video.c
View File

@ -109,15 +109,15 @@ checkDevMem(Bool warn)
else { else {
/* This should not happen */ /* This should not happen */
if (warn) { if (warn) {
xf86Msg(X_WARNING, "checkDevMem: failed to mmap %s (%s)\n", LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to mmap %s (%s)\n",
DEV_MEM, strerror(errno)); DEV_MEM, strerror(errno));
} }
return; return;
} }
} }
if (warn) { if (warn) {
xf86Msg(X_WARNING, "checkDevMem: failed to open %s (%s)\n", LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to open %s (%s)\n",
DEV_MEM, strerror(errno)); DEV_MEM, strerror(errno));
} }
return; return;
} }
@ -140,8 +140,8 @@ xf86EnableIO()
return TRUE; return TRUE;
if ((IoFd = open("/dev/io", O_RDWR)) == -1) { if ((IoFd = open("/dev/io", O_RDWR)) == -1) {
xf86Msg(X_WARNING, "xf86EnableIO: " LogMessageVerb(X_WARNING, 1,
"Failed to open /dev/io for extended I/O\n"); "xf86EnableIO: Failed to open /dev/io for extended I/O\n");
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
@ -182,14 +182,16 @@ xf86EnableIO()
IOPortBase = base; IOPortBase = base;
} }
else { else {
xf86Msg(X_WARNING, "EnableIO: failed to mmap %s (%s)\n", LogMessageVerb(X_WARNING, 1,
"/dev/ttyC0", strerror(errno)); "EnableIO: failed to mmap /dev/ttyC0 (%s)\n",
strerror(errno));
return FALSE; return FALSE;
} }
} }
else { else {
xf86Msg("EnableIO: failed to open %s (%s)\n", LogMessageVerb(X_WARNING, 1,
"/dev/ttyC0", strerror(errno)); "EnableIO: failed to open /dev/ttyC0 (%s)\n",
strerror(errno));
return FALSE; return FALSE;
} }

44
hw/xfree86/os-support/bsd/bsd_init.c
View File

@ -230,9 +230,9 @@ xf86OpenConsole(void)
* /dev/console * /dev/console
*/ */
if ((devConsoleFd = open("/dev/console", O_WRONLY, 0)) < 0) { if ((devConsoleFd = open("/dev/console", O_WRONLY, 0)) < 0) {
xf86Msg(X_WARNING, LogMessageVerb(X_WARNING, 1,
"xf86OpenConsole: couldn't open /dev/console (%s)\n", "xf86OpenConsole: couldn't open /dev/console (%s)\n",
strerror(errno)); strerror(errno));
} }
break; break;
#endif #endif
@ -259,7 +259,7 @@ xf86OpenConsole(void)
if (initialVT != 1) { if (initialVT != 1) {
if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, 1) != 0) { if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, 1) != 0) {
xf86Msg(X_WARNING, "xf86OpenConsole: VT_ACTIVATE failed\n"); LogMessageVerb(X_WARNING, 1, "xf86OpenConsole: VT_ACTIVATE failed\n");
} }
sleep(1); sleep(1);
} }
@ -274,14 +274,14 @@ xf86OpenConsole(void)
SYSCALL(result = SYSCALL(result =
ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno)); ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno));
if (result != 0) { if (result != 0) {
xf86Msg(X_WARNING, "xf86OpenConsole: VT_ACTIVATE failed\n"); LogMessageVerb(X_WARNING, 1, "xf86OpenConsole: VT_ACTIVATE failed\n");
} }
SYSCALL(result = SYSCALL(result =
ioctl(xf86Info.consoleFd, VT_WAITACTIVE, ioctl(xf86Info.consoleFd, VT_WAITACTIVE,
xf86Info.vtno)); xf86Info.vtno));
if (result != 0) { if (result != 0) {
xf86Msg(X_WARNING, LogMessageVerb(X_WARNING, 1,
"xf86OpenConsole: VT_WAITACTIVE failed\n"); "xf86OpenConsole: VT_WAITACTIVE failed\n");
} }
OsSignal(SIGUSR1, xf86VTRequest); OsSignal(SIGUSR1, xf86VTRequest);
@ -321,7 +321,7 @@ xf86OpenConsole(void)
if (!xf86Info.ShareVTs && xf86Info.autoVTSwitch && if (!xf86Info.ShareVTs && xf86Info.autoVTSwitch &&
(xf86Info.consType == SYSCONS || xf86Info.consType == PCVT)) { (xf86Info.consType == SYSCONS || xf86Info.consType == PCVT)) {
if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno) != 0) { if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno) != 0) {
xf86Msg(X_WARNING, "xf86OpenConsole: VT_ACTIVATE failed\n"); LogMessageVerb(X_WARNING, 1, "xf86OpenConsole: VT_ACTIVATE failed\n");
} }
} }
#endif /* SYSCONS_SUPPORT || PCVT_SUPPORT */ #endif /* SYSCONS_SUPPORT || PCVT_SUPPORT */
@ -347,7 +347,7 @@ xf86OpenPccons(void)
CHECK_DRIVER_MSG); CHECK_DRIVER_MSG);
} }
xf86Info.consType = PCCONS; xf86Info.consType = PCCONS;
xf86Msg(X_PROBED, "Using pccons driver with X support\n"); LogMessageVerb(X_PROBED, 1, "Using pccons driver with X support\n");
} }
return fd; return fd;
} }
@ -439,7 +439,7 @@ xf86OpenSyscons(void)
FatalError("xf86OpenSyscons: VT_GETMODE failed"); FatalError("xf86OpenSyscons: VT_GETMODE failed");
} }
xf86Info.consType = SYSCONS; xf86Info.consType = SYSCONS;
xf86Msg(X_PROBED, "Using syscons driver with X support"); LogMessageVerb(X_PROBED, 1, "Using syscons driver with X support");
if (syscons_version >= 0x100) { if (syscons_version >= 0x100) {
xf86ErrorF(" (version %ld.%ld)\n", syscons_version >> 8, xf86ErrorF(" (version %ld.%ld)\n", syscons_version >> 8,
syscons_version & 0xFF); syscons_version & 0xFF);
@ -447,7 +447,7 @@ xf86OpenSyscons(void)
else { else {
xf86ErrorF(" (version 0.x)\n"); xf86ErrorF(" (version 0.x)\n");
} }
xf86Msg(from, "using VT number %d\n\n", xf86Info.vtno); LogMessageVerb(from, 1, "using VT number %d\n\n", xf86Info.vtno);
} }
else { else {
/* VT_GETMODE failed, probably not syscons */ /* VT_GETMODE failed, probably not syscons */
@ -542,21 +542,21 @@ xf86OpenPcvt(void)
xf86Info.consType = PCVT; xf86Info.consType = PCVT;
#ifdef WSCONS_SUPPORT #ifdef WSCONS_SUPPORT
#ifdef __NetBSD__ #ifdef __NetBSD__
xf86Msg(X_PROBED, LogMessageVerb(X_PROBED, 1,
"Using wscons driver on %s in pcvt compatibility mode " "Using wscons driver on %s in pcvt compatibility mode "
"(version %d.%d)\n", vtname, "(version %d.%d)\n", vtname,
pcvt_version.rmajor, pcvt_version.rminor); pcvt_version.rmajor, pcvt_version.rminor);
#else #else
xf86Msg(X_PROBED, LogMessageVerb(X_PROBED, 1,
"Using wscons driver on %s in pcvt compatibility mode ", "Using wscons driver on %s in pcvt compatibility mode ",
vtname); vtname);
#endif #endif
#else #else
# ifdef __NetBSD__ # ifdef __NetBSD__
xf86Msg(X_PROBED, "Using pcvt driver (version %d.%d)\n", LogMessageVerb(X_PROBED, 1, "Using pcvt driver (version %d.%d)\n",
pcvt_version.rmajor, pcvt_version.rminor); pcvt_version.rmajor, pcvt_version.rminor);
# else # else
xf86Msg(X_PROBED, "Using pcvt driver\n"); LogMessageVerb(X_PROBED, 1, "Using pcvt driver\n");
# endif # endif
#endif #endif
#ifdef __NetBSD__ #ifdef __NetBSD__
@ -599,7 +599,7 @@ xf86OpenWScons(void)
"xf86OpenConsole", strerror(errno), CHECK_DRIVER_MSG); "xf86OpenConsole", strerror(errno), CHECK_DRIVER_MSG);
} }
xf86Info.consType = WSCONS; xf86Info.consType = WSCONS;
xf86Msg(X_PROBED, "Using wscons driver\n"); LogMessageVerb(X_PROBED, 1, "Using wscons driver\n");
} }
return fd; return fd;
} }

53
hw/xfree86/os-support/bsd/i386_video.c
View File

@ -96,8 +96,8 @@ checkDevMem(Bool warn)
else { else {
/* This should not happen */ /* This should not happen */
if (warn) { if (warn) {
xf86Msg(X_WARNING, "checkDevMem: failed to mmap %s (%s)\n", LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to mmap %s (%s)\n",
DEV_MEM, strerror(errno)); DEV_MEM, strerror(errno));
} }
useDevMem = FALSE; useDevMem = FALSE;
return; return;
@ -105,8 +105,8 @@ checkDevMem(Bool warn)
} }
#ifndef HAS_APERTURE_DRV #ifndef HAS_APERTURE_DRV
if (warn) { if (warn) {
xf86Msg(X_WARNING, "checkDevMem: failed to open %s (%s)\n", LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to open %s (%s)\n",
DEV_MEM, strerror(errno)); DEV_MEM, strerror(errno));
} }
useDevMem = FALSE; useDevMem = FALSE;
return; return;
@ -121,27 +121,27 @@ checkDevMem(Bool warn)
munmap((caddr_t) base, 4096); munmap((caddr_t) base, 4096);
devMemFd = fd; devMemFd = fd;
useDevMem = TRUE; useDevMem = TRUE;
xf86Msg(X_INFO, "checkDevMem: using aperture driver %s\n", LogMessageVerb(X_INFO, 1, "checkDevMem: using aperture driver %s\n",
DEV_APERTURE); DEV_APERTURE);
return; return;
} }
else { else {
if (warn) { if (warn) {
xf86Msg(X_WARNING, "checkDevMem: failed to mmap %s (%s)\n", LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to mmap %s (%s)\n",
DEV_APERTURE, strerror(errno)); DEV_APERTURE, strerror(errno));
} }
} }
} }
else { else {
if (warn) { if (warn) {
#ifndef __OpenBSD__ #ifndef __OpenBSD__
xf86Msg(X_WARNING, "checkDevMem: failed to open %s and %s\n" LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to open %s and %s\n"
"\t(%s)\n", DEV_MEM, DEV_APERTURE, strerror(errno)); "\t(%s)\n", DEV_MEM, DEV_APERTURE, strerror(errno));
#else /* __OpenBSD__ */ #else /* __OpenBSD__ */
xf86Msg(X_WARNING, "checkDevMem: failed to open %s and %s\n" LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to open %s and %s\n"
"\t(%s)\n%s", DEV_MEM, DEV_APERTURE, strerror(errno), "\t(%s)\n%s", DEV_MEM, DEV_APERTURE, strerror(errno),
SYSCTL_MSG); SYSCTL_MSG);
#endif /* __OpenBSD__ */ #endif /* __OpenBSD__ */
} }
} }
@ -177,11 +177,9 @@ xf86EnableIO(void)
if (i386_iopl(TRUE) < 0) { if (i386_iopl(TRUE) < 0) {
#ifndef __OpenBSD__ #ifndef __OpenBSD__
xf86Msg(X_WARNING, "%s: Failed to set IOPL for extended I/O", LogMessageVerb(X_WARNING, 1, "xf86EnableIO: Failed to set IOPL for extended I/O");
"xf86EnableIO");
#else #else
xf86Msg(X_WARNING, "%s: Failed to set IOPL for extended I/O\n%s", LogMessageVerb(X_WARNING, 1, "xf86EnableIO: Failed to set IOPL for extended I/O\n%s", SYSCTL_MSG);
"xf86EnableIO", SYSCTL_MSG);
#endif #endif
return FALSE; return FALSE;
} }
@ -222,11 +220,9 @@ xf86EnableIO(void)
if (amd64_iopl(TRUE) < 0) { if (amd64_iopl(TRUE) < 0) {
#ifndef __OpenBSD__ #ifndef __OpenBSD__
xf86Msg(X_WARNING, "%s: Failed to set IOPL for extended I/O", LogMessageVerb(X_WARNING, 1, "xf86EnableIO: Failed to set IOPL for extended I/O");
"xf86EnableIO");
#else #else
xf86Msg(X_WARNING, "%s: Failed to set IOPL for extended I/O\n%s", LogMessageVerb(X_WARNING, 1, "xf86EnableIO: Failed to set IOPL for extended I/O\n%s", SYSCTL_MSG);
"xf86EnableIO", SYSCTL_MSG);
#endif #endif
return FALSE; return FALSE;
} }
@ -262,8 +258,7 @@ xf86EnableIO(void)
return TRUE; return TRUE;
if ((IoFd = open("/dev/io", O_RDWR)) == -1) { if ((IoFd = open("/dev/io", O_RDWR)) == -1) {
xf86Msg(X_WARNING, "xf86EnableIO: " LogMessageVerb(X_WARNING, 1, "xf86EnableIO: Failed to open /dev/io for extended I/O");
"Failed to open /dev/io for extended I/O");
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
@ -294,9 +289,9 @@ xf86SetTVOut(int mode)
case PCCONS:{ case PCCONS:{
if (ioctl(xf86Info.consoleFd, CONSOLE_X_TV_ON, &mode) < 0) { if (ioctl(xf86Info.consoleFd, CONSOLE_X_TV_ON, &mode) < 0) {
xf86Msg(X_WARNING, LogMessageVerb(X_WARNING, 1,
"xf86SetTVOut: Could not set console to TV output, %s\n", "xf86SetTVOut: Could not set console to TV output, %s\n",
strerror(errno)); strerror(errno));
} }
} }
break; break;
@ -317,9 +312,9 @@ xf86SetRGBOut(void)
case PCCONS:{ case PCCONS:{
if (ioctl(xf86Info.consoleFd, CONSOLE_X_TV_OFF, 0) < 0) { if (ioctl(xf86Info.consoleFd, CONSOLE_X_TV_OFF, 0) < 0) {
xf86Msg(X_WARNING, LogMessageVerb(X_WARNING, 1,
"xf86SetTVOut: Could not set console to RGB output, %s\n", "xf86SetTVOut: Could not set console to RGB output, %s\n",
strerror(errno)); strerror(errno));
} }
} }
break; break;

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

@ -73,13 +73,13 @@ switch_to(int vt, const char *from)
SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_ACTIVATE, vt)); SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_ACTIVATE, vt));
if (ret < 0) { if (ret < 0) {
xf86Msg(X_WARNING, "%s: VT_ACTIVATE failed: %s\n", from, strerror(errno)); LogMessageVerb(X_WARNING, 1, "%s: VT_ACTIVATE failed: %s\n", from, strerror(errno));
return 0; return 0;
} }
SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_WAITACTIVE, vt)); SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_WAITACTIVE, vt));
if (ret < 0) { if (ret < 0) {
xf86Msg(X_WARNING, "%s: VT_WAITACTIVE failed: %s\n", from, strerror(errno)); LogMessageVerb(X_WARNING, 1, "%s: VT_WAITACTIVE failed: %s\n", from, strerror(errno));
return 0; return 0;
} }
@ -145,7 +145,7 @@ linux_parse_vt_settings(int may_fail)
close(fd); close(fd);
} }
xf86Msg(from, "using VT number %d\n\n", xf86Info.vtno); LogMessageVerb(from, 1, "using VT number %d\n\n", xf86Info.vtno);
/* Some of stdin / stdout / stderr maybe redirected to a file */ /* Some of stdin / stdout / stderr maybe redirected to a file */
for (i = STDIN_FILENO; i <= STDERR_FILENO; i++) { for (i = STDIN_FILENO; i <= STDERR_FILENO; i++) {
@ -157,9 +157,9 @@ linux_parse_vt_settings(int may_fail)
} }
if (!KeepTty && current_vt == xf86Info.vtno) { if (!KeepTty && current_vt == xf86Info.vtno) {
xf86Msg(X_PROBED, LogMessageVerb(X_PROBED, 1,
"controlling tty is VT number %d, auto-enabling KeepTty\n", "controlling tty is VT number %d, auto-enabling KeepTty\n",
current_vt); current_vt);
KeepTty = TRUE; KeepTty = TRUE;
} }
@ -196,13 +196,13 @@ xf86OpenConsole(void)
* group leader * group leader
*/ */
if (setpgid(0, ppgid) < 0) if (setpgid(0, ppgid) < 0)
xf86Msg(X_WARNING, "xf86OpenConsole: setpgid failed: %s\n", LogMessageVerb(X_WARNING, 1, "xf86OpenConsole: setpgid failed: %s\n",
strerror(errno)); strerror(errno));
/* become process group leader */ /* become process group leader */
if ((setsid() < 0)) if ((setsid() < 0))
xf86Msg(X_WARNING, "xf86OpenConsole: setsid failed: %s\n", LogMessageVerb(X_WARNING, 1, "xf86OpenConsole: setsid failed: %s\n",
strerror(errno)); strerror(errno));
} }
i = 0; i = 0;
@ -223,8 +223,8 @@ xf86OpenConsole(void)
*/ */
SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_GETSTATE, &vts)); SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_GETSTATE, &vts));
if (ret < 0) if (ret < 0)
xf86Msg(X_WARNING, "xf86OpenConsole: VT_GETSTATE failed: %s\n", LogMessageVerb(X_WARNING, 1, "xf86OpenConsole: VT_GETSTATE failed: %s\n",
strerror(errno)); strerror(errno));
else else
activeVT = vts.v_active; activeVT = vts.v_active;
@ -320,23 +320,23 @@ xf86CloseConsole(void)
/* Back to text mode ... */ /* Back to text mode ... */
SYSCALL(ret = ioctl(xf86Info.consoleFd, KDSETMODE, KD_TEXT)); SYSCALL(ret = ioctl(xf86Info.consoleFd, KDSETMODE, KD_TEXT));
if (ret < 0) if (ret < 0)
xf86Msg(X_WARNING, "xf86CloseConsole: KDSETMODE failed: %s\n", LogMessageVerb(X_WARNING, 1, "xf86CloseConsole: KDSETMODE failed: %s\n",
strerror(errno)); strerror(errno));
SYSCALL(ioctl(xf86Info.consoleFd, KDSKBMODE, tty_mode)); SYSCALL(ioctl(xf86Info.consoleFd, KDSKBMODE, tty_mode));
tcsetattr(xf86Info.consoleFd, TCSANOW, &tty_attr); tcsetattr(xf86Info.consoleFd, TCSANOW, &tty_attr);
SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_GETMODE, &VT)); SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_GETMODE, &VT));
if (ret < 0) if (ret < 0)
xf86Msg(X_WARNING, "xf86CloseConsole: VT_GETMODE failed: %s\n", LogMessageVerb(X_WARNING, 1, "xf86CloseConsole: VT_GETMODE failed: %s\n",
strerror(errno)); strerror(errno));
else { else {
/* set dflt vt handling */ /* set dflt vt handling */
VT.mode = VT_AUTO; VT.mode = VT_AUTO;
SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_SETMODE, &VT)); SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_SETMODE, &VT));
if (ret < 0) if (ret < 0)
xf86Msg(X_WARNING, "xf86CloseConsole: VT_SETMODE failed: %s\n", LogMessageVerb(X_WARNING, 1, "xf86CloseConsole: VT_SETMODE failed: %s\n",
strerror(errno)); strerror(errno));
} }
if (xf86Info.autoVTSwitch) { if (xf86Info.autoVTSwitch) {
@ -347,8 +347,8 @@ xf86CloseConsole(void)
if (activeVT >= 0) { if (activeVT >= 0) {
SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_GETSTATE, &vts)); SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_GETSTATE, &vts));
if (ret < 0) { if (ret < 0) {
xf86Msg(X_WARNING, "xf86OpenConsole: VT_GETSTATE failed: %s\n", LogMessageVerb(X_WARNING, 1, "xf86OpenConsole: VT_GETSTATE failed: %s\n",
strerror(errno)); strerror(errno));
} else { } else {
if (vts.v_active == xf86Info.vtno) { if (vts.v_active == xf86Info.vtno) {
switch_to(activeVT, "xf86CloseConsole"); switch_to(activeVT, "xf86CloseConsole");

6
hw/xfree86/os-support/linux/lnx_kmod.c
View File

@ -72,12 +72,12 @@ xf86LoadKernelModule(const char *modName)
* preinstall agpgart module for some DRM modules * preinstall agpgart module for some DRM modules
*/ */
if (setreuid(0, 0)) { if (setreuid(0, 0)) {
xf86Msg(X_WARNING, "LoadKernelModule: " LogMessageVerb(X_WARNING, 1, "LoadKernelModule: "
"Setting of real/effective user Id to 0/0 failed"); "Setting of real/effective user Id to 0/0 failed");
} }
setenv("PATH", "/sbin", 1); setenv("PATH", "/sbin", 1);
execl(mpPath, "modprobe", modName, NULL); execl(mpPath, "modprobe", modName, NULL);
xf86Msg(X_WARNING, "LoadKernelModule %s\n", strerror(errno)); LogMessageVerb(X_WARNING, 1, "LoadKernelModule %s\n", strerror(errno));
exit(EXIT_FAILURE); /* if we get here the child's exec failed */ exit(EXIT_FAILURE); /* if we get here the child's exec failed */
break; break;
case -1: /* fork failed */ case -1: /* fork failed */

2
hw/xfree86/os-support/shared/drm_platform.c
View File

@ -61,7 +61,7 @@ get_drm_info(struct OdevAttributes *attribs, char *path, int delayed_index)
v = drmGetVersion(fd); v = drmGetVersion(fd);
if (!v) { if (!v) {
xf86Msg(X_ERROR, "%s: failed to query DRM version\n", path); LogMessageVerb(X_ERROR, 1, "%s: failed to query DRM version\n", path);
goto out; goto out;
} }

24
hw/xfree86/os-support/shared/posix_tty.c
View File

@ -124,7 +124,7 @@ xf86OpenSerial(XF86OptionPtr options)
dev = xf86SetStrOption(options, "Device", NULL); dev = xf86SetStrOption(options, "Device", NULL);
if (!dev) { if (!dev) {
xf86Msg(X_ERROR, "xf86OpenSerial: No Device specified.\n"); LogMessageVerb(X_ERROR, 1, "xf86OpenSerial: No Device specified.\n");
return -1; return -1;
} }
@ -134,9 +134,9 @@ xf86OpenSerial(XF86OptionPtr options)
SYSCALL(fd = open(dev, O_RDWR | O_NONBLOCK)); SYSCALL(fd = open(dev, O_RDWR | O_NONBLOCK));
if (fd == -1) { if (fd == -1) {
xf86Msg(X_ERROR, LogMessageVerb(X_ERROR, 1,
"xf86OpenSerial: Cannot open device %s\n\t%s.\n", "xf86OpenSerial: Cannot open device %s\n\t%s.\n",
dev, strerror(errno)); dev, strerror(errno));
free(dev); free(dev);
return -1; return -1;
} }
@ -209,7 +209,7 @@ xf86SetSerial(int fd, XF86OptionPtr options)
cfsetospeed(&t, baud); cfsetospeed(&t, baud);
} }
else { else {
xf86Msg(X_ERROR, "Invalid Option BaudRate value: %d\n", val); LogMessageVerb(X_ERROR, 1, "Invalid Option BaudRate value: %d\n", val);
return -1; return -1;
} }
} }
@ -223,7 +223,7 @@ xf86SetSerial(int fd, XF86OptionPtr options)
t.c_cflag |= CSTOPB; t.c_cflag |= CSTOPB;
break; break;
default: default:
xf86Msg(X_ERROR, "Invalid Option StopBits value: %d\n", val); LogMessageVerb(X_ERROR, 1, "Invalid Option StopBits value: %d\n", val);
return -1; return -1;
break; break;
} }
@ -248,7 +248,7 @@ xf86SetSerial(int fd, XF86OptionPtr options)
t.c_cflag |= CS8; t.c_cflag |= CS8;
break; break;
default: default:
xf86Msg(X_ERROR, "Invalid Option DataBits value: %d\n", val); LogMessageVerb(X_ERROR, 1, "Invalid Option DataBits value: %d\n", val);
return -1; return -1;
break; break;
} }
@ -266,7 +266,7 @@ xf86SetSerial(int fd, XF86OptionPtr options)
t.c_cflag &= ~(PARENB); t.c_cflag &= ~(PARENB);
} }
else { else {
xf86Msg(X_ERROR, "Invalid Option Parity value: %s\n", s); LogMessageVerb(X_ERROR, 1, "Invalid Option Parity value: %s\n", s);
free(s); free(s);
return -1; return -1;
} }
@ -295,7 +295,7 @@ xf86SetSerial(int fd, XF86OptionPtr options)
t.c_iflag &= ~(IXON | IXOFF); t.c_iflag &= ~(IXON | IXOFF);
} }
else { else {
xf86Msg(X_ERROR, "Invalid Option FlowControl value: %s\n", s); LogMessageVerb(X_ERROR, 1, "Invalid Option FlowControl value: %s\n", s);
free(s); free(s);
return -1; return -1;
} }
@ -311,14 +311,14 @@ xf86SetSerial(int fd, XF86OptionPtr options)
SYSCALL(ioctl(fd, TIOCCDTR, NULL)); SYSCALL(ioctl(fd, TIOCCDTR, NULL));
#endif #endif
#else #else
xf86Msg(X_WARNING, "Option ClearDTR not supported on this OS\n"); LogMessageVerb(X_WARNING, 1, "Option ClearDTR not supported on this OS\n");
return -1; return -1;
#endif #endif
xf86MarkOptionUsedByName(options, "ClearDTR"); xf86MarkOptionUsedByName(options, "ClearDTR");
} }
if ((xf86SetBoolOption(options, "ClearRTS", FALSE))) { if ((xf86SetBoolOption(options, "ClearRTS", FALSE))) {
xf86Msg(X_WARNING, "Option ClearRTS not supported on this OS\n"); LogMessageVerb(X_WARNING, 1, "Option ClearRTS not supported on this OS\n");
return -1; return -1;
xf86MarkOptionUsedByName(options, "ClearRTS"); xf86MarkOptionUsedByName(options, "ClearRTS");
} }
@ -347,7 +347,7 @@ xf86SetSerialSpeed(int fd, int speed)
cfsetospeed(&t, baud); cfsetospeed(&t, baud);
} }
else { else {
xf86Msg(X_ERROR, "Invalid Option BaudRate value: %d\n", speed); LogMessageVerb(X_ERROR, 1, "Invalid Option BaudRate value: %d\n", speed);
return -1; return -1;
} }

18
hw/xfree86/os-support/shared/sigio.c
View File

@ -145,7 +145,7 @@ xf86SIGIO(int sig)
} }
} }
if (r > 0) { if (r > 0) {
xf86Msg(X_ERROR, "SIGIO %d descriptors not handled\n", r); LogMessageVerb(X_ERROR, 1, "SIGIO %d descriptors not handled\n", r);
} }
/* restore global errno */ /* restore global errno */
errno = save_errno; errno = save_errno;
@ -198,13 +198,13 @@ xf86InstallSIGIOHandler(int fd, void (*f) (int, void *), void *closure)
block_sigio(); block_sigio();
#ifdef O_ASYNC #ifdef O_ASYNC
if (fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_ASYNC) == -1) { if (fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_ASYNC) == -1) {
xf86Msg(X_WARNING, "fcntl(%d, O_ASYNC): %s\n", LogMessageVerb(X_WARNING, 1, "fcntl(%d, O_ASYNC): %s\n",
fd, strerror(errno)); fd, strerror(errno));
} }
else { else {
if (fcntl(fd, F_SETOWN, getpid()) == -1) { if (fcntl(fd, F_SETOWN, getpid()) == -1) {
xf86Msg(X_WARNING, "fcntl(%d, F_SETOWN): %s\n", LogMessageVerb(X_WARNING, 1, "fcntl(%d, F_SETOWN): %s\n",
fd, strerror(errno)); fd, strerror(errno));
} }
else { else {
installed = TRUE; installed = TRUE;
@ -215,8 +215,8 @@ xf86InstallSIGIOHandler(int fd, void (*f) (int, void *), void *closure)
/* System V Streams - used on Solaris for input devices */ /* System V Streams - used on Solaris for input devices */
if (!installed && isastream(fd)) { if (!installed && isastream(fd)) {
if (ioctl(fd, I_SETSIG, S_INPUT | S_ERROR | S_HANGUP) == -1) { if (ioctl(fd, I_SETSIG, S_INPUT | S_ERROR | S_HANGUP) == -1) {
xf86Msg(X_WARNING, "fcntl(%d, I_SETSIG): %s\n", LogMessageVerb(X_WARNING, 1, "fcntl(%d, I_SETSIG): %s\n",
fd, strerror(errno)); fd, strerror(errno));
} }
else { else {
installed = TRUE; installed = TRUE;
@ -283,8 +283,8 @@ xf86RemoveSIGIOHandler(int fd)
#if defined(I_SETSIG) && defined(HAVE_ISASTREAM) #if defined(I_SETSIG) && defined(HAVE_ISASTREAM)
if (isastream(fd)) { if (isastream(fd)) {
if (ioctl(fd, I_SETSIG, 0) == -1) { if (ioctl(fd, I_SETSIG, 0) == -1) {
xf86Msg(X_WARNING, "fcntl(%d, I_SETSIG, 0): %s\n", LogMessageVerb(X_WARNING, 1, "fcntl(%d, I_SETSIG, 0): %s\n",
fd, strerror(errno)); fd, strerror(errno));
} }
} }
#endif #endif

14
hw/xfree86/os-support/solaris/sun_apm.c
View File

@ -116,14 +116,14 @@ sunPMGetEventFromOS(int fd, pmEvent * events, int num)
if (ioctl(fd, SRN_IOC_NEXTEVENT, &sunEvent) < 0) { if (ioctl(fd, SRN_IOC_NEXTEVENT, &sunEvent) < 0) {
if (errno != EAGAIN) { if (errno != EAGAIN) {
xf86Msg(X_WARNING, "sunPMGetEventFromOS: SRN_IOC_NEXTEVENT" LogMessageVerb(X_WARNING, 1, "sunPMGetEventFromOS: SRN_IOC_NEXTEVENT"
" %s\n", strerror(errno)); " %s\n", strerror(errno));
} }
break; break;
} }
events[i] = sunToXF86(sunEvent.type); events[i] = sunToXF86(sunEvent.type);
} }
xf86Msg(X_WARNING, "Got some events\n"); LogMessageVerb(X_WARNING, 1, "Got some events\n");
return i; return i;
} }
@ -141,11 +141,11 @@ sunPMConfirmEventToOs(int fd, pmEvent event)
case XF86_APM_SYS_SUSPEND: case XF86_APM_SYS_SUSPEND:
case XF86_APM_CRITICAL_SUSPEND: case XF86_APM_CRITICAL_SUSPEND:
case XF86_APM_USER_SUSPEND: case XF86_APM_USER_SUSPEND:
xf86Msg(X_WARNING, "Got SUSPENDED\n"); LogMessageVerb(X_WARNING, 1, "Got SUSPENDED\n");
if (ioctl(fd, SRN_IOC_SUSPEND, NULL) == 0) if (ioctl(fd, SRN_IOC_SUSPEND, NULL) == 0)
return PM_CONTINUE; return PM_CONTINUE;
else { else {
xf86Msg(X_WARNING, "sunPMConfirmEventToOs: SRN_IOC_SUSPEND" LogMessageVerb(X_WARNING, 1, "sunPMConfirmEventToOs: SRN_IOC_SUSPEND"
" %s\n", strerror(errno)); " %s\n", strerror(errno));
return PM_FAILED; return PM_FAILED;
} }
@ -154,11 +154,11 @@ sunPMConfirmEventToOs(int fd, pmEvent event)
case XF86_APM_CRITICAL_RESUME: case XF86_APM_CRITICAL_RESUME:
case XF86_APM_STANDBY_FAILED: case XF86_APM_STANDBY_FAILED:
case XF86_APM_SUSPEND_FAILED: case XF86_APM_SUSPEND_FAILED:
xf86Msg(X_WARNING, "Got RESUME\n"); LogMessageVerb(X_WARNING, 1, "Got RESUME\n");
if (ioctl(fd, SRN_IOC_RESUME, NULL) == 0) if (ioctl(fd, SRN_IOC_RESUME, NULL) == 0)
return PM_CONTINUE; return PM_CONTINUE;
else { else {
xf86Msg(X_WARNING, "sunPMConfirmEventToOs: SRN_IOC_RESUME" LogMessageVerb(X_WARNING, 1, "sunPMConfirmEventToOs: SRN_IOC_RESUME"
" %s\n", strerror(errno)); " %s\n", strerror(errno));
return PM_FAILED; return PM_FAILED;
} }

16
hw/xfree86/os-support/solaris/sun_bell.c
View File

@ -71,8 +71,8 @@ xf86OSRingBell(int loudness, int pitch, int duration)
audioFD = open(AUDIO_DEVICE, O_WRONLY | O_NONBLOCK); audioFD = open(AUDIO_DEVICE, O_WRONLY | O_NONBLOCK);
if (audioFD == -1) { if (audioFD == -1) {
xf86Msg(X_ERROR, "Bell: cannot open audio device \"%s\": %s\n", LogMessageVerb(X_ERROR, 1, "Bell: cannot open audio device \"%s\": %s\n",
AUDIO_DEVICE, strerror(errno)); AUDIO_DEVICE, strerror(errno));
return; return;
} }
@ -119,9 +119,9 @@ xf86OSRingBell(int loudness, int pitch, int duration)
audioInfo.play.gain = min(AUDIO_MAX_GAIN, AUDIO_MAX_GAIN * loudness / 100); audioInfo.play.gain = min(AUDIO_MAX_GAIN, AUDIO_MAX_GAIN * loudness / 100);
if (ioctl(audioFD, AUDIO_SETINFO, &audioInfo) < 0) { if (ioctl(audioFD, AUDIO_SETINFO, &audioInfo) < 0) {
xf86Msg(X_ERROR, LogMessageVerb(X_ERROR, 1,
"Bell: AUDIO_SETINFO failed on audio device \"%s\": %s\n", "Bell: AUDIO_SETINFO failed on audio device \"%s\": %s\n",
AUDIO_DEVICE, strerror(errno)); AUDIO_DEVICE, strerror(errno));
close(audioFD); close(audioFD);
return; return;
} }
@ -150,9 +150,9 @@ xf86OSRingBell(int loudness, int pitch, int duration)
if (written == -1) { if (written == -1) {
if (errno != EAGAIN) { if (errno != EAGAIN) {
xf86Msg(X_ERROR, LogMessageVerb(X_ERROR, 1,
"Bell: writev failed on audio device \"%s\": %s\n", "Bell: writev failed on audio device \"%s\": %s\n",
AUDIO_DEVICE, strerror(errno)); AUDIO_DEVICE, strerror(errno));
close(audioFD); close(audioFD);
return; return;
} }

46
hw/xfree86/os-support/solaris/sun_init.c
View File

@ -77,13 +77,13 @@ switch_to(int vt, const char *from)
SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_ACTIVATE, vt)); SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_ACTIVATE, vt));
if (ret != 0) if (ret != 0)
xf86Msg(X_WARNING, "%s: VT_ACTIVATE failed: %s\n", LogMessageVerb(X_WARNING, 1, "%s: VT_ACTIVATE failed: %s\n",
from, strerror(errno)); from, strerror(errno));
SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_WAITACTIVE, vt)); SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_WAITACTIVE, vt));
if (ret != 0) if (ret != 0)
xf86Msg(X_WARNING, "%s: VT_WAITACTIVE failed: %s\n", LogMessageVerb(X_WARNING, 1, "%s: VT_WAITACTIVE failed: %s\n",
from, strerror(errno)); from, strerror(errno));
} }
#endif #endif
@ -146,7 +146,7 @@ xf86OpenConsole(void)
if (vtEnabled == 0) { if (vtEnabled == 0) {
/* VT not enabled - kernel too old or Sparc platforms /* VT not enabled - kernel too old or Sparc platforms
without visual_io support */ without visual_io support */
xf86Msg(from, "VT infrastructure is not available\n"); LogMessageVerb(from, 1, "VT infrastructure is not available\n");
xf86StartVT = 0; xf86StartVT = 0;
xf86Info.vtno = 0; xf86Info.vtno = 0;
@ -174,7 +174,7 @@ xf86OpenConsole(void)
} }
} }
xf86Msg(from, "using VT number %d\n\n", xf86Info.vtno); LogMessageVerb(from, 1, "using VT number %d\n\n", xf86Info.vtno);
snprintf(consoleDev, PATH_MAX, "/dev/vt/%d", xf86Info.vtno); snprintf(consoleDev, PATH_MAX, "/dev/vt/%d", xf86Info.vtno);
if (fd != -1) { if (fd != -1) {
@ -207,8 +207,8 @@ xf86OpenConsole(void)
#ifdef VT_SET_CONSUSER /* added in snv_139 */ #ifdef VT_SET_CONSUSER /* added in snv_139 */
if (strcmp(display, "0") == 0) if (strcmp(display, "0") == 0)
if (ioctl(xf86Info.consoleFd, VT_SET_CONSUSER) != 0) if (ioctl(xf86Info.consoleFd, VT_SET_CONSUSER) != 0)
xf86Msg(X_WARNING, LogMessageVerb(X_WARNING, 1,
"xf86OpenConsole: VT_SET_CONSUSER failed\n"); "xf86OpenConsole: VT_SET_CONSUSER failed\n");
#endif #endif
if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) < 0) if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) < 0)
@ -225,16 +225,16 @@ xf86OpenConsole(void)
FatalError("xf86OpenConsole: VT_SETMODE VT_PROCESS failed\n"); FatalError("xf86OpenConsole: VT_SETMODE VT_PROCESS failed\n");
if (ioctl(xf86Info.consoleFd, VT_SETDISPINFO, atoi(display)) < 0) if (ioctl(xf86Info.consoleFd, VT_SETDISPINFO, atoi(display)) < 0)
xf86Msg(X_WARNING, "xf86OpenConsole: VT_SETDISPINFO failed\n"); LogMessageVerb(X_WARNING, 1, "xf86OpenConsole: VT_SETDISPINFO failed\n");
} }
#endif #endif
#ifdef KDSETMODE #ifdef KDSETMODE
SYSCALL(i = ioctl(xf86Info.consoleFd, KDSETMODE, KD_GRAPHICS)); SYSCALL(i = ioctl(xf86Info.consoleFd, KDSETMODE, KD_GRAPHICS));
if (i < 0) { if (i < 0) {
xf86Msg(X_WARNING, LogMessageVerb(X_WARNING, 1,
"xf86OpenConsole: KDSETMODE KD_GRAPHICS failed on %s (%s)\n", "xf86OpenConsole: KDSETMODE KD_GRAPHICS failed on %s (%s)\n",
consoleDev, strerror(errno)); consoleDev, strerror(errno));
} }
#endif #endif
} }
@ -251,8 +251,8 @@ xf86OpenConsole(void)
#ifdef VT_SET_CONSUSER /* added in snv_139 */ #ifdef VT_SET_CONSUSER /* added in snv_139 */
if (strcmp(display, "0") == 0) if (strcmp(display, "0") == 0)
if (ioctl(xf86Info.consoleFd, VT_SET_CONSUSER) != 0) if (ioctl(xf86Info.consoleFd, VT_SET_CONSUSER) != 0)
xf86Msg(X_WARNING, LogMessageVerb(X_WARNING, 1,
"xf86OpenConsole: VT_SET_CONSUSER failed\n"); "xf86OpenConsole: VT_SET_CONSUSER failed\n");
#endif #endif
/* /*
@ -288,18 +288,18 @@ xf86CloseConsole(void)
* the system, rather than only the console. * the system, rather than only the console.
*/ */
if ((fd = open(xf86SolarisFbDev, O_RDWR, 0)) < 0) { if ((fd = open(xf86SolarisFbDev, O_RDWR, 0)) < 0) {
xf86Msg(X_WARNING, LogMessageVerb(X_WARNING, 1,
"xf86CloseConsole(): unable to open framebuffer (%s)\n", "xf86CloseConsole(): unable to open framebuffer (%s)\n",
strerror(errno)); strerror(errno));
} }
else { else {
struct fbgattr fbattr; struct fbgattr fbattr;
if ((ioctl(fd, FBIOGATTR, &fbattr) < 0) && if ((ioctl(fd, FBIOGATTR, &fbattr) < 0) &&
(ioctl(fd, FBIOGTYPE, &fbattr.fbtype) < 0)) { (ioctl(fd, FBIOGTYPE, &fbattr.fbtype) < 0)) {
xf86Msg(X_WARNING, LogMessageVerb(X_WARNING, 1,
"xf86CloseConsole(): unable to retrieve framebuffer" "xf86CloseConsole(): unable to retrieve framebuffer"
" attributes (%s)\n", strerror(errno)); " attributes (%s)\n", strerror(errno));
} }
else { else {
void *fbdata; void *fbdata;
@ -307,9 +307,9 @@ xf86CloseConsole(void)
fbdata = mmap(NULL, fbattr.fbtype.fb_size, fbdata = mmap(NULL, fbattr.fbtype.fb_size,
PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
if (fbdata == MAP_FAILED) { if (fbdata == MAP_FAILED) {
xf86Msg(X_WARNING, LogMessageVerb(X_WARNING, 1,
"xf86CloseConsole(): unable to mmap framebuffer" "xf86CloseConsole(): unable to mmap framebuffer"
" (%s)\n", strerror(errno)); " (%s)\n", strerror(errno));
} }
else { else {
memset(fbdata, 0, fbattr.fbtype.fb_size); memset(fbdata, 0, fbattr.fbtype.fb_size);

2
hw/xfree86/os-support/solaris/sun_vid.c
View File

@ -92,7 +92,7 @@ xf86EnableIO(void)
{ {
#if defined(__i386__) || defined(__i386) || defined(__x86) #if defined(__i386__) || defined(__i386) || defined(__x86)
if (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) < 0) { if (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) < 0) {
xf86Msg(X_WARNING, "xf86EnableIO: Failed to set IOPL for I/O\n"); LogMessageVerb(X_WARNING, 1, "xf86EnableIO: Failed to set IOPL for I/O\n");
return FALSE; return FALSE;
} }
#endif /* i386 */ #endif /* i386 */