From 2798681d1b2ffaabe6b2bb80b4a2857550469087 Mon Sep 17 00:00:00 2001 From: Ignacio Casal Quinteiro Date: Wed, 4 Sep 2019 13:14:37 +0200 Subject: [PATCH] vfb: allow to set the verbosity with a parameter --- hw/vfb/InitOutput.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c index 48efb61b2..3e832ada5 100644 --- a/hw/vfb/InitOutput.c +++ b/hw/vfb/InitOutput.c @@ -124,6 +124,7 @@ typedef enum { NORMAL_MEMORY_FB, SHARED_MEMORY_FB, MMAPPED_FILE_FB } fbMemType; static fbMemType fbmemtype = NORMAL_MEMORY_FB; static char needswap = 0; static Bool Render = TRUE; +static int verbose = 0; #define swapcopy16(_dst, _src) \ if (needswap) { CARD16 _s = _src; cpswaps(_s, _dst); } \ @@ -239,6 +240,7 @@ ddxInputThreadInit(void) void ddxUseMsg(void) { + ErrorF("-verbose [n] verbose startup messages\n"); ErrorF("-screen scrn WxHxD set screen's width, height, depth\n"); ErrorF("-pixdepths list-of-int support given pixmap depths\n"); ErrorF("+/-render turn on/off RENDER extension support" @@ -257,6 +259,16 @@ ddxUseMsg(void) #endif } +static int +vfbSetVerbosity(int verb) +{ + int save = verbose; + + verbose = verb; + LogSetParameter(XLOG_VERBOSITY, verb); + return save; +} + int ddxProcessArgument(int argc, char *argv[], int i) { @@ -269,6 +281,21 @@ ddxProcessArgument(int argc, char *argv[], int i) firstTime = FALSE; } + if (!strcmp(argv[i], "-verbose")) { + if (++i < argc && argv[i]) { + char *end; + long val; + + val = strtol(argv[i], &end, 0); + if (*end == '\0') { + vfbSetVerbosity(val); + return 2; + } + } + vfbSetVerbosity(++verbose); + return 1; + } + if (lastScreen == -1) currentScreen = &defaultScreenInfo; else