xserver: Branch 'master' - 6 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Sep 12 20:49:20 UTC 2018
hw/xfree86/common/xf86.h | 6 +---
hw/xfree86/common/xf86Bus.c | 19 --------------
hw/xfree86/common/xf86Bus.h | 1
hw/xfree86/common/xf86Config.c | 4 ---
hw/xfree86/common/xf86Globals.c | 2 -
hw/xfree86/common/xf86Helper.c | 6 ----
hw/xfree86/common/xf86Init.c | 51 ----------------------------------------
hw/xfree86/common/xf86Privstr.h | 1
hw/xfree86/doc/Registry | 1
hw/xfree86/doc/ddxDesign.xml | 9 -------
hw/xfree86/man/xorg.conf.man | 9 -------
hw/xfree86/parser/Flags.c | 2 -
hw/xfree86/parser/xf86tokens.h | 1
hw/xfree86/xorgconf.cpp | 6 ----
14 files changed, 2 insertions(+), 116 deletions(-)
New commits:
commit a2c1260958fb8b4ec81b9107c5d1ca222cc7d770
Author: Adam Jackson <ajax at redhat.com>
Date: Mon Aug 27 15:02:50 2018 -0400
xfree86: Remove vestigial lastScrnFlag
Only the mga XAA code ever set this (hence the compat macro), since XAA
is long gone this can go too.
Signed-off-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index cb8190c95..8d0cb0532 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -155,8 +155,8 @@ extern _X_EXPORT EntityInfoPtr xf86GetEntityInfo(int entityIndex);
extern _X_EXPORT Bool xf86IsEntityPrimary(int entityIndex);
extern _X_EXPORT ScrnInfoPtr xf86FindScreenForEntity(int entityIndex);
-extern _X_EXPORT int xf86GetLastScrnFlag(int entityIndex);
-extern _X_EXPORT void xf86SetLastScrnFlag(int entityIndex, int scrnIndex);
+#define xf86SetLastScrnFlag(e, s) do { } while (0)
+
extern _X_EXPORT Bool xf86IsEntityShared(int entityIndex);
extern _X_EXPORT void xf86SetEntityShared(int entityIndex);
extern _X_EXPORT Bool xf86IsEntitySharable(int entityIndex);
diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
index 6bbf489ab..367feae46 100644
--- a/hw/xfree86/common/xf86Bus.c
+++ b/hw/xfree86/common/xf86Bus.c
@@ -553,25 +553,6 @@ xf86PostProbe(void)
" for all framebuffer devices\n");
}
-int
-xf86GetLastScrnFlag(int entityIndex)
-{
- if (entityIndex < xf86NumEntities) {
- return xf86Entities[entityIndex]->lastScrnFlag;
- }
- else {
- return -1;
- }
-}
-
-void
-xf86SetLastScrnFlag(int entityIndex, int scrnIndex)
-{
- if (entityIndex < xf86NumEntities) {
- xf86Entities[entityIndex]->lastScrnFlag = scrnIndex;
- }
-}
-
Bool
xf86IsEntityShared(int entityIndex)
{
diff --git a/hw/xfree86/common/xf86Bus.h b/hw/xfree86/common/xf86Bus.h
index 52b497af6..0d44a8a61 100644
--- a/hw/xfree86/common/xf86Bus.h
+++ b/hw/xfree86/common/xf86Bus.h
@@ -51,7 +51,6 @@ typedef struct {
Bool active;
Bool inUse;
BusRec bus;
- int lastScrnFlag;
DevUnion *entityPrivates;
int numInstances;
GDevPtr *devices;
commit c7414f4d07b69a4b2f0d0af06f032393cf5fe6aa
Author: Adam Jackson <ajax at redhat.com>
Date: Wed Aug 22 14:57:05 2018 -0400
xfree86: Remove NoTrapSignals
This was dangerous on UMS and largely pointless on KMS.
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index e31030d63..ee5ab5d11 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -619,7 +619,6 @@ configFiles(XF86ConfFilesPtr fileconf)
}
typedef enum {
- FLAG_NOTRAPSIGNALS,
FLAG_DONTVTSWITCH,
FLAG_DONTZAP,
FLAG_DONTZOOM,
@@ -653,8 +652,6 @@ typedef enum {
* if the parser found the option in the config file.
*/
static OptionInfoRec FlagOptions[] = {
- {FLAG_NOTRAPSIGNALS, "NoTrapSignals", OPTV_BOOLEAN,
- {0}, FALSE},
{FLAG_DONTVTSWITCH, "DontVTSwitch", OPTV_BOOLEAN,
{0}, FALSE},
{FLAG_DONTZAP, "DontZap", OPTV_BOOLEAN,
@@ -737,7 +734,6 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
xf86ProcessOptions(-1, optp, FlagOptions);
- xf86GetOptValBool(FlagOptions, FLAG_NOTRAPSIGNALS, &xf86Info.notrapSignals);
xf86GetOptValBool(FlagOptions, FLAG_DONTVTSWITCH, &xf86Info.dontVTSwitch);
xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap);
xf86GetOptValBool(FlagOptions, FLAG_DONTZOOM, &xf86Info.dontZoom);
diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
index e08aa5bf1..193f17aec 100644
--- a/hw/xfree86/common/xf86Globals.c
+++ b/hw/xfree86/common/xf86Globals.c
@@ -108,7 +108,6 @@ xf86InfoRec xf86Info = {
.ShareVTs = FALSE,
.dontZap = FALSE,
.dontZoom = FALSE,
- .notrapSignals = FALSE,
.currentScreen = NULL,
#ifdef CSRG_BASED
.consType = -1,
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 0a5af8272..8f50580fe 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -233,24 +233,6 @@ xf86PrivsElevated(void)
}
static void
-TrapSignals(void)
-{
- if (xf86Info.notrapSignals) {
- OsSignal(SIGSEGV, SIG_DFL);
- OsSignal(SIGABRT, SIG_DFL);
- OsSignal(SIGILL, SIG_DFL);
-#ifdef SIGEMT
- OsSignal(SIGEMT, SIG_DFL);
-#endif
- OsSignal(SIGFPE, SIG_DFL);
- OsSignal(SIGBUS, SIG_DFL);
- OsSignal(SIGSYS, SIG_DFL);
- OsSignal(SIGXCPU, SIG_DFL);
- OsSignal(SIGXFSZ, SIG_DFL);
- }
-}
-
-static void
AddSeatId(CallbackListPtr *pcbl, void *data, void *screen)
{
ScreenPtr pScreen = screen;
@@ -356,8 +338,6 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
}
}
- TrapSignals();
-
/* Initialise the loader */
LoaderInit();
diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h
index 21c2e1fe4..55d1b2455 100644
--- a/hw/xfree86/common/xf86Privstr.h
+++ b/hw/xfree86/common/xf86Privstr.h
@@ -63,7 +63,6 @@ typedef struct {
Bool ShareVTs;
Bool dontZap;
Bool dontZoom;
- Bool notrapSignals; /* don't exit cleanly - die at fault */
/* graphics part */
ScreenPtr currentScreen;
diff --git a/hw/xfree86/doc/Registry b/hw/xfree86/doc/Registry
index ad5b9bffb..9c6b11473 100644
--- a/hw/xfree86/doc/Registry
+++ b/hw/xfree86/doc/Registry
@@ -216,7 +216,6 @@ DisableVidModeExtension B F disable VidMode extension
DontVTSwitch B F disable Ctrl-Alt-Fn
DontZap B F disable Ctrl-Alt-BS sequence
DontZoom B F disable Ctrl-Alt-+/-
-NoTrapSignals B F don't trap signals
OffTime I F Time before DPMS off mode active (min)
PciProbe1 O F use PCI probe algorithm 1
PciProbe2 O F use PCI probe algorithm 2
diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
index 958926243..2c18252b7 100644
--- a/hw/xfree86/man/xorg.conf.man
+++ b/hw/xfree86/man/xorg.conf.man
@@ -509,15 +509,6 @@ section to use in the absence of the
.B \-layout
command line option.
.TP 7
-.BI "Option \*qNoTrapSignals\*q \*q" boolean \*q
-This prevents the Xorg server from trapping a range of unexpected fatal
-signals and exiting cleanly.
-Instead, the Xorg server will die and drop core where the fault occurred.
-The default behaviour is for the Xorg server to exit cleanly, but still drop a
-core file.
-In general you never want to use this option unless you are debugging an Xorg
-server problem and know how to deal with the consequences.
-.TP 7
.BI "Option \*qDontVTSwitch\*q \*q" boolean \*q
This disallows the use of the
.BI Ctrl+Alt+F n
diff --git a/hw/xfree86/parser/Flags.c b/hw/xfree86/parser/Flags.c
index 0f69734ba..d677cf1db 100644
--- a/hw/xfree86/parser/Flags.c
+++ b/hw/xfree86/parser/Flags.c
@@ -65,7 +65,6 @@
static const xf86ConfigSymTabRec ServerFlagsTab[] = {
{ENDSECTION, "endsection"},
- {NOTRAPSIGNALS, "notrapsignals"},
{DONTZAP, "dontzap"},
{DONTZOOM, "dontzoom"},
{DISABLEVIDMODE, "disablevidmodeextension"},
@@ -111,7 +110,6 @@ xf86parseFlagsSection(void)
case SUSPENDTIME:
case OFFTIME:
hasvalue = TRUE;
- case NOTRAPSIGNALS:
case DONTZAP:
case DONTZOOM:
case DISABLEVIDMODE:
diff --git a/hw/xfree86/parser/xf86tokens.h b/hw/xfree86/parser/xf86tokens.h
index 15792c618..4abff0d79 100644
--- a/hw/xfree86/parser/xf86tokens.h
+++ b/hw/xfree86/parser/xf86tokens.h
@@ -103,7 +103,6 @@ typedef enum {
XKBDIR,
/* Server Flag tokens. These are deprecated in favour of generic Options */
- NOTRAPSIGNALS,
DONTZAP,
DONTZOOM,
DISABLEVIDMODE,
diff --git a/hw/xfree86/xorgconf.cpp b/hw/xfree86/xorgconf.cpp
index a903438b6..8352dcad2 100644
--- a/hw/xfree86/xorgconf.cpp
+++ b/hw/xfree86/xorgconf.cpp
@@ -82,12 +82,6 @@ EndSection
Section "ServerFlags"
-# Uncomment this to cause a core dump at the spot where a signal is
-# received. This may leave the console in an unusable state, but may
-# provide a better stack trace in the core dump to aid in debugging
-
-# Option "NoTrapSignals"
-
# Uncomment this to disable the <Ctrl><Alt><Fn> VT switch sequence
# (where n is 1 through 12). This allows clients to receive these key
# events.
commit d1aeaad5c6fc614c28129f5d2717c12ff7320081
Author: Adam Jackson <ajax at redhat.com>
Date: Wed Aug 22 12:30:32 2018 -0400
xfree86: Remove a fallback path we never hit
If it's really this important we should just do it and not complain. We
never do it so it must not matter.
Signed-off-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 12daa44d6..0a5af8272 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -538,17 +538,6 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
return;
}
- for (i = 0; i < xf86NumScreens; i++) {
- if (xf86Screens[i]->name == NULL) {
- char *tmp;
- XNFasprintf(&tmp, "screen%d", i);
- xf86Screens[i]->name = tmp;
- xf86MsgVerb(X_WARNING, 0,
- "Screen driver %d has no name set, using `%s'.\n",
- i, xf86Screens[i]->name);
- }
- }
-
/* Remove (unload) drivers that are not required */
for (i = 0; i < xf86NumDrivers; i++)
if (xf86DriverList[i] && xf86DriverList[i]->refCount <= 0)
commit 771980fc02c79bb44e8cee48da9ba159e6baeaa6
Author: Adam Jackson <ajax at redhat.com>
Date: Mon Aug 20 17:01:24 2018 -0400
xfree86: Remove some not-terribly-useful debugging
I'm sure printing the address of function pointers in modules you'd
loaded might have made sense back when we rolled our own dlopen, but we
got better.
Signed-off-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 36a3c4ef6..12daa44d6 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -721,11 +721,6 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
FatalError("AddScreen/ScreenInit failed for driver %d\n", i);
}
- DebugF("InitOutput - xf86Screens[%d]->pScreen = %p\n",
- i, xf86Screens[i]->pScreen);
- DebugF("xf86Screens[%d]->pScreen->CreateWindow = %p\n",
- i, xf86Screens[i]->pScreen->CreateWindow);
-
if (PictureGetSubpixelOrder(xf86Screens[i]->pScreen) == SubPixelUnknown) {
xf86MonPtr DDC = (xf86MonPtr) (xf86Screens[i]->monitor->DDC);
commit 6a094185d14db6818d98a320c59e0c4d7d43d5a8
Author: Adam Jackson <ajax at redhat.com>
Date: Wed Aug 22 11:18:58 2018 -0400
xfree86: Remove some redundant zero-fill for ScrnInfoRec
xf86AllocateScreen() callocs these for us.
Signed-off-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 8be36006e..36a3c4ef6 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -680,11 +680,6 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
#ifdef XFreeXDGA
pScrn->SetDGAMode = xf86SetDGAMode;
#endif
- pScrn->DPMSSet = NULL;
- pScrn->LoadPalette = NULL;
- pScrn->SetOverscan = NULL;
- pScrn->DriverFunc = NULL;
- pScrn->pScreen = NULL;
scr_index = AddGPUScreen(xf86ScreenInit, argc, argv);
xf86VGAarbiterUnlock(pScrn);
if (scr_index == i) {
@@ -708,11 +703,6 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
#ifdef XFreeXDGA
xf86Screens[i]->SetDGAMode = xf86SetDGAMode;
#endif
- xf86Screens[i]->DPMSSet = NULL;
- xf86Screens[i]->LoadPalette = NULL;
- xf86Screens[i]->SetOverscan = NULL;
- xf86Screens[i]->DriverFunc = NULL;
- xf86Screens[i]->pScreen = NULL;
scr_index = AddScreen(xf86ScreenInit, argc, argv);
xf86VGAarbiterUnlock(xf86Screens[i]);
if (scr_index == i) {
commit 60ec8eadc370a9b06cc3f105974c0c6b8ad1bb4e
Author: Adam Jackson <ajax at redhat.com>
Date: Tue Aug 21 15:09:03 2018 -0400
xfree86: Remove unused xf86GetServerName()
Signed-off-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index 5743f0cd4..cb8190c95 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -287,8 +287,6 @@ extern _X_EXPORT Gamma
xf86GetGamma(void);
extern _X_EXPORT Bool
xf86GetFlipPixels(void);
-extern _X_EXPORT const char *
-xf86GetServerName(void);
extern _X_EXPORT Bool
xf86ServerIsExiting(void);
extern _X_EXPORT Bool
diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
index 7cc7401a2..e08aa5bf1 100644
--- a/hw/xfree86/common/xf86Globals.c
+++ b/hw/xfree86/common/xf86Globals.c
@@ -168,7 +168,6 @@ const char *xf86VisualNames[] = {
};
/* Parameters set only from the command line */
-const char *xf86ServerName = "no-name";
Bool xf86fpFlag = FALSE;
Bool xf86sFlag = FALSE;
Bool xf86bsEnableFlag = FALSE;
diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index 95a90ad88..40ecf37bb 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -1404,12 +1404,6 @@ xf86GetFlipPixels(void)
return xf86FlipPixels;
}
-const char *
-xf86GetServerName(void)
-{
- return xf86ServerName;
-}
-
Bool
xf86ServerIsExiting(void)
{
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 2ec15f027..8be36006e 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -330,11 +330,6 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
config_pre_init();
if (serverGeneration == 1) {
- if ((xf86ServerName = strrchr(argv[0], '/')) != 0)
- xf86ServerName++;
- else
- xf86ServerName = argv[0];
-
xf86PrintBanner();
LogPrintMarkers();
if (xf86LogFile) {
diff --git a/hw/xfree86/doc/ddxDesign.xml b/hw/xfree86/doc/ddxDesign.xml
index 367844136..8faf02b8a 100644
--- a/hw/xfree86/doc/ddxDesign.xml
+++ b/hw/xfree86/doc/ddxDesign.xml
@@ -1905,15 +1905,6 @@ functions:
</para></blockquote>
- <blockquote><para>
- <programlisting>
- const char *xf86GetServerName();
- </programlisting>
- <blockquote><para>
- Returns the name of the X server from the command line.
- </para></blockquote>
-
- </para></blockquote>
</sect2>
<sect2>
More information about the xorg-commit
mailing list