From 6fc4f35f62748f22b51bec02b5f4d19d4dc391e6 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 10 Sep 2024 15:52:06 +0200 Subject: [PATCH] xfree86: use LogMessageVerb() instead of xf86MsgVerb() Both are doing same job, so no need to keep using an duplicated implementation. Signed-off-by: Enrico Weigelt, metux IT consult Part-of: --- hw/xfree86/common/xf86AutoConfig.c | 6 ++-- hw/xfree86/common/xf86Config.c | 6 ++-- hw/xfree86/common/xf86Helper.c | 2 +- hw/xfree86/common/xf86Init.c | 4 +-- hw/xfree86/common/xf86PM.c | 2 +- hw/xfree86/common/xf86pciBus.c | 50 +++++++++++++------------- hw/xfree86/common/xf86sbusBus.c | 30 ++++++++-------- hw/xfree86/doc/ddxDesign.xml | 11 ------ hw/xfree86/int10/helper_exec.c | 2 +- hw/xfree86/os-support/bsd/ppc_video.c | 6 ++-- hw/xfree86/os-support/linux/lnx_acpi.c | 4 +-- hw/xfree86/os-support/linux/lnx_apm.c | 4 +-- 12 files changed, 58 insertions(+), 69 deletions(-) diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c index fc549f34a..c121b03ef 100644 --- a/hw/xfree86/common/xf86AutoConfig.c +++ b/hw/xfree86/common/xf86AutoConfig.c @@ -205,14 +205,14 @@ xf86AutoConfig(void) free(md.matches[i]); } - xf86MsgVerb(X_DEFAULT, 0, + LogMessageVerb(X_DEFAULT, 0, "Using default built-in configuration (%d lines)\n", builtinLines); - xf86MsgVerb(X_DEFAULT, 3, "--- Start of built-in configuration ---\n"); + LogMessageVerb(X_DEFAULT, 3, "--- Start of built-in configuration ---\n"); for (cp = builtinConfig; *cp; cp++) xf86ErrorFVerb(3, "\t%s", *cp); - xf86MsgVerb(X_DEFAULT, 3, "--- End of built-in configuration ---\n"); + LogMessageVerb(X_DEFAULT, 3, "--- End of built-in configuration ---\n"); xf86initConfigFiles(); xf86setBuiltinConfig(builtinConfig); diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index b042d2a60..8c32314a5 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -2347,7 +2347,7 @@ xf86HandleConfigFile(Bool autoconfig) dirname = xf86openConfigDirFiles(dirsearch, xf86ConfigDir, PROJECTROOT); filename = xf86openConfigFile(filesearch, xf86ConfigFile, PROJECTROOT); if (filename) { - xf86MsgVerb(filefrom, 0, "Using config file: \"%s\"\n", filename); + LogMessageVerb(filefrom, 0, "Using config file: \"%s\"\n", filename); xf86ConfigFile = XNFstrdup(filename); } else { @@ -2356,7 +2356,7 @@ xf86HandleConfigFile(Bool autoconfig) xf86ConfigFile); } if (dirname) { - xf86MsgVerb(dirfrom, 0, "Using config directory: \"%s\"\n", + LogMessageVerb(dirfrom, 0, "Using config directory: \"%s\"\n", dirname); xf86ConfigDir = XNFstrdup(dirname); } @@ -2367,7 +2367,7 @@ xf86HandleConfigFile(Bool autoconfig) xf86ConfigDir); } if (sysdirname) - xf86MsgVerb(X_DEFAULT, 0, "Using system config directory \"%s\"\n", + LogMessageVerb(X_DEFAULT, 0, "Using system config directory \"%s\"\n", sysdirname); if (!filename && !dirname && !sysdirname) return CONFIG_NOFILE; diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c index b35409921..257760af2 100644 --- a/hw/xfree86/common/xf86Helper.c +++ b/hw/xfree86/common/xf86Helper.c @@ -1697,7 +1697,7 @@ xf86IsUnblank(int mode) case SCREEN_SAVER_CYCLE: return FALSE; default: - xf86MsgVerb(X_WARNING, 0, "Unexpected save screen mode: %d\n", mode); + LogMessageVerb(X_WARNING, 0, "Unexpected save screen mode: %d\n", mode); return TRUE; } } diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index b2dd37510..b54854db0 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -309,7 +309,7 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv) t = time(NULL); ct = ctime(&t); - xf86MsgVerb(xf86LogFileFrom, 0, "Log file: \"%s\", Time: %s", + LogMessageVerb(xf86LogFileFrom, 0, "Log file: \"%s\", Time: %s", xf86LogFile, ct); } @@ -580,7 +580,7 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv) if (xf86OSPMClose) xf86OSPMClose(); if ((xf86OSPMClose = xf86OSPMOpen()) != NULL) - xf86MsgVerb(X_INFO, 3, "APM registered successfully\n"); + LogMessageVerb(X_INFO, 3, "APM registered successfully\n"); /* Make sure full I/O access is enabled */ if (xorgHWAccess) diff --git a/hw/xfree86/common/xf86PM.c b/hw/xfree86/common/xf86PM.c index 427e9e0aa..1d7495fb3 100644 --- a/hw/xfree86/common/xf86PM.c +++ b/hw/xfree86/common/xf86PM.c @@ -208,7 +208,7 @@ xf86HandlePMEvents(int fd, void *data) const char *str = NULL; int verb = eventName(events[i], &str); - xf86MsgVerb(X_INFO, verb, "PM Event received: %s\n", str); + LogMessageVerb(X_INFO, verb, "PM Event received: %s\n", str); DoApmEvent(events[i], FALSE); switch (xf86PMConfirmEventToOs(fd, events[i])) { case PM_WAIT: diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c index 3a9ace9ab..8605c08b3 100644 --- a/hw/xfree86/common/xf86pciBus.c +++ b/hw/xfree86/common/xf86pciBus.c @@ -825,11 +825,11 @@ xf86MatchPciInstances(const char *driverName, int vendorID, devList[j]->screen == instances[i].screen) { if (devBus) - xf86MsgVerb(X_WARNING, 0, - "%s: More than one matching Device section for " - "instances\n\t(BusID: %s) found: %s\n", - driverName, devList[j]->busID, - devList[j]->identifier); + LogMessageVerb(X_WARNING, 0, + "%s: More than one matching Device section for " + "instances\n\t(BusID: %s) found: %s\n", + driverName, devList[j]->busID, + devList[j]->identifier); else devBus = devList[j]; } @@ -843,10 +843,10 @@ xf86MatchPciInstances(const char *driverName, int vendorID, xf86Msg(X_PROBED, "Assigning device section with no busID" " to primary device\n"); if (dev || devBus) - xf86MsgVerb(X_WARNING, 0, - "%s: More than one matching Device section " - "found: %s\n", driverName, - devList[j]->identifier); + LogMessageVerb(X_WARNING, 0, + "%s: More than one matching Device section " + "found: %s\n", driverName, + devList[j]->identifier); else dev = devList[j]; } @@ -856,10 +856,10 @@ xf86MatchPciInstances(const char *driverName, int vendorID, dev = devBus; /* busID preferred */ if (!dev) { if (xf86CheckPciSlot(pPci) && pciDeviceHasBars(pPci)) { - xf86MsgVerb(X_WARNING, 0, "%s: No matching Device section " - "for instance (BusID PCI:%u@%u:%u:%u) found\n", - driverName, pPci->bus, pPci->domain, pPci->dev, - pPci->func); + LogMessageVerb(X_WARNING, 0, "%s: No matching Device section " + "for instance (BusID PCI:%u@%u:%u:%u) found\n", + driverName, pPci->bus, pPci->domain, pPci->dev, + pPci->func); } } else { @@ -888,10 +888,10 @@ xf86MatchPciInstances(const char *driverName, int vendorID, if (c->token == -1) { instances[i].claimed = FALSE; numClaimedInstances--; - xf86MsgVerb(X_WARNING, 0, "%s: Chipset \"%s\" in Device " - "section \"%s\" isn't valid for this driver\n", - driverName, instances[i].dev->chipset, - instances[i].dev->identifier); + LogMessageVerb(X_WARNING, 0, "%s: Chipset \"%s\" in Device " + "section \"%s\" isn't valid for this driver\n", + driverName, instances[i].dev->chipset, + instances[i].dev->identifier); } else { instances[i].chip = c->token; @@ -908,10 +908,10 @@ xf86MatchPciInstances(const char *driverName, int vendorID, else { instances[i].claimed = FALSE; numClaimedInstances--; - xf86MsgVerb(X_WARNING, 0, "%s: Chipset \"%s\" in Device " - "section \"%s\" isn't a valid PCI chipset\n", - driverName, instances[i].dev->chipset, - instances[i].dev->identifier); + LogMessageVerb(X_WARNING, 0, "%s: Chipset \"%s\" in Device " + "section \"%s\" isn't a valid PCI chipset\n", + driverName, instances[i].dev->chipset, + instances[i].dev->identifier); } } } @@ -923,10 +923,10 @@ xf86MatchPciInstances(const char *driverName, int vendorID, if (id->numChipset == -1) { instances[i].claimed = FALSE; numClaimedInstances--; - xf86MsgVerb(X_WARNING, 0, "%s: ChipID 0x%04X in Device " - "section \"%s\" isn't valid for this driver\n", - driverName, instances[i].dev->chipID, - instances[i].dev->identifier); + LogMessageVerb(X_WARNING, 0, "%s: ChipID 0x%04X in Device " + "section \"%s\" isn't valid for this driver\n", + driverName, instances[i].dev->chipID, + instances[i].dev->identifier); } else { instances[i].chip = id->numChipset; diff --git a/hw/xfree86/common/xf86sbusBus.c b/hw/xfree86/common/xf86sbusBus.c index e94b8f1c6..22483b28a 100644 --- a/hw/xfree86/common/xf86sbusBus.c +++ b/hw/xfree86/common/xf86sbusBus.c @@ -464,11 +464,11 @@ xf86MatchSbusInstances(const char *driverName, int sbusDevId, if (devList[j]->busID && *devList[j]->busID) { if (xf86CompareSbusBusString(devList[j]->busID, psdp->fbNum)) { if (devBus) - xf86MsgVerb(X_WARNING, 0, - "%s: More than one matching Device section for " - "instance (BusID: %s) found: %s\n", - driverName, devList[j]->identifier, - devList[j]->busID); + LogMessageVerb(X_WARNING, 0, + "%s: More than one matching Device section for " + "instance (BusID: %s) found: %s\n", + driverName, devList[j]->identifier, + devList[j]->busID); else devBus = devList[j]; } @@ -486,24 +486,24 @@ xf86MatchSbusInstances(const char *driverName, int sbusDevId, dev = devList[j]; } else - xf86MsgVerb(X_WARNING, 0, - "%s: More than one matching Device section " - "found: %s\n", driverName, - devList[j]->identifier); + LogMessageVerb(X_WARNING, 0, + "%s: More than one matching Device section " + "found: %s\n", driverName, + devList[j]->identifier); } } if (devBus) dev = devBus; /* busID preferred */ if (!dev && psdp->fd != -2) { if (promPath) { - xf86MsgVerb(X_WARNING, 0, "%s: No matching Device section " - "for instance (BusID SBUS:%s) found\n", - driverName, promPath); + LogMessageVerb(X_WARNING, 0, "%s: No matching Device section " + "for instance (BusID SBUS:%s) found\n", + driverName, promPath); } else - xf86MsgVerb(X_WARNING, 0, "%s: No matching Device section " - "for instance (BusID SBUS:fb%d) found\n", - driverName, psdp->fbNum); + LogMessageVerb(X_WARNING, 0, "%s: No matching Device section " + "for instance (BusID SBUS:fb%d) found\n", + driverName, psdp->fbNum); } else if (dev) { numClaimedInstances++; diff --git a/hw/xfree86/doc/ddxDesign.xml b/hw/xfree86/doc/ddxDesign.xml index af6299647..eb0bb03bb 100644 --- a/hw/xfree86/doc/ddxDesign.xml +++ b/hw/xfree86/doc/ddxDesign.xml @@ -5630,17 +5630,6 @@ strongly encouraged to improve the consistency of driver behaviour. -
- - xf86MsgVerb(MessageType type, int verb, const char *format, ...); - -
- Like xf86Msg(), but with the verbosity level given - explicitly. - - -
-
xf86DrvMsg(int scrnIndex, MessageType type, const char *format, ...); diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c index fc4d83c16..ed8ec4f87 100644 --- a/hw/xfree86/int10/helper_exec.c +++ b/hw/xfree86/int10/helper_exec.c @@ -211,7 +211,7 @@ stack_trace(xf86Int10InfoPtr pInt) if (stack >= tail) return; - xf86MsgVerb(X_INFO, 3, "stack at 0x%8.8lx:\n", stack); + LogMessageVerb(X_INFO, 3, "stack at 0x%8.8lx:\n", stack); for (; stack < tail; stack++) { xf86ErrorFVerb(3, " %2.2x", MEM_RB(pInt, stack)); i = (i + 1) % 0x10; diff --git a/hw/xfree86/os-support/bsd/ppc_video.c b/hw/xfree86/os-support/bsd/ppc_video.c index 493f886ee..2f4d30007 100644 --- a/hw/xfree86/os-support/bsd/ppc_video.c +++ b/hw/xfree86/os-support/bsd/ppc_video.c @@ -60,13 +60,13 @@ xf86EnableIO() { int fd = xf86Info.consoleFd; - xf86MsgVerb(X_WARNING, 3, "xf86EnableIO %d\n", fd); + LogMessageVerb(X_WARNING, 3, "xf86EnableIO %d\n", fd); if (ioBase == MAP_FAILED) { ioBase = mmap(NULL, 0x10000, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0xf2000000); - xf86MsgVerb(X_INFO, 3, "xf86EnableIO: %08x\n", ioBase); + LogMessageVerb(X_INFO, 3, "xf86EnableIO: %08x\n", ioBase); if (ioBase == MAP_FAILED) { - xf86MsgVerb(X_WARNING, 3, "Can't map IO space!\n"); + LogMessageVerb(X_WARNING, 3, "Can't map IO space!\n"); return FALSE; } } diff --git a/hw/xfree86/os-support/linux/lnx_acpi.c b/hw/xfree86/os-support/linux/lnx_acpi.c index 50825cdfa..2da3c5250 100644 --- a/hw/xfree86/os-support/linux/lnx_acpi.c +++ b/hw/xfree86/os-support/linux/lnx_acpi.c @@ -149,7 +149,7 @@ lnxACPIOpen(void) strcpy(addr.sun_path, ACPI_SOCKET); if ((r = connect(fd, (struct sockaddr *) &addr, sizeof(addr))) == -1) { if (!warned) - xf86MsgVerb(X_WARNING, 3, "Open ACPI failed (%s) (%s)\n", + LogMessageVerb(X_WARNING, 3, "Open ACPI failed (%s) (%s)\n", ACPI_SOCKET, strerror(errno)); warned = 1; shutdown(fd, 2); @@ -161,7 +161,7 @@ lnxACPIOpen(void) xf86PMGetEventFromOs = lnxACPIGetEventFromOs; xf86PMConfirmEventToOs = lnxACPIConfirmEventToOs; ACPIihPtr = xf86AddGeneralHandler(fd, xf86HandlePMEvents, NULL); - xf86MsgVerb(X_INFO, 3, "Open ACPI successful (%s)\n", ACPI_SOCKET); + LogMessageVerb(X_INFO, 3, "Open ACPI successful (%s)\n", ACPI_SOCKET); warned = 0; return lnxCloseACPI; diff --git a/hw/xfree86/os-support/linux/lnx_apm.c b/hw/xfree86/os-support/linux/lnx_apm.c index 4377caa20..a06d49fbe 100644 --- a/hw/xfree86/os-support/linux/lnx_apm.c +++ b/hw/xfree86/os-support/linux/lnx_apm.c @@ -165,7 +165,7 @@ lnxAPMOpen(void) DebugF("APM: Opening device\n"); if ((fd = open(APM_DEVICE, O_RDWR)) > -1) { if (access(APM_PROC, R_OK) || ((pfd = open(APM_PROC, O_RDONLY)) == -1)) { - xf86MsgVerb(X_WARNING, 3, "Cannot open APM (%s) (%s)\n", + LogMessageVerb(X_WARNING, 3, "Cannot open APM (%s) (%s)\n", APM_PROC, strerror(errno)); close(fd); return NULL; @@ -175,7 +175,7 @@ lnxAPMOpen(void) xf86PMGetEventFromOs = lnxPMGetEventFromOs; xf86PMConfirmEventToOs = lnxPMConfirmEventToOs; APMihPtr = xf86AddGeneralHandler(fd, xf86HandlePMEvents, NULL); - xf86MsgVerb(X_INFO, 3, "Open APM successful\n"); + LogMessageVerb(X_INFO, 3, "Open APM successful\n"); return lnxCloseAPM; } return NULL;