diff --git a/hw/xfree86/os-support/bsd/alpha_video.c b/hw/xfree86/os-support/bsd/alpha_video.c
index 4d61eeac2..8c69aa23e 100644
--- a/hw/xfree86/os-support/bsd/alpha_video.c
+++ b/hw/xfree86/os-support/bsd/alpha_video.c
@@ -67,7 +67,7 @@ dense_base(void)
         init_abw();
 
     /* 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;
 }
 
@@ -112,14 +112,14 @@ checkDevMem(Bool warn)
         if (base != MAP_FAILED) {
             munmap((caddr_t) base, 4096);
             devMemFd = fd;
-            xf86Msg(X_INFO, "checkDevMem: using aperture driver %s\n",
-                    DEV_APERTURE);
+            LogMessageVerb(X_INFO, 1, "checkDevMem: using aperture driver %s\n",
+                           DEV_APERTURE);
             return;
         }
         else {
             if (warn) {
-                xf86Msg(X_WARNING, "checkDevMem: failed to mmap %s (%s)\n",
-                        DEV_APERTURE, strerror(errno));
+                LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to mmap %s (%s)\n",
+                               DEV_APERTURE, strerror(errno));
             }
         }
     }
@@ -136,23 +136,23 @@ checkDevMem(Bool warn)
         }
         else {
             if (warn) {
-                xf86Msg(X_WARNING, "checkDevMem: failed to mmap %s (%s)\n",
-                        DEV_MEM, strerror(errno));
+                LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to mmap %s (%s)\n",
+                               DEV_MEM, strerror(errno));
             }
         }
     }
     if (warn) {
 #ifndef HAS_APERTURE_DRV
-        xf86Msg(X_WARNING, "checkDevMem: failed to open/mmap %s (%s)\n",
-                DEV_MEM, strerror(errno));
+        LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to open/mmap %s (%s)\n",
+                       DEV_MEM, strerror(errno));
 #else
 #ifndef __OpenBSD__
-        xf86Msg(X_WARNING, "checkDevMem: failed to open %s and %s\n"
-                "\t(%s)\n", DEV_APERTURE, DEV_MEM, strerror(errno));
+        LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to open %s and %s\n"
+                       "\t(%s)\n", DEV_APERTURE, DEV_MEM, strerror(errno));
 #else                           /* __OpenBSD__ */
-        xf86Msg(X_WARNING, "checkDevMem: failed to open %s and %s\n"
-                "\t(%s)\n%s", DEV_APERTURE, DEV_MEM, strerror(errno),
-                SYSCTL_MSG);
+        LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to open %s and %s\n"
+                       "\t(%s)\n%s", DEV_APERTURE, DEV_MEM, strerror(errno),
+                       SYSCTL_MSG);
 #endif                          /* __OpenBSD__ */
 #endif
         xf86ErrorF("\tlinear framebuffer access unavailable\n");
diff --git a/hw/xfree86/os-support/bsd/arm_video.c b/hw/xfree86/os-support/bsd/arm_video.c
index ac34c9ad6..5afdecaf8 100644
--- a/hw/xfree86/os-support/bsd/arm_video.c
+++ b/hw/xfree86/os-support/bsd/arm_video.c
@@ -109,15 +109,15 @@ checkDevMem(Bool warn)
         else {
             /* This should not happen */
             if (warn) {
-                xf86Msg(X_WARNING, "checkDevMem: failed to mmap %s (%s)\n",
-                        DEV_MEM, strerror(errno));
+                LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to mmap %s (%s)\n",
+                               DEV_MEM, strerror(errno));
             }
             return;
         }
     }
     if (warn) {
-        xf86Msg(X_WARNING, "checkDevMem: failed to open %s (%s)\n",
-                DEV_MEM, strerror(errno));
+        LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to open %s (%s)\n",
+                       DEV_MEM, strerror(errno));
     }
     return;
 }
@@ -140,8 +140,8 @@ xf86EnableIO()
         return TRUE;
 
     if ((IoFd = open("/dev/io", O_RDWR)) == -1) {
-        xf86Msg(X_WARNING, "xf86EnableIO: "
-                "Failed to open /dev/io for extended I/O\n");
+        LogMessageVerb(X_WARNING, 1,
+                       "xf86EnableIO: Failed to open /dev/io for extended I/O\n");
         return FALSE;
     }
     return TRUE;
@@ -182,14 +182,16 @@ xf86EnableIO()
             IOPortBase = base;
         }
         else {
-            xf86Msg(X_WARNING, "EnableIO: failed to mmap %s (%s)\n",
-                    "/dev/ttyC0", strerror(errno));
+            LogMessageVerb(X_WARNING, 1,
+                           "EnableIO: failed to mmap /dev/ttyC0 (%s)\n",
+                           strerror(errno));
             return FALSE;
         }
     }
     else {
-        xf86Msg("EnableIO: failed to open %s (%s)\n",
-                "/dev/ttyC0", strerror(errno));
+        LogMessageVerb(X_WARNING, 1,
+                       "EnableIO: failed to open /dev/ttyC0 (%s)\n",
+                       strerror(errno));
         return FALSE;
     }
 
diff --git a/hw/xfree86/os-support/bsd/bsd_init.c b/hw/xfree86/os-support/bsd/bsd_init.c
index 5c1323e1a..b524d7fa6 100644
--- a/hw/xfree86/os-support/bsd/bsd_init.c
+++ b/hw/xfree86/os-support/bsd/bsd_init.c
@@ -230,9 +230,9 @@ xf86OpenConsole(void)
              * /dev/console
              */
             if ((devConsoleFd = open("/dev/console", O_WRONLY, 0)) < 0) {
-                xf86Msg(X_WARNING,
-                        "xf86OpenConsole: couldn't open /dev/console (%s)\n",
-                        strerror(errno));
+                LogMessageVerb(X_WARNING, 1,
+                               "xf86OpenConsole: couldn't open /dev/console (%s)\n",
+                               strerror(errno));
             }
             break;
 #endif
@@ -259,7 +259,7 @@ xf86OpenConsole(void)
             if (initialVT != 1) {
 
                 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);
             }
@@ -274,14 +274,14 @@ xf86OpenConsole(void)
                 SYSCALL(result =
                         ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno));
                 if (result != 0) {
-                    xf86Msg(X_WARNING, "xf86OpenConsole: VT_ACTIVATE failed\n");
+                    LogMessageVerb(X_WARNING, 1, "xf86OpenConsole: VT_ACTIVATE failed\n");
                 }
                 SYSCALL(result =
                         ioctl(xf86Info.consoleFd, VT_WAITACTIVE,
                               xf86Info.vtno));
                 if (result != 0) {
-                    xf86Msg(X_WARNING,
-                            "xf86OpenConsole: VT_WAITACTIVE failed\n");
+                    LogMessageVerb(X_WARNING, 1,
+                                   "xf86OpenConsole: VT_WAITACTIVE failed\n");
                 }
 
                 OsSignal(SIGUSR1, xf86VTRequest);
@@ -321,7 +321,7 @@ xf86OpenConsole(void)
         if (!xf86Info.ShareVTs && xf86Info.autoVTSwitch &&
             (xf86Info.consType == SYSCONS || xf86Info.consType == PCVT)) {
             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 */
@@ -347,7 +347,7 @@ xf86OpenPccons(void)
                        CHECK_DRIVER_MSG);
         }
         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;
 }
@@ -439,7 +439,7 @@ xf86OpenSyscons(void)
                 FatalError("xf86OpenSyscons: VT_GETMODE failed");
             }
             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) {
                 xf86ErrorF(" (version %ld.%ld)\n", syscons_version >> 8,
                            syscons_version & 0xFF);
@@ -447,7 +447,7 @@ xf86OpenSyscons(void)
             else {
                 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 {
             /* VT_GETMODE failed, probably not syscons */
@@ -542,21 +542,21 @@ xf86OpenPcvt(void)
             xf86Info.consType = PCVT;
 #ifdef WSCONS_SUPPORT
 #ifdef __NetBSD__
-            xf86Msg(X_PROBED,
-                    "Using wscons driver on %s in pcvt compatibility mode "
-                    "(version %d.%d)\n", vtname,
-                    pcvt_version.rmajor, pcvt_version.rminor);
+            LogMessageVerb(X_PROBED, 1,
+                           "Using wscons driver on %s in pcvt compatibility mode "
+                           "(version %d.%d)\n", vtname,
+                           pcvt_version.rmajor, pcvt_version.rminor);
 #else
-            xf86Msg(X_PROBED,
-                    "Using wscons driver on %s in pcvt compatibility mode ",
-                    vtname);
+            LogMessageVerb(X_PROBED, 1,
+                           "Using wscons driver on %s in pcvt compatibility mode ",
+                           vtname);
 #endif
 #else
 # ifdef __NetBSD__
-            xf86Msg(X_PROBED, "Using pcvt driver (version %d.%d)\n",
-                    pcvt_version.rmajor, pcvt_version.rminor);
+            LogMessageVerb(X_PROBED, 1, "Using pcvt driver (version %d.%d)\n",
+                           pcvt_version.rmajor, pcvt_version.rminor);
 # else
-            xf86Msg(X_PROBED, "Using pcvt driver\n");
+            LogMessageVerb(X_PROBED, 1, "Using pcvt driver\n");
 # endif
 #endif
 #ifdef __NetBSD__
@@ -599,7 +599,7 @@ xf86OpenWScons(void)
                        "xf86OpenConsole", strerror(errno), CHECK_DRIVER_MSG);
         }
         xf86Info.consType = WSCONS;
-        xf86Msg(X_PROBED, "Using wscons driver\n");
+        LogMessageVerb(X_PROBED, 1, "Using wscons driver\n");
     }
     return fd;
 }
diff --git a/hw/xfree86/os-support/bsd/i386_video.c b/hw/xfree86/os-support/bsd/i386_video.c
index 6374b5f80..ef5c66cb3 100644
--- a/hw/xfree86/os-support/bsd/i386_video.c
+++ b/hw/xfree86/os-support/bsd/i386_video.c
@@ -96,8 +96,8 @@ checkDevMem(Bool warn)
         else {
             /* This should not happen */
             if (warn) {
-                xf86Msg(X_WARNING, "checkDevMem: failed to mmap %s (%s)\n",
-                        DEV_MEM, strerror(errno));
+                LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to mmap %s (%s)\n",
+                               DEV_MEM, strerror(errno));
             }
             useDevMem = FALSE;
             return;
@@ -105,8 +105,8 @@ checkDevMem(Bool warn)
     }
 #ifndef HAS_APERTURE_DRV
     if (warn) {
-        xf86Msg(X_WARNING, "checkDevMem: failed to open %s (%s)\n",
-                DEV_MEM, strerror(errno));
+        LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to open %s (%s)\n",
+                       DEV_MEM, strerror(errno));
     }
     useDevMem = FALSE;
     return;
@@ -121,27 +121,27 @@ checkDevMem(Bool warn)
             munmap((caddr_t) base, 4096);
             devMemFd = fd;
             useDevMem = TRUE;
-            xf86Msg(X_INFO, "checkDevMem: using aperture driver %s\n",
-                    DEV_APERTURE);
+            LogMessageVerb(X_INFO, 1, "checkDevMem: using aperture driver %s\n",
+                           DEV_APERTURE);
             return;
         }
         else {
 
             if (warn) {
-                xf86Msg(X_WARNING, "checkDevMem: failed to mmap %s (%s)\n",
-                        DEV_APERTURE, strerror(errno));
+                LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to mmap %s (%s)\n",
+                               DEV_APERTURE, strerror(errno));
             }
         }
     }
     else {
         if (warn) {
 #ifndef __OpenBSD__
-            xf86Msg(X_WARNING, "checkDevMem: failed to open %s and %s\n"
-                    "\t(%s)\n", DEV_MEM, DEV_APERTURE, strerror(errno));
+            LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to open %s and %s\n"
+                           "\t(%s)\n", DEV_MEM, DEV_APERTURE, strerror(errno));
 #else                           /* __OpenBSD__ */
-            xf86Msg(X_WARNING, "checkDevMem: failed to open %s and %s\n"
-                    "\t(%s)\n%s", DEV_MEM, DEV_APERTURE, strerror(errno),
-                    SYSCTL_MSG);
+            LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to open %s and %s\n"
+                          "\t(%s)\n%s", DEV_MEM, DEV_APERTURE, strerror(errno),
+                          SYSCTL_MSG);
 #endif                          /* __OpenBSD__ */
         }
     }
@@ -177,11 +177,9 @@ xf86EnableIO(void)
 
     if (i386_iopl(TRUE) < 0) {
 #ifndef __OpenBSD__
-        xf86Msg(X_WARNING, "%s: Failed to set IOPL for extended I/O",
-                "xf86EnableIO");
+        LogMessageVerb(X_WARNING, 1, "xf86EnableIO: Failed to set IOPL for extended I/O");
 #else
-        xf86Msg(X_WARNING, "%s: Failed to set IOPL for extended I/O\n%s",
-                "xf86EnableIO", SYSCTL_MSG);
+        LogMessageVerb(X_WARNING, 1, "xf86EnableIO: Failed to set IOPL for extended I/O\n%s", SYSCTL_MSG);
 #endif
         return FALSE;
     }
@@ -222,11 +220,9 @@ xf86EnableIO(void)
 
     if (amd64_iopl(TRUE) < 0) {
 #ifndef __OpenBSD__
-        xf86Msg(X_WARNING, "%s: Failed to set IOPL for extended I/O",
-                "xf86EnableIO");
+        LogMessageVerb(X_WARNING, 1, "xf86EnableIO: Failed to set IOPL for extended I/O");
 #else
-        xf86Msg(X_WARNING, "%s: Failed to set IOPL for extended I/O\n%s",
-                "xf86EnableIO", SYSCTL_MSG);
+        LogMessageVerb(X_WARNING, 1, "xf86EnableIO: Failed to set IOPL for extended I/O\n%s", SYSCTL_MSG);
 #endif
         return FALSE;
     }
@@ -262,8 +258,7 @@ xf86EnableIO(void)
         return TRUE;
 
     if ((IoFd = open("/dev/io", O_RDWR)) == -1) {
-        xf86Msg(X_WARNING, "xf86EnableIO: "
-                "Failed to open /dev/io for extended I/O");
+        LogMessageVerb(X_WARNING, 1, "xf86EnableIO: Failed to open /dev/io for extended I/O");
         return FALSE;
     }
     return TRUE;
@@ -294,9 +289,9 @@ xf86SetTVOut(int mode)
     case PCCONS:{
 
         if (ioctl(xf86Info.consoleFd, CONSOLE_X_TV_ON, &mode) < 0) {
-            xf86Msg(X_WARNING,
-                    "xf86SetTVOut: Could not set console to TV output, %s\n",
-                    strerror(errno));
+            LogMessageVerb(X_WARNING, 1,
+                           "xf86SetTVOut: Could not set console to TV output, %s\n",
+                           strerror(errno));
         }
     }
         break;
@@ -317,9 +312,9 @@ xf86SetRGBOut(void)
     case PCCONS:{
 
         if (ioctl(xf86Info.consoleFd, CONSOLE_X_TV_OFF, 0) < 0) {
-            xf86Msg(X_WARNING,
-                    "xf86SetTVOut: Could not set console to RGB output, %s\n",
-                    strerror(errno));
+            LogMessageVerb(X_WARNING, 1,
+                           "xf86SetTVOut: Could not set console to RGB output, %s\n",
+                           strerror(errno));
         }
     }
         break;
diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c
index 16c3dc535..e7f451397 100644
--- a/hw/xfree86/os-support/linux/lnx_init.c
+++ b/hw/xfree86/os-support/linux/lnx_init.c
@@ -73,13 +73,13 @@ switch_to(int vt, const char *from)
 
     SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_ACTIVATE, vt));
     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;
     }
 
     SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_WAITACTIVE, vt));
     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;
     }
 
@@ -145,7 +145,7 @@ linux_parse_vt_settings(int may_fail)
         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 */
     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) {
-        xf86Msg(X_PROBED,
-                "controlling tty is VT number %d, auto-enabling KeepTty\n",
-                current_vt);
+        LogMessageVerb(X_PROBED, 1,
+                       "controlling tty is VT number %d, auto-enabling KeepTty\n",
+                       current_vt);
         KeepTty = TRUE;
     }
 
@@ -196,13 +196,13 @@ xf86OpenConsole(void)
              * group leader
              */
             if (setpgid(0, ppgid) < 0)
-                xf86Msg(X_WARNING, "xf86OpenConsole: setpgid failed: %s\n",
-                        strerror(errno));
+                LogMessageVerb(X_WARNING, 1, "xf86OpenConsole: setpgid failed: %s\n",
+                               strerror(errno));
 
             /* become process group leader */
             if ((setsid() < 0))
-                xf86Msg(X_WARNING, "xf86OpenConsole: setsid failed: %s\n",
-                        strerror(errno));
+                LogMessageVerb(X_WARNING, 1, "xf86OpenConsole: setsid failed: %s\n",
+                               strerror(errno));
         }
 
         i = 0;
@@ -223,8 +223,8 @@ xf86OpenConsole(void)
          */
         SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_GETSTATE, &vts));
         if (ret < 0)
-            xf86Msg(X_WARNING, "xf86OpenConsole: VT_GETSTATE failed: %s\n",
-                    strerror(errno));
+            LogMessageVerb(X_WARNING, 1, "xf86OpenConsole: VT_GETSTATE failed: %s\n",
+                           strerror(errno));
         else
             activeVT = vts.v_active;
 
@@ -320,23 +320,23 @@ xf86CloseConsole(void)
     /* Back to text mode ... */
     SYSCALL(ret = ioctl(xf86Info.consoleFd, KDSETMODE, KD_TEXT));
     if (ret < 0)
-        xf86Msg(X_WARNING, "xf86CloseConsole: KDSETMODE failed: %s\n",
-                strerror(errno));
+        LogMessageVerb(X_WARNING, 1, "xf86CloseConsole: KDSETMODE failed: %s\n",
+                       strerror(errno));
 
     SYSCALL(ioctl(xf86Info.consoleFd, KDSKBMODE, tty_mode));
     tcsetattr(xf86Info.consoleFd, TCSANOW, &tty_attr);
 
     SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_GETMODE, &VT));
     if (ret < 0)
-        xf86Msg(X_WARNING, "xf86CloseConsole: VT_GETMODE failed: %s\n",
-                strerror(errno));
+        LogMessageVerb(X_WARNING, 1, "xf86CloseConsole: VT_GETMODE failed: %s\n",
+                       strerror(errno));
     else {
         /* set dflt vt handling */
         VT.mode = VT_AUTO;
         SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_SETMODE, &VT));
         if (ret < 0)
-            xf86Msg(X_WARNING, "xf86CloseConsole: VT_SETMODE failed: %s\n",
-                    strerror(errno));
+            LogMessageVerb(X_WARNING, 1, "xf86CloseConsole: VT_SETMODE failed: %s\n",
+                           strerror(errno));
     }
 
     if (xf86Info.autoVTSwitch) {
@@ -347,8 +347,8 @@ xf86CloseConsole(void)
         if (activeVT >= 0) {
             SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_GETSTATE, &vts));
             if (ret < 0) {
-                xf86Msg(X_WARNING, "xf86OpenConsole: VT_GETSTATE failed: %s\n",
-                        strerror(errno));
+                LogMessageVerb(X_WARNING, 1, "xf86OpenConsole: VT_GETSTATE failed: %s\n",
+                               strerror(errno));
             } else {
                 if (vts.v_active == xf86Info.vtno) {
                     switch_to(activeVT, "xf86CloseConsole");
diff --git a/hw/xfree86/os-support/linux/lnx_kmod.c b/hw/xfree86/os-support/linux/lnx_kmod.c
index 6d1222655..4be481baa 100644
--- a/hw/xfree86/os-support/linux/lnx_kmod.c
+++ b/hw/xfree86/os-support/linux/lnx_kmod.c
@@ -72,12 +72,12 @@ xf86LoadKernelModule(const char *modName)
          * preinstall agpgart module for some DRM modules
          */
         if (setreuid(0, 0)) {
-            xf86Msg(X_WARNING, "LoadKernelModule: "
-                    "Setting of real/effective user Id to 0/0 failed");
+            LogMessageVerb(X_WARNING, 1, "LoadKernelModule: "
+                           "Setting of real/effective user Id to 0/0 failed");
         }
         setenv("PATH", "/sbin", 1);
         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 */
         break;
     case -1:                   /* fork failed */
diff --git a/hw/xfree86/os-support/shared/drm_platform.c b/hw/xfree86/os-support/shared/drm_platform.c
index f6291e44d..a2607d1cc 100644
--- a/hw/xfree86/os-support/shared/drm_platform.c
+++ b/hw/xfree86/os-support/shared/drm_platform.c
@@ -61,7 +61,7 @@ get_drm_info(struct OdevAttributes *attribs, char *path, int delayed_index)
 
     v = drmGetVersion(fd);
     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;
     }
 
diff --git a/hw/xfree86/os-support/shared/posix_tty.c b/hw/xfree86/os-support/shared/posix_tty.c
index b5a9c87fd..028b16b97 100644
--- a/hw/xfree86/os-support/shared/posix_tty.c
+++ b/hw/xfree86/os-support/shared/posix_tty.c
@@ -124,7 +124,7 @@ xf86OpenSerial(XF86OptionPtr options)
 
     dev = xf86SetStrOption(options, "Device", NULL);
     if (!dev) {
-        xf86Msg(X_ERROR, "xf86OpenSerial: No Device specified.\n");
+        LogMessageVerb(X_ERROR, 1, "xf86OpenSerial: No Device specified.\n");
         return -1;
     }
 
@@ -134,9 +134,9 @@ xf86OpenSerial(XF86OptionPtr options)
         SYSCALL(fd = open(dev, O_RDWR | O_NONBLOCK));
 
     if (fd == -1) {
-        xf86Msg(X_ERROR,
-                "xf86OpenSerial: Cannot open device %s\n\t%s.\n",
-                dev, strerror(errno));
+        LogMessageVerb(X_ERROR, 1,
+                       "xf86OpenSerial: Cannot open device %s\n\t%s.\n",
+                       dev, strerror(errno));
         free(dev);
         return -1;
     }
@@ -209,7 +209,7 @@ xf86SetSerial(int fd, XF86OptionPtr options)
             cfsetospeed(&t, baud);
         }
         else {
-            xf86Msg(X_ERROR, "Invalid Option BaudRate value: %d\n", val);
+            LogMessageVerb(X_ERROR, 1, "Invalid Option BaudRate value: %d\n", val);
             return -1;
         }
     }
@@ -223,7 +223,7 @@ xf86SetSerial(int fd, XF86OptionPtr options)
             t.c_cflag |= CSTOPB;
             break;
         default:
-            xf86Msg(X_ERROR, "Invalid Option StopBits value: %d\n", val);
+            LogMessageVerb(X_ERROR, 1, "Invalid Option StopBits value: %d\n", val);
             return -1;
             break;
         }
@@ -248,7 +248,7 @@ xf86SetSerial(int fd, XF86OptionPtr options)
             t.c_cflag |= CS8;
             break;
         default:
-            xf86Msg(X_ERROR, "Invalid Option DataBits value: %d\n", val);
+            LogMessageVerb(X_ERROR, 1, "Invalid Option DataBits value: %d\n", val);
             return -1;
             break;
         }
@@ -266,7 +266,7 @@ xf86SetSerial(int fd, XF86OptionPtr options)
             t.c_cflag &= ~(PARENB);
         }
         else {
-            xf86Msg(X_ERROR, "Invalid Option Parity value: %s\n", s);
+            LogMessageVerb(X_ERROR, 1, "Invalid Option Parity value: %s\n", s);
             free(s);
             return -1;
         }
@@ -295,7 +295,7 @@ xf86SetSerial(int fd, XF86OptionPtr options)
             t.c_iflag &= ~(IXON | IXOFF);
         }
         else {
-            xf86Msg(X_ERROR, "Invalid Option FlowControl value: %s\n", s);
+            LogMessageVerb(X_ERROR, 1, "Invalid Option FlowControl value: %s\n", s);
             free(s);
             return -1;
         }
@@ -311,14 +311,14 @@ xf86SetSerial(int fd, XF86OptionPtr options)
         SYSCALL(ioctl(fd, TIOCCDTR, NULL));
 #endif
 #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;
 #endif
         xf86MarkOptionUsedByName(options, "ClearDTR");
     }
 
     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;
         xf86MarkOptionUsedByName(options, "ClearRTS");
     }
@@ -347,7 +347,7 @@ xf86SetSerialSpeed(int fd, int speed)
         cfsetospeed(&t, baud);
     }
     else {
-        xf86Msg(X_ERROR, "Invalid Option BaudRate value: %d\n", speed);
+        LogMessageVerb(X_ERROR, 1, "Invalid Option BaudRate value: %d\n", speed);
         return -1;
     }
 
diff --git a/hw/xfree86/os-support/shared/sigio.c b/hw/xfree86/os-support/shared/sigio.c
index 760a39b32..d1d0b15b9 100644
--- a/hw/xfree86/os-support/shared/sigio.c
+++ b/hw/xfree86/os-support/shared/sigio.c
@@ -145,7 +145,7 @@ xf86SIGIO(int sig)
         }
     }
     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 */
     errno = save_errno;
@@ -198,13 +198,13 @@ xf86InstallSIGIOHandler(int fd, void (*f) (int, void *), void *closure)
             block_sigio();
 #ifdef O_ASYNC
             if (fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_ASYNC) == -1) {
-                xf86Msg(X_WARNING, "fcntl(%d, O_ASYNC): %s\n",
-                        fd, strerror(errno));
+                LogMessageVerb(X_WARNING, 1, "fcntl(%d, O_ASYNC): %s\n",
+                               fd, strerror(errno));
             }
             else {
                 if (fcntl(fd, F_SETOWN, getpid()) == -1) {
-                    xf86Msg(X_WARNING, "fcntl(%d, F_SETOWN): %s\n",
-                            fd, strerror(errno));
+                    LogMessageVerb(X_WARNING, 1, "fcntl(%d, F_SETOWN): %s\n",
+                                   fd, strerror(errno));
                 }
                 else {
                     installed = TRUE;
@@ -215,8 +215,8 @@ xf86InstallSIGIOHandler(int fd, void (*f) (int, void *), void *closure)
             /* System V Streams - used on Solaris for input devices */
             if (!installed && isastream(fd)) {
                 if (ioctl(fd, I_SETSIG, S_INPUT | S_ERROR | S_HANGUP) == -1) {
-                    xf86Msg(X_WARNING, "fcntl(%d, I_SETSIG): %s\n",
-                            fd, strerror(errno));
+                    LogMessageVerb(X_WARNING, 1, "fcntl(%d, I_SETSIG): %s\n",
+                                   fd, strerror(errno));
                 }
                 else {
                     installed = TRUE;
@@ -283,8 +283,8 @@ xf86RemoveSIGIOHandler(int fd)
 #if defined(I_SETSIG) && defined(HAVE_ISASTREAM)
         if (isastream(fd)) {
             if (ioctl(fd, I_SETSIG, 0) == -1) {
-                xf86Msg(X_WARNING, "fcntl(%d, I_SETSIG, 0): %s\n",
-                        fd, strerror(errno));
+                LogMessageVerb(X_WARNING, 1, "fcntl(%d, I_SETSIG, 0): %s\n",
+                               fd, strerror(errno));
             }
         }
 #endif
diff --git a/hw/xfree86/os-support/solaris/sun_apm.c b/hw/xfree86/os-support/solaris/sun_apm.c
index cddc6b3cb..0bfeca194 100644
--- a/hw/xfree86/os-support/solaris/sun_apm.c
+++ b/hw/xfree86/os-support/solaris/sun_apm.c
@@ -116,14 +116,14 @@ sunPMGetEventFromOS(int fd, pmEvent * events, int num)
 
         if (ioctl(fd, SRN_IOC_NEXTEVENT, &sunEvent) < 0) {
             if (errno != EAGAIN) {
-                xf86Msg(X_WARNING, "sunPMGetEventFromOS: SRN_IOC_NEXTEVENT"
-                        " %s\n", strerror(errno));
+                LogMessageVerb(X_WARNING, 1, "sunPMGetEventFromOS: SRN_IOC_NEXTEVENT"
+                               " %s\n", strerror(errno));
             }
             break;
         }
         events[i] = sunToXF86(sunEvent.type);
     }
-    xf86Msg(X_WARNING, "Got some events\n");
+    LogMessageVerb(X_WARNING, 1, "Got some events\n");
     return i;
 }
 
@@ -141,11 +141,11 @@ sunPMConfirmEventToOs(int fd, pmEvent event)
     case XF86_APM_SYS_SUSPEND:
     case XF86_APM_CRITICAL_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)
             return PM_CONTINUE;
         else {
-            xf86Msg(X_WARNING, "sunPMConfirmEventToOs: SRN_IOC_SUSPEND"
+            LogMessageVerb(X_WARNING, 1, "sunPMConfirmEventToOs: SRN_IOC_SUSPEND"
                     " %s\n", strerror(errno));
             return PM_FAILED;
         }
@@ -154,11 +154,11 @@ sunPMConfirmEventToOs(int fd, pmEvent event)
     case XF86_APM_CRITICAL_RESUME:
     case XF86_APM_STANDBY_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)
             return PM_CONTINUE;
         else {
-            xf86Msg(X_WARNING, "sunPMConfirmEventToOs: SRN_IOC_RESUME"
+            LogMessageVerb(X_WARNING, 1, "sunPMConfirmEventToOs: SRN_IOC_RESUME"
                     " %s\n", strerror(errno));
             return PM_FAILED;
         }
diff --git a/hw/xfree86/os-support/solaris/sun_bell.c b/hw/xfree86/os-support/solaris/sun_bell.c
index e374ed826..9b497c66f 100644
--- a/hw/xfree86/os-support/solaris/sun_bell.c
+++ b/hw/xfree86/os-support/solaris/sun_bell.c
@@ -71,8 +71,8 @@ xf86OSRingBell(int loudness, int pitch, int duration)
 
     audioFD = open(AUDIO_DEVICE, O_WRONLY | O_NONBLOCK);
     if (audioFD == -1) {
-        xf86Msg(X_ERROR, "Bell: cannot open audio device \"%s\": %s\n",
-                AUDIO_DEVICE, strerror(errno));
+        LogMessageVerb(X_ERROR, 1, "Bell: cannot open audio device \"%s\": %s\n",
+                       AUDIO_DEVICE, strerror(errno));
         return;
     }
 
@@ -119,9 +119,9 @@ xf86OSRingBell(int loudness, int pitch, int duration)
     audioInfo.play.gain = min(AUDIO_MAX_GAIN, AUDIO_MAX_GAIN * loudness / 100);
 
     if (ioctl(audioFD, AUDIO_SETINFO, &audioInfo) < 0) {
-        xf86Msg(X_ERROR,
-                "Bell: AUDIO_SETINFO failed on audio device \"%s\": %s\n",
-                AUDIO_DEVICE, strerror(errno));
+        LogMessageVerb(X_ERROR, 1,
+                       "Bell: AUDIO_SETINFO failed on audio device \"%s\": %s\n",
+                       AUDIO_DEVICE, strerror(errno));
         close(audioFD);
         return;
     }
@@ -150,9 +150,9 @@ xf86OSRingBell(int loudness, int pitch, int duration)
 
                 if (written == -1) {
                     if (errno != EAGAIN) {
-                        xf86Msg(X_ERROR,
-                                "Bell: writev failed on audio device \"%s\": %s\n",
-                                AUDIO_DEVICE, strerror(errno));
+                        LogMessageVerb(X_ERROR, 1,
+                                       "Bell: writev failed on audio device \"%s\": %s\n",
+                                       AUDIO_DEVICE, strerror(errno));
                         close(audioFD);
                         return;
                     }
diff --git a/hw/xfree86/os-support/solaris/sun_init.c b/hw/xfree86/os-support/solaris/sun_init.c
index 2197df6f2..ce2631179 100644
--- a/hw/xfree86/os-support/solaris/sun_init.c
+++ b/hw/xfree86/os-support/solaris/sun_init.c
@@ -77,13 +77,13 @@ switch_to(int vt, const char *from)
 
     SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_ACTIVATE, vt));
     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));
 
     SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_WAITACTIVE, vt));
     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));
 }
 #endif
 
@@ -146,7 +146,7 @@ xf86OpenConsole(void)
         if (vtEnabled == 0) {
             /* VT not enabled - kernel too old or Sparc platforms
                without visual_io support */
-            xf86Msg(from, "VT infrastructure is not available\n");
+            LogMessageVerb(from, 1, "VT infrastructure is not available\n");
 
             xf86StartVT = 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);
 
         if (fd != -1) {
@@ -207,8 +207,8 @@ xf86OpenConsole(void)
 #ifdef VT_SET_CONSUSER          /* added in snv_139 */
             if (strcmp(display, "0") == 0)
                 if (ioctl(xf86Info.consoleFd, VT_SET_CONSUSER) != 0)
-                    xf86Msg(X_WARNING,
-                            "xf86OpenConsole: VT_SET_CONSUSER failed\n");
+                    LogMessageVerb(X_WARNING, 1,
+                                   "xf86OpenConsole: VT_SET_CONSUSER failed\n");
 #endif
 
             if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) < 0)
@@ -225,16 +225,16 @@ xf86OpenConsole(void)
                 FatalError("xf86OpenConsole: VT_SETMODE VT_PROCESS failed\n");
 
             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
 
 #ifdef KDSETMODE
         SYSCALL(i = ioctl(xf86Info.consoleFd, KDSETMODE, KD_GRAPHICS));
         if (i < 0) {
-            xf86Msg(X_WARNING,
-                    "xf86OpenConsole: KDSETMODE KD_GRAPHICS failed on %s (%s)\n",
-                    consoleDev, strerror(errno));
+            LogMessageVerb(X_WARNING, 1,
+                           "xf86OpenConsole: KDSETMODE KD_GRAPHICS failed on %s (%s)\n",
+                           consoleDev, strerror(errno));
         }
 #endif
     }
@@ -251,8 +251,8 @@ xf86OpenConsole(void)
 #ifdef VT_SET_CONSUSER          /* added in snv_139 */
             if (strcmp(display, "0") == 0)
                 if (ioctl(xf86Info.consoleFd, VT_SET_CONSUSER) != 0)
-                    xf86Msg(X_WARNING,
-                            "xf86OpenConsole: VT_SET_CONSUSER failed\n");
+                    LogMessageVerb(X_WARNING, 1,
+                                   "xf86OpenConsole: VT_SET_CONSUSER failed\n");
 #endif
 
             /*
@@ -288,18 +288,18 @@ xf86CloseConsole(void)
          * the system, rather than only the console.
          */
         if ((fd = open(xf86SolarisFbDev, O_RDWR, 0)) < 0) {
-            xf86Msg(X_WARNING,
-                    "xf86CloseConsole():  unable to open framebuffer (%s)\n",
-                    strerror(errno));
+            LogMessageVerb(X_WARNING, 1,
+                           "xf86CloseConsole():  unable to open framebuffer (%s)\n",
+                           strerror(errno));
         }
         else {
             struct fbgattr fbattr;
 
             if ((ioctl(fd, FBIOGATTR, &fbattr) < 0) &&
                 (ioctl(fd, FBIOGTYPE, &fbattr.fbtype) < 0)) {
-                xf86Msg(X_WARNING,
-                        "xf86CloseConsole():  unable to retrieve framebuffer"
-                        " attributes (%s)\n", strerror(errno));
+                LogMessageVerb(X_WARNING, 1,
+                               "xf86CloseConsole():  unable to retrieve framebuffer"
+                               " attributes (%s)\n", strerror(errno));
             }
             else {
                 void *fbdata;
@@ -307,9 +307,9 @@ xf86CloseConsole(void)
                 fbdata = mmap(NULL, fbattr.fbtype.fb_size,
                               PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
                 if (fbdata == MAP_FAILED) {
-                    xf86Msg(X_WARNING,
-                            "xf86CloseConsole():  unable to mmap framebuffer"
-                            " (%s)\n", strerror(errno));
+                    LogMessageVerb(X_WARNING, 1,
+                                   "xf86CloseConsole():  unable to mmap framebuffer"
+                                   " (%s)\n", strerror(errno));
                 }
                 else {
                     memset(fbdata, 0, fbattr.fbtype.fb_size);
diff --git a/hw/xfree86/os-support/solaris/sun_vid.c b/hw/xfree86/os-support/solaris/sun_vid.c
index ac66bdf51..c609faddb 100644
--- a/hw/xfree86/os-support/solaris/sun_vid.c
+++ b/hw/xfree86/os-support/solaris/sun_vid.c
@@ -92,7 +92,7 @@ xf86EnableIO(void)
 {
 #if defined(__i386__) || defined(__i386) || defined(__x86)
     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;
     }
 #endif                          /* i386 */