Rename xorgWayland global to xorgHosted

5 files changed, 6 insertions, 11 deletions

diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 8704bfbff..b87516f5a 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -831,7 +831,7 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
     xf86Msg(from, "%sutomatically enabling devices\n",
             xf86Info.autoEnableDevices ? "A" : "Not a");
 
-    if (xorgWayland) {
+    if (xorgHosted) {
             xf86Info.autoAddDevices = FALSE;
             xf86Info.autoEnableDevices = FALSE;
     }
diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
index f0489840f..5ab27bb93 100644
--- a/hw/xfree86/common/xf86Globals.c
+++ b/hw/xfree86/common/xf86Globals.c
@@ -192,5 +192,5 @@ Bool xf86VidModeAllowNonLocal = FALSE;
 #endif
 RootWinPropPtr *xf86RegisteredPropertiesTable = NULL;
 Bool xorgHWAccess = FALSE;
-Bool xorgWayland = FALSE;
+Bool xorgHosted = FALSE;
 Bool xorgRootless = FALSE;
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 9a7ed09cd..a67d3737f 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -1419,9 +1419,9 @@ ddxProcessArgument(int argc, char **argv, int i)
     return 1;
   }
 
-  if (!strcmp(argv[i], "-wayland"))
+  if (!strcmp(argv[i], "-hosted"))
   {
-    xorgWayland = TRUE;
+    xorgHosted = TRUE;
     return 1;
   }
 
diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
index b5f2569cc..ff043787f 100644
--- a/hw/xfree86/common/xf86Priv.h
+++ b/hw/xfree86/common/xf86Priv.h
@@ -90,7 +90,7 @@ extern _X_EXPORT  const char *xf86VisualNames[];
 extern _X_EXPORT  int xf86Verbose;                 /* verbosity level */
 extern _X_EXPORT  int xf86LogVerbose;		/* log file verbosity level */
 extern _X_EXPORT  Bool xorgHWAccess;
-extern _X_EXPORT  Bool xorgWayland;
+extern _X_EXPORT  Bool xorgHosted;
 extern _X_EXPORT  Bool xorgRootless;
 
 extern _X_EXPORT  RootWinPropPtr *xf86RegisteredPropertiesTable;
diff --git a/hw/xfree86/hosted/hosted.c b/hw/xfree86/hosted/hosted.c
index 21e07c1d7..fd1fcb303 100644
--- a/hw/xfree86/hosted/hosted.c
+++ b/hw/xfree86/hosted/hosted.c
@@ -655,9 +655,6 @@ hosted_screen_pre_init(ScrnInfoPtr scrninfo,
 {
     struct hosted_screen *hosted_screen;
 
-    /* FIXME: check hosted enabled flags and fullscreen/rootless flags
-     * here */
-
     hosted_screen = malloc(sizeof *hosted_screen);
     if (hosted_screen == NULL) {
 	ErrorF("malloc failed\n");
@@ -671,10 +668,8 @@ hosted_screen_pre_init(ScrnInfoPtr scrninfo,
     hosted_screen->driver = driver;
     hosted_screen->flags = flags;
 
-    if (xorgRootless) {
-	ErrorF("rootless flag!\n");
+    if (xorgRootless)
 	hosted_screen->flags |= HOSTED_FLAGS_ROOTLESS;
-    }
 
     xf86CrtcConfigInit(scrninfo, &config_funcs);