Merge branch 'X11Libre:master' into clang

Author: onlyspxctre

hw/xfree86/drivers/video/modesetting/driver.c

@@ -159,7 +159,7 @@ static const OptionInfoRec Options[] = {
 
 int ms_entity_index = -1;
 
-DevPrivateKeyRec asyncFlipPrivateKeyRec;
+static DevPrivateKeyRec asyncFlipPrivateKeyRec;
 
 static MODULESETUPPROTO(Setup);
 

os/utils.c

@@ -600,6 +600,12 @@ ProcessCommandLine(int argc, char *argv[])
             else
                 UseMsg();
         }
+        else if (strcmp(argv[i],"-noreset") == 0){
+            ErrorF("Argument -noreset is removed in XLibre (for more context: https://github.com/orgs/X11Libre/discussions/424 )\n");
+        }
+        else if(strcmp(argv[i],"-reset") == 0){
+            ErrorF("Argument -reset is removed in XLibre (for more context: https://github.com/orgs/X11Libre/discussions/424 )\n");
+        }
         else if (strcmp(argv[i], "-p") == 0) {
             if (++i < argc)
                 defaultScreenSaverInterval = ((CARD32) atoi(argv[i])) *