xserver: Branch 'master'

[Adam Jackson]

 mi/miinitext.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit ac13d740bf14ba8799d4dfbee1f6f99a297dbc7e
Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Wed Feb 21 17:12:15 2018 +0000

    mi: Mention extension loading in verbose logs
    
    Listing the extensions is useful, despite being annoying for normal
    usecases. Print it only when extra (lvl 3) vebose is requested.
    
    v2: Move the logging to InitExtensions(), as requested by Adam.
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Emil Velikov <emil.velikov at collabora.com>

diff --git a/mi/miinitext.c b/mi/miinitext.c
index e55073bf3..5596e212f 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -104,6 +104,7 @@ SOFTWARE.
 #include "nonsdk_extinit.h"
 #endif
 #include "micmap.h"
+#include "os.h"
 #include "globals.h"
 
 /* List of built-in (statically linked) extensions */
@@ -260,6 +261,9 @@ InitExtensions(int argc, char *argv[])
         ext = &ExtensionModuleList[i];
         if (ext->initFunc != NULL &&
             (ext->disablePtr == NULL || !*ext->disablePtr)) {
+            LogMessageVerb(X_INFO, 3, "Initializing extension %s\n",
+                           ext->name);
+
             (ext->initFunc) ();
         }
     }