Add virLogSource variables to all source files

Any source file which calls the logging APIs now needs
to have a VIR_LOG_INIT("source.name") declaration at
the start of the file. This provides a static variable
of the virLogSource type.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

cfg.mk

@@ -1068,3 +1068,6 @@ exclude_file_name_regexp--sc_prohibit_int_ijk = \
 
 exclude_file_name_regexp--sc_prohibit_getenv = \
   ^tests/.*\.[ch]$$
+
+exclude_file_name_regexp--sc_avoid_attribute_unused_in_header = \
+  ^src/util/virlog\.h$$

daemon/libvirtd-config.c

@@ -37,6 +37,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_CONF
 
+VIR_LOG_INIT("daemon.libvirtd-config");
+
 /* Allocate an array of malloc'd strings from the config file, filename
  * (used only in diagnostics), using handle "conf".  Upon error, return -1
  * and free any allocated memory.  Otherwise, save the array in *list_arg

daemon/libvirtd.c

@@ -35,6 +35,7 @@
 #include "libvirt_internal.h"
 #include "virerror.h"
 #include "virfile.h"
+#include "virlog.h"
 #include "virpidfile.h"
 #include "virprocess.h"
 
@@ -105,6 +106,8 @@
 #include "virdbus.h"
 #include "cpu/cpu_map.h"
 
+VIR_LOG_INIT("daemon.libvirtd");
+
 #if WITH_SASL
 virNetSASLContextPtr saslCtxt = NULL;
 #endif

daemon/libvirtd.h

@@ -32,7 +32,6 @@
 # include "remote_protocol.h"
 # include "lxc_protocol.h"
 # include "qemu_protocol.h"
-# include "virlog.h"
 # include "virthread.h"
 # if WITH_SASL
 #  include "virnetsaslcontext.h"

daemon/remote.c

@@ -57,6 +57,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_RPC
 
+VIR_LOG_INIT("daemon.remote");
+
 #if SIZEOF_LONG < 8
 # define HYPER_TO_TYPE(_type, _to, _from)                               \
     do {                                                                \

daemon/stream.c

@@ -32,6 +32,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_STREAMS
 
+VIR_LOG_INIT("daemon.stream");
+
 struct daemonClientStream {
     daemonClientPrivatePtr priv;
     int refs;

docs/apibuild.py

@@ -1446,6 +1446,24 @@ class CParser:
 
         return token
 
+    def parseVirLogInit(self, token):
+        if token[0] != "string":
+            self.error("parsing VIR_LOG_INIT: expecting string", token)
+
+        token = self.token()
+
+        if token[0] != "sep":
+            self.error("parsing VIR_LOG_INIT: expecting ')'", token)
+
+        if token[1] != ')':
+            self.error("parsing VIR_LOG_INIT: expecting ')'", token)
+
+        token = self.token()
+        if token[0] == "sep" and token[1] == ';':
+            token = self.token()
+
+        return token
+
      #
      # Parse a C definition block, used for structs or unions it parse till
      # the balancing }
@@ -1617,6 +1635,18 @@ class CParser:
                 token = ("name", "virenumimpl")
             return token
 
+        elif token[0] == "name" and token[1] == "VIR_LOG_INIT":
+            token = self.token()
+            if token is not None and token[0] == "sep" and token[1] == "(":
+                token = self.token()
+                token = self.parseVirLogInit(token)
+            else:
+                self.error("parsing VIR_LOG_INIT: expecting '('", token)
+            if token is not None:
+                self.lexer.push(token)
+                token = ("name", "virloginit")
+            return token
+
         elif token[0] == "name":
             if self.type == "":
                 self.type = token[1]

src/access/viraccessdriverpolkit.c

@@ -29,6 +29,9 @@
 #include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_ACCESS
+
+VIR_LOG_INIT("access.accessdriverpolkit");
+
 #define virAccessError(code, ...)                                       \
     virReportErrorHelper(VIR_FROM_THIS, code, __FILE__,                 \
                          __FUNCTION__, __LINE__, __VA_ARGS__)

src/access/viraccessmanager.c

@@ -33,6 +33,9 @@
 #include "virlog.h"
 
 #define VIR_FROM_THIS VIR_FROM_ACCESS
+
+VIR_LOG_INIT("access.accessmanager");
+
 #define virAccessError(code, ...)                                       \
     virReportErrorHelper(VIR_FROM_THIS, code, __FILE__,                 \
                          __FUNCTION__, __LINE__, __VA_ARGS__)

src/bhyve/bhyve_command.c

@@ -39,6 +39,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_BHYVE
 
+VIR_LOG_INIT("bhyve.bhyve_command");
+
 static char*
 virBhyveTapGetRealDeviceName(char *name)
 {

src/bhyve/bhyve_driver.c

@@ -56,6 +56,8 @@
 
 #define VIR_FROM_THIS   VIR_FROM_BHYVE
 
+VIR_LOG_INIT("bhyve.bhyve_driver");
+
 bhyveConnPtr bhyve_driver = NULL;
 
 void

src/bhyve/bhyve_process.c

@@ -44,6 +44,8 @@
 
 #define VIR_FROM_THIS	VIR_FROM_BHYVE
 
+VIR_LOG_INIT("bhyve.bhyve_process");
+
 int
 virBhyveProcessStart(virConnectPtr conn,
                      bhyveConnPtr driver,

src/conf/domain_audit.c

@@ -33,6 +33,8 @@
 #include "viralloc.h"
 #include "virstring.h"
 
+VIR_LOG_INIT("conf.domain_audit");
+
 /* Return nn:mm in hex for block and character devices, and NULL
  * for other file types, stat failure, or allocation failure.  */
 #if defined major && defined minor

src/conf/domain_conf.c

@@ -56,6 +56,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_DOMAIN
 
+VIR_LOG_INIT("conf.domain_conf");
+
 /* virDomainVirtType is used to set bits in the expectedVirtTypes bitmask,
  * verify that it doesn't overflow an unsigned int when shifting */
 verify(VIR_DOMAIN_VIRT_LAST <= 32);

src/conf/domain_event.c

@@ -35,6 +35,7 @@
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 
+VIR_LOG_INIT("util.domain_event");
 
 static virClassPtr virDomainEventClass;
 static virClassPtr virDomainEventLifecycleClass;

src/conf/network_event.c

@@ -29,6 +29,8 @@
 #include "datatypes.h"
 #include "virlog.h"
 
+VIR_LOG_INIT("conf.network_event");
+
 struct _virNetworkEvent {
     virObjectEvent parent;
 

src/conf/nwfilter_params.c

@@ -35,6 +35,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_NWFILTER
 
+VIR_LOG_INIT("conf.nwfilter_params");
+
 static bool isValidVarValue(const char *value);
 static void virNWFilterVarAccessSetIntIterId(virNWFilterVarAccessPtr,
                                              unsigned int);

src/conf/object_event.c

@@ -36,6 +36,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 
+VIR_LOG_INIT("conf.object_event");
+
 struct _virObjectEventCallbackList {
     unsigned int nextID;
     size_t count;

src/conf/secret_conf.c

@@ -34,6 +34,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_SECRET
 
+VIR_LOG_INIT("conf.secret_conf");
+
 VIR_ENUM_IMPL(virSecretUsageType, VIR_SECRET_USAGE_TYPE_LAST,
               "none", "volume", "ceph", "iscsi")
 

src/conf/snapshot_conf.c

@@ -50,6 +50,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_DOMAIN_SNAPSHOT
 
+VIR_LOG_INIT("conf.snapshot_conf");
+
 VIR_ENUM_IMPL(virDomainSnapshotLocation, VIR_DOMAIN_SNAPSHOT_LOCATION_LAST,
               "default",
               "no",

src/conf/storage_conf.c

@@ -44,7 +44,6 @@
 #include "viralloc.h"
 #include "virfile.h"
 #include "virstring.h"
-#include "virlog.h"
 
 #define VIR_FROM_THIS VIR_FROM_STORAGE
 

src/conf/virchrdev.c

@@ -41,6 +41,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 
+VIR_LOG_INIT("conf.chrdev");
+
 /* structure holding information about character devices
  * open in a given domain */
 struct _virChrdevs {

src/cpu/cpu.c

@@ -40,6 +40,8 @@
 #define NR_DRIVERS ARRAY_CARDINALITY(drivers)
 #define VIR_FROM_THIS VIR_FROM_CPU
 
+VIR_LOG_INIT("cpu.cpu");
+
 static struct cpuArchDriver *drivers[] = {
     &cpuDriverX86,
     &cpuDriverPowerPC,

src/cpu/cpu_map.c

@@ -32,6 +32,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_CPU
 
+VIR_LOG_INIT("cpu.cpu_map");
+
 #define CPUMAPFILE PKGDATADIR "/cpu_map.xml"
 
 static char *cpumap;

src/cpu/cpu_powerpc.c

@@ -36,6 +36,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_CPU
 
+VIR_LOG_INIT("cpu.cpu_powerpc");
+
 static const virArch archs[] = { VIR_ARCH_PPC64 };
 
 struct ppc_vendor {

src/cpu/cpu_x86.c

@@ -36,6 +36,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_CPU
 
+VIR_LOG_INIT("cpu.cpu_x86");
+
 #define VENDOR_STRING_LENGTH    12
 
 static const virCPUx86CPUID cpuidNull = { 0, 0, 0, 0, 0 };

src/datatypes.c

@@ -31,6 +31,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 
+VIR_LOG_INIT("datatypes");
+
 virClassPtr virConnectClass;
 virClassPtr virConnectCloseCallbackDataClass;
 virClassPtr virDomainClass;

src/driver.c

@@ -31,6 +31,8 @@
 #include "configmake.h"
 #include "virstring.h"
 
+VIR_LOG_INIT("driver");
+
 #define DEFAULT_DRIVER_DIR LIBDIR "/libvirt/connection-driver"
 
 #ifdef WITH_DRIVER_MODULES

src/esx/esx_device_monitor.c

@@ -25,7 +25,6 @@
 
 #include "internal.h"
 #include "viralloc.h"
-#include "virlog.h"
 #include "viruuid.h"
 #include "esx_private.h"
 #include "esx_device_monitor.h"

src/esx/esx_driver.c

@@ -49,6 +49,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_ESX
 
+VIR_LOG_INIT("esx.esx_driver");
+
 static int esxDomainGetMaxVcpus(virDomainPtr domain);
 
 typedef struct _esxVMX_Data esxVMX_Data;

src/esx/esx_interface_driver.c

@@ -25,7 +25,6 @@
 
 #include "internal.h"
 #include "viralloc.h"
-#include "virlog.h"
 #include "viruuid.h"
 #include "interface_conf.h"
 #include "virsocketaddr.h"

src/esx/esx_network_driver.c

@@ -26,7 +26,6 @@
 #include "md5.h"
 #include "internal.h"
 #include "viralloc.h"
-#include "virlog.h"
 #include "viruuid.h"
 #include "network_conf.h"
 #include "esx_private.h"

src/esx/esx_nwfilter_driver.c

@@ -25,7 +25,6 @@
 
 #include "internal.h"
 #include "viralloc.h"
-#include "virlog.h"
 #include "viruuid.h"
 #include "esx_private.h"
 #include "esx_nwfilter_driver.h"

src/esx/esx_secret_driver.c

@@ -24,7 +24,6 @@
 
 #include "internal.h"
 #include "viralloc.h"
-#include "virlog.h"
 #include "viruuid.h"
 #include "esx_private.h"
 #include "esx_secret_driver.h"

src/esx/esx_storage_backend_iscsi.c

@@ -28,7 +28,6 @@
 #include "internal.h"
 #include "md5.h"
 #include "viralloc.h"
-#include "virlog.h"
 #include "viruuid.h"
 #include "storage_conf.h"
 #include "virstoragefile.h"

src/esx/esx_storage_backend_vmfs.c

@@ -45,6 +45,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_ESX
 
+VIR_LOG_INIT("esx.esx_storage_backend_vmfs");
+
 /*
  * The UUID of a storage pool is the MD5 sum of it's mount path. Therefore,
  * verify that UUID and MD5 sum match in size, because we rely on that.

src/esx/esx_util.c

@@ -37,7 +37,7 @@
 
 #define VIR_FROM_THIS VIR_FROM_ESX
 
-
+VIR_LOG_INIT("esx.esx_util");
 
 int
 esxUtil_ParseUri(esxUtil_ParsedUri **parsedUri, virURIPtr uri)

src/esx/esx_vi.c

@@ -38,7 +38,7 @@
 
 #define VIR_FROM_THIS VIR_FROM_ESX
 
-
+VIR_LOG_INIT("esx.esx_vi");
 
 #define ESX_VI__SOAP__RESPONSE_XPATH(_type)                                   \
     ((char *)"/soapenv:Envelope/soapenv:Body/"                                \

src/esx/esx_vi_methods.c

@@ -24,7 +24,6 @@
 
 #include "virbuffer.h"
 #include "viralloc.h"
-#include "virlog.h"
 #include "viruuid.h"
 #include "esx_vi_methods.h"
 #include "esx_util.h"

src/esx/esx_vi_types.c

@@ -36,7 +36,7 @@
 
 #define VIR_FROM_THIS VIR_FROM_ESX
 
-
+VIR_LOG_INIT("esx.esx_vi_types");
 
 #define ESX_VI__TEMPLATE__ALLOC(__type)                                       \
     int                                                                       \

src/fdstream.c

@@ -44,6 +44,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_STREAMS
 
+VIR_LOG_INIT("fdstream");
+
 /* Tunnelled migration stream support */
 struct virFDStreamData {
     int fd;

src/hyperv/hyperv_device_monitor.c

@@ -26,7 +26,6 @@
 #include "virerror.h"
 #include "datatypes.h"
 #include "viralloc.h"
-#include "virlog.h"
 #include "viruuid.h"
 #include "hyperv_device_monitor.h"
 

src/hyperv/hyperv_driver.c

@@ -44,7 +44,7 @@
 
 #define VIR_FROM_THIS VIR_FROM_HYPERV
 
-
+VIR_LOG_INIT("hyperv.hyperv_driver");
 
 static void
 hypervFreePrivate(hypervPrivate **priv)

src/hyperv/hyperv_interface_driver.c

@@ -26,7 +26,6 @@
 #include "virerror.h"
 #include "datatypes.h"
 #include "viralloc.h"
-#include "virlog.h"
 #include "viruuid.h"
 #include "hyperv_interface_driver.h"
 

src/hyperv/hyperv_network_driver.c

@@ -26,7 +26,6 @@
 #include "virerror.h"
 #include "datatypes.h"
 #include "viralloc.h"
-#include "virlog.h"
 #include "viruuid.h"
 #include "hyperv_network_driver.h"
 

src/hyperv/hyperv_nwfilter_driver.c

@@ -26,7 +26,6 @@
 #include "virerror.h"
 #include "datatypes.h"
 #include "viralloc.h"
-#include "virlog.h"
 #include "viruuid.h"
 #include "hyperv_nwfilter_driver.h"
 

src/hyperv/hyperv_secret_driver.c

@@ -26,7 +26,6 @@
 #include "virerror.h"
 #include "datatypes.h"
 #include "viralloc.h"
-#include "virlog.h"
 #include "viruuid.h"
 #include "hyperv_secret_driver.h"
 

src/hyperv/hyperv_storage_driver.c

@@ -26,7 +26,6 @@
 #include "virerror.h"
 #include "datatypes.h"
 #include "viralloc.h"
-#include "virlog.h"
 #include "viruuid.h"
 #include "hyperv_storage_driver.h"
 

src/hyperv/hyperv_util.c

@@ -32,7 +32,7 @@
 
 #define VIR_FROM_THIS VIR_FROM_HYPERV
 
-
+VIR_LOG_INIT("hyperv.hyperv_util");
 
 int
 hypervParseUri(hypervParsedUri **parsedUri, virURIPtr uri)

src/hyperv/hyperv_wmi.c

@@ -26,7 +26,6 @@
 #include "internal.h"
 #include "virerror.h"
 #include "datatypes.h"
-#include "virlog.h"
 #include "viralloc.h"
 #include "viruuid.h"
 #include "virbuffer.h"

src/interface/interface_backend_netcf.c

@@ -36,6 +36,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_INTERFACE
 
+VIR_LOG_INIT("interface.interface_backend_netcf");
+
 #define INTERFACE_DRIVER_NAME "netcf"
 
 /* Main driver state */

src/libvirt-lxc.c

@@ -39,6 +39,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 
+VIR_LOG_INIT("libvirt-lxc");
+
 /**
  * virDomainLxcOpenNamespace:
  * @domain: a domain object

src/libvirt-qemu.c

@@ -30,6 +30,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 
+VIR_LOG_INIT("libvirt-qemu");
+
 /**
  * virDomainQemuMonitorCommand:
  * @domain: a domain object

src/libvirt.c

@@ -102,6 +102,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 
+VIR_LOG_INIT("libvirt");
+
 /*
  * TODO:
  * - use lock to protect against concurrent accesses ?

src/libvirt_private.syms

@@ -1462,7 +1462,6 @@ virLogParseOutputs;
 virLogPriorityFromSyslog;
 virLogProbablyLogMessage;
 virLogReset;
-virLogSelf;
 virLogSetBufferSize;
 virLogSetDefaultPriority;
 virLogSetFromEnv;

src/libxl/libxl_conf.c

@@ -48,6 +48,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_LIBXL
 
+VIR_LOG_INIT("libxl.libxl_conf");
+
 /* see xen-unstable.hg/xen/include/asm-x86/cpufeature.h */
 #define LIBXL_X86_FEATURE_PAE_MASK 0x40
 

src/libxl/libxl_domain.c

@@ -34,6 +34,7 @@
 
 #define VIR_FROM_THIS VIR_FROM_LIBXL
 
+VIR_LOG_INIT("libxl.libxl_domain");
 
 VIR_ENUM_IMPL(libxlDomainJob, LIBXL_JOB_LAST,
               "none",

src/libxl/libxl_driver.c

@@ -57,6 +57,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_LIBXL
 
+VIR_LOG_INIT("libxl.libxl_driver");
+
 #define LIBXL_DOM_REQ_POWEROFF 0
 #define LIBXL_DOM_REQ_REBOOT   1
 #define LIBXL_DOM_REQ_SUSPEND  2

src/locking/domain_lock.c

@@ -29,6 +29,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_LOCKING
 
+VIR_LOG_INIT("locking.domain_lock");
+
 
 static int virDomainLockManagerAddLease(virLockManagerPtr lock,
                                         virDomainLeaseDefPtr lease)

src/locking/lock_daemon.c

@@ -54,6 +54,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_LOCKING
 
+VIR_LOG_INIT("locking.lock_daemon");
+
 #define VIR_LOCK_DAEMON_NUM_LOCKSPACES 3
 
 struct _virLockDaemon {

src/locking/lock_daemon_config.c

@@ -35,6 +35,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_CONF
 
+VIR_LOG_INIT("locking.lock_daemon_config");
+
 
 /* A helper function used by each of the following macros.  */
 static int

src/locking/lock_daemon_dispatch.c

@@ -28,11 +28,14 @@
 #include "virstring.h"
 #include "lock_daemon.h"
 #include "lock_protocol.h"
-#include "lock_daemon_dispatch_stubs.h"
 #include "virerror.h"
 
 #define VIR_FROM_THIS VIR_FROM_RPC
 
+VIR_LOG_INIT("locking.lock_daemon_dispatch");
+
+#include "lock_daemon_dispatch_stubs.h"
+
 static int
 virLockSpaceProtocolDispatchAcquireResource(virNetServerPtr server ATTRIBUTE_UNUSED,
                                             virNetServerClientPtr client,

src/locking/lock_driver_lockd.c

@@ -36,6 +36,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_LOCKING
 
+VIR_LOG_INIT("locking.lock_driver_lockd");
+
 #define virLockError(code, ...)                                     \
     virReportErrorHelper(VIR_FROM_THIS, code, __FILE__,             \
                          __FUNCTION__, __LINE__, __VA_ARGS__)

src/locking/lock_driver_nop.c

@@ -26,6 +26,8 @@
 #include "virlog.h"
 #include "viruuid.h"
 
+VIR_LOG_INIT("locking.lock_driver_nop");
+
 
 static int virLockManagerNopInit(unsigned int version ATTRIBUTE_UNUSED,
                                  const char *configFile ATTRIBUTE_UNUSED,

src/locking/lock_driver_sanlock.c

@@ -49,6 +49,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_LOCKING
 
+VIR_LOG_INIT("locking.lock_driver_sanlock");
+
 #define VIR_LOCK_MANAGER_SANLOCK_AUTO_DISK_LOCKSPACE "__LIBVIRT__DISKS__"
 #define VIR_LOCK_MANAGER_SANLOCK_KILLPATH LIBEXECDIR "/libvirt_sanlock_helper"
 

src/locking/lock_manager.c

@@ -39,6 +39,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_LOCKING
 
+VIR_LOG_INIT("locking.lock_manager");
+
 #define CHECK_DRIVER(field, errret)                                  \
     if (!driver->field) {                                            \
         virReportError(VIR_ERR_INTERNAL_ERROR,                       \

src/lxc/lxc_cgroup.c

@@ -32,6 +32,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_LXC
 
+VIR_LOG_INIT("lxc.lxc_cgroup");
+
 static int virLXCCgroupSetupCpuTune(virDomainDefPtr def,
                                     virCgroupPtr cgroup)
 {

src/lxc/lxc_conf.c

@@ -41,6 +41,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_LXC
 
+VIR_LOG_INIT("lxc.lxc_conf");
+
 static virClassPtr virLXCDriverConfigClass;
 static void virLXCDriverConfigDispose(void *obj);
 

src/lxc/lxc_container.c

@@ -71,6 +71,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_LXC
 
+VIR_LOG_INIT("lxc.lxc_container");
+
 /*
  * GLibc headers are behind the kernel, so we define these
  * constants if they're not present already.

src/lxc/lxc_controller.c

@@ -70,6 +70,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_LXC
 
+VIR_LOG_INIT("lxc.lxc_controller");
+
 typedef struct _virLXCControllerConsole virLXCControllerConsole;
 typedef virLXCControllerConsole *virLXCControllerConsolePtr;
 struct _virLXCControllerConsole {

src/lxc/lxc_domain.c

@@ -29,6 +29,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_LXC
 
+VIR_LOG_INIT("lxc.lxc_domain");
+
 static void *virLXCDomainObjPrivateAlloc(void)
 {
     virLXCDomainObjPrivatePtr priv;

src/lxc/lxc_driver.c

@@ -75,6 +75,7 @@
 
 #define VIR_FROM_THIS VIR_FROM_LXC
 
+VIR_LOG_INIT("lxc.lxc_driver");
 
 #define LXC_NB_MEM_PARAM  3
 #define LXC_NB_DOMAIN_BLOCK_STAT_PARAM 4

src/lxc/lxc_fuse.c

@@ -32,7 +32,6 @@
 #include "lxc_fuse.h"
 #include "lxc_cgroup.h"
 #include "virerror.h"
-#include "virlog.h"
 #include "virfile.h"
 #include "virbuffer.h"
 #include "virstring.h"

src/lxc/lxc_hostdev.c

@@ -31,6 +31,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_LXC
 
+VIR_LOG_INIT("lxc.lxc_hostdev");
+
 int
 virLXCUpdateActiveUsbHostdevs(virLXCDriverPtr driver,
                               virDomainDefPtr def)

src/lxc/lxc_monitor.c

@@ -34,6 +34,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_LXC
 
+VIR_LOG_INIT("lxc.lxc_monitor");
+
 struct _virLXCMonitor {
     virObjectLockable parent;
 

src/lxc/lxc_native.c

@@ -34,6 +34,7 @@
 
 #define VIR_FROM_THIS VIR_FROM_LXC
 
+VIR_LOG_INIT("lxc.lxc_native");
 
 static virDomainFSDefPtr
 lxcCreateFSDef(int type,

src/lxc/lxc_process.c

@@ -54,6 +54,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_LXC
 
+VIR_LOG_INIT("lxc.lxc_process");
+
 #define START_POSTFIX ": starting up\n"
 
 static virDomainObjPtr

src/network/bridge_driver.c

@@ -75,6 +75,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_NETWORK
 
+VIR_LOG_INIT("network.bridge_driver");
+
 static void networkDriverLock(virNetworkDriverStatePtr driver)
 {
     virMutexLock(&driver->lock);

src/network/bridge_driver_linux.c

@@ -27,9 +27,12 @@
 #include "virfile.h"
 #include "viriptables.h"
 #include "virstring.h"
+#include "virlog.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 
+VIR_LOG_INIT("network.bridge_driver_linux");
+
 #define PROC_NET_ROUTE "/proc/net/route"
 
 /* XXX: This function can be a lot more exhaustive, there are certainly

src/network/bridge_driver_platform.h

@@ -25,7 +25,6 @@
 # define __VIR_BRIDGE_DRIVER_PLATFORM_H__
 
 # include "internal.h"
-# include "virlog.h"
 # include "virthread.h"
 # include "virdnsmasq.h"
 # include "network_conf.h"

src/node_device/node_device_driver.c

@@ -33,7 +33,6 @@
 #include "datatypes.h"
 #include "viralloc.h"
 #include "virfile.h"
-#include "virlog.h"
 #include "virstring.h"
 #include "node_device_conf.h"
 #include "node_device_hal.h"
@@ -43,7 +42,6 @@
 
 #define VIR_FROM_THIS VIR_FROM_NODEDEV
 
-
 static int update_caps(virNodeDeviceObjPtr dev)
 {
     virNodeDevCapsDefPtr cap = dev->def->caps;

src/node_device/node_device_hal.c

@@ -43,6 +43,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_NODEDEV
 
+VIR_LOG_INIT("node_device.node_device_hal");
+
 /*
  * Host device enumeration (HAL implementation)
  */

src/node_device/node_device_linux_sysfs.c

@@ -38,6 +38,8 @@
 
 #ifdef __linux__
 
+VIR_LOG_INIT("node_device.node_device_linux_sysfs");
+
 int
 detect_scsi_host_caps(union _virNodeDevCapData *d)
 {

src/node_device/node_device_udev.c

@@ -43,6 +43,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_NODEDEV
 
+VIR_LOG_INIT("node_device.node_device_udev");
+
 #ifndef TYPE_RAID
 # define TYPE_RAID 12
 #endif

src/nodeinfo.c

@@ -44,7 +44,6 @@
 #include "viralloc.h"
 #include "nodeinfopriv.h"
 #include "physmem.h"
-#include "virlog.h"
 #include "virerror.h"
 #include "count-one-bits.h"
 #include "intprops.h"

src/nwfilter/nwfilter_dhcpsnoop.c

@@ -72,6 +72,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_NWFILTER
 
+VIR_LOG_INIT("nwfilter.nwfilter_dhcpsnoop");
+
 #ifdef HAVE_LIBPCAP
 
 # define LEASEFILE_DIR LOCALSTATEDIR "/run/libvirt/network/"

src/nwfilter/nwfilter_driver.c

@@ -50,6 +50,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_NWFILTER
 
+VIR_LOG_INIT("nwfilter.nwfilter_driver");
+
 #define DBUS_RULE_FWD_NAMEOWNERCHANGED \
     "type='signal'" \
     ",interface='"DBUS_INTERFACE_DBUS"'" \

src/nwfilter/nwfilter_ebiptables_driver.c

@@ -48,6 +48,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_NWFILTER
 
+VIR_LOG_INIT("nwfilter.nwfilter_ebiptables_driver");
+
 #define EBTABLES_CHAIN_INCOMING "PREROUTING"
 #define EBTABLES_CHAIN_OUTGOING "POSTROUTING"
 

src/nwfilter/nwfilter_gentech_driver.c

@@ -41,6 +41,7 @@
 
 #define VIR_FROM_THIS VIR_FROM_NWFILTER
 
+VIR_LOG_INIT("nwfilter.nwfilter_gentech_driver");
 
 #define NWFILTER_STD_VAR_MAC NWFILTER_VARNAME_MAC
 #define NWFILTER_STD_VAR_IP  NWFILTER_VARNAME_IP

src/nwfilter/nwfilter_learnipaddr.c

@@ -58,6 +58,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_NWFILTER
 
+VIR_LOG_INIT("nwfilter.nwfilter_learnipaddr");
+
 #define IFINDEX2STR(VARNAME, ifindex) \
     char VARNAME[INT_BUFSIZE_BOUND(ifindex)]; \
     snprintf(VARNAME, sizeof(VARNAME), "%d", ifindex);

src/openvz/openvz_driver.c

@@ -61,6 +61,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_OPENVZ
 
+VIR_LOG_INIT("openvz.openvz_driver");
+
 #define OPENVZ_MAX_ARG 28
 #define CMDBUF_LEN 1488
 #define CMDOP_LEN 288

src/parallels/parallels_driver.c

@@ -56,6 +56,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_PARALLELS
 
+VIR_LOG_INIT("parallels.parallels_driver");
+
 #define PRLCTL                      "prlctl"
 #define PRLSRVCTL                   "prlsrvctl"
 

src/phyp/phyp_driver.c

@@ -61,6 +61,9 @@
 
 #define VIR_FROM_THIS VIR_FROM_PHYP
 
+VIR_LOG_INIT("phyp.phyp_driver");
+
+
 /*
  * URI: phyp://user@[hmc|ivm]/managed_system
  * */

src/qemu/qemu_agent.c

@@ -45,6 +45,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_QEMU
 
+VIR_LOG_INIT("qemu.qemu_agent");
+
 #define LINE_ENDING "\n"
 
 #define DEBUG_IO 0

src/qemu/qemu_capabilities.c

@@ -48,6 +48,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_QEMU
 
+VIR_LOG_INIT("qemu.qemu_capabilities");
+
 /* While not public, these strings must not change. They
  * are used in domain status files which are read on
  * daemon restarts

src/qemu/qemu_cgroup.c

@@ -37,6 +37,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_QEMU
 
+VIR_LOG_INIT("qemu.qemu_cgroup");
+
 static const char *const defaultDeviceACL[] = {
     "/dev/null", "/dev/full", "/dev/zero",
     "/dev/random", "/dev/urandom",

src/qemu/qemu_command.c

@@ -59,6 +59,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_QEMU
 
+VIR_LOG_INIT("qemu.qemu_command");
+
 #define VIO_ADDR_NET 0x1000ul
 #define VIO_ADDR_SCSI 0x2000ul
 #define VIO_ADDR_SERIAL 0x30000000ul

src/qemu/qemu_conf.c

@@ -56,6 +56,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_QEMU
 
+VIR_LOG_INIT("qemu.qemu_conf");
+
 static virClassPtr virQEMUDriverConfigClass;
 static void virQEMUDriverConfigDispose(void *obj);
 

src/qemu/qemu_domain.c

@@ -46,6 +46,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_QEMU
 
+VIR_LOG_INIT("qemu.qemu_domain");
+
 #define QEMU_NAMESPACE_HREF "http://libvirt.org/schemas/domain/qemu/1.0"
 
 VIR_ENUM_IMPL(qemuDomainJob, QEMU_JOB_LAST,

src/qemu/qemu_driver.c

@@ -98,6 +98,8 @@
 
 #define VIR_FROM_THIS VIR_FROM_QEMU
 
+VIR_LOG_INIT("qemu.qemu_driver");
+
 #define QEMU_NB_MEM_PARAM  3
 
 #define QEMU_NB_BLOCK_IO_TUNE_PARAM  6