Rename logging.{c,h} to virlog.{c,h}

diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c
index 0ca185c069c4c879e7a60cc4ed5ea2e8dd948b7c..f61f08df3a9e3e6d27992cd9fca7ba21ff70ba46 100644 (file)
--- a/daemon/libvirtd-config.c
+++ b/daemon/libvirtd-config.c
@@ -27,7 +27,7 @@
 #include "virconf.h"
 #include "memory.h"
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 #include "rpc/virnetserver.h"
 #include "configmake.h"
 #include "remote/remote_protocol.h"

diff --git a/daemon/libvirtd.h b/daemon/libvirtd.h
index e3891516505603b59898ba6f23c343433195b67f..b04cc7112ad49de2dc506171713ec73dc900ef5b 100644 (file)
--- a/daemon/libvirtd.h
+++ b/daemon/libvirtd.h
@@ -33,7 +33,7 @@
 # include <rpc/xdr.h>
 # include "remote_protocol.h"
 # include "qemu_protocol.h"
-# include "logging.h"
+# include "virlog.h"
 # include "threads.h"
 # if HAVE_SASL
 #  include "virnetsaslcontext.h"

diff --git a/daemon/remote.c b/daemon/remote.c
index 3cee0386694345e527023140b683db865283f881..bb38689604fd0259c64f15bd9b1dbc91d05c8f95 100644 (file)
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -34,7 +34,7 @@
 #include "libvirt_internal.h"
 #include "datatypes.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "util.h"
 #include "stream.h"
 #include "uuid.h"

diff --git a/daemon/stream.c b/daemon/stream.c
index fa14eeb565e0af6aa43733498331cc7b5157364f..d63e0092e19d474236a0efa4697f22f51e4ca53e 100644 (file)
--- a/daemon/stream.c
+++ b/daemon/stream.c
@@ -26,7 +26,7 @@
 #include "stream.h"
 #include "remote.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virnetserverclient.h"
 #include "virterror_internal.h"
 

diff --git a/src/Makefile.am b/src/Makefile.am
index d0c391ec2eb9409aba47b5a2bccb00e4f9859d49..59958c6679d8c7045936a5803cbc9def59e5824c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -53,7 +53,6 @@ augeastest_DATA =
 # These files are not related to driver APIs. Simply generic
 # helper APIs for various purposes
 UTIL_SOURCES =                                                 \
-               util/logging.c util/logging.h                   \
                util/memory.c util/memory.h                     \
                util/pci.c util/pci.h                           \
                util/processinfo.c util/processinfo.h           \
@@ -85,6 +84,7 @@ UTIL_SOURCES =                                                        \
                util/virnodesuspend.c util/virnodesuspend.h     \
                util/viriptables.c util/viriptables.h           \
                util/virjson.c util/virjson.h                   \
+               util/virlog.c util/virlog.h                     \
                util/virobject.c util/virobject.h               \
                util/virpidfile.c util/virpidfile.h             \
                util/virprocess.c util/virprocess.h             \

diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c
index 97b3aa41f41fbabd029aef21c5f3ece24d0e6e35..a73c7231c273ee68bedabc000dca2993cf8a6450 100644 (file)
--- a/src/conf/domain_audit.c
+++ b/src/conf/domain_audit.c
@@ -29,7 +29,7 @@
 #include "domain_audit.h"
 #include "viraudit.h"
 #include "uuid.h"
-#include "logging.h"
+#include "virlog.h"
 #include "memory.h"
 
 /* Return nn:mm in hex for block and character devices, and NULL

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 51327bf331cb59b5893104389987aed255ae5f6e..30b1a0fa4a9a079bafa4f00ed65130f7d27a7884 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -40,7 +40,7 @@
 #include "uuid.h"
 #include "util.h"
 #include "virbuffer.h"
-#include "logging.h"
+#include "virlog.h"
 #include "nwfilter_conf.h"
 #include "storage_file.h"
 #include "virfile.h"

diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c
index cf3730866341c5d96f327f89ef2185f8724f4447..f1e247b7a78c4cd34a52e67d39d89078df15c89b 100644 (file)
--- a/src/conf/domain_event.c
+++ b/src/conf/domain_event.c
@@ -24,7 +24,7 @@
 #include <config.h>
 
 #include "domain_event.h"
-#include "logging.h"
+#include "virlog.h"
 #include "datatypes.h"
 #include "memory.h"
 #include "virterror_internal.h"

diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c
index 7254519a2c9061b27048f3d894ac0bc6e8a173ba..f8cf98025b203aa435ebe06b9878499b500dd165 100644 (file)
--- a/src/conf/nwfilter_params.c
+++ b/src/conf/nwfilter_params.c
@@ -30,7 +30,7 @@
 #include "datatypes.h"
 #include "nwfilter_params.h"
 #include "domain_conf.h"
-#include "logging.h"
+#include "virlog.h"
 
 #define VIR_FROM_THIS VIR_FROM_NWFILTER
 

diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c
index ec67f57a7b08aa03ef536cb9bc254c56dd1c7527..24d7aa0df5a34f36a6c287c832b1534e171e1a36 100644 (file)
--- a/src/conf/secret_conf.c
+++ b/src/conf/secret_conf.c
@@ -25,7 +25,7 @@
 #include "internal.h"
 #include "virbuffer.h"
 #include "datatypes.h"
-#include "logging.h"
+#include "virlog.h"
 #include "memory.h"
 #include "secret_conf.h"
 #include "virterror_internal.h"

diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index 38a3e2a36ad900049958e5a64b6a22183190af9e..63618102ea41c7b60aeabc74b39f84a46b3accb1 100644 (file)
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -34,7 +34,7 @@
 #include "count-one-bits.h"
 #include "datatypes.h"
 #include "domain_conf.h"
-#include "logging.h"
+#include "virlog.h"
 #include "memory.h"
 #include "netdev_bandwidth_conf.h"
 #include "netdev_vport_profile_conf.h"

diff --git a/src/conf/virconsole.c b/src/conf/virconsole.c
index 143c1a684ef1f034229834be78bd8ddb910acb0c..92179ccc2d01933c3567400313edbeb3c0ffcb64 100644 (file)
--- a/src/conf/virconsole.c
+++ b/src/conf/virconsole.c
@@ -34,7 +34,7 @@
 #include "threads.h"
 #include "memory.h"
 #include "virpidfile.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virterror_internal.h"
 #include "virfile.h"
 

diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
index 53c4cc3eb8b0570c49776142a2e19479355fca39..be1f4cecae1ee81f31d646df27060e5e9c5932f7 100644 (file)
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -23,7 +23,7 @@
 
 #include <config.h>
 
-#include "logging.h"
+#include "virlog.h"
 #include "memory.h"
 #include "xml.h"
 #include "cpu.h"

diff --git a/src/cpu/cpu_powerpc.c b/src/cpu/cpu_powerpc.c
index 36d601e952afe502c6777073ceaecef2a21bd932..26991d80235e45bfcdee2d79b7419b99f6fe891c 100644 (file)
--- a/src/cpu/cpu_powerpc.c
+++ b/src/cpu/cpu_powerpc.c
@@ -26,7 +26,7 @@
 #include <config.h>
 #include <stdint.h>
 
-#include "logging.h"
+#include "virlog.h"
 #include "memory.h"
 #include "util.h"
 #include "cpu.h"

diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index 144714155767362912d1644ac127948ea2ef5e04..2970573c774f8a3a180acb0a86fdcf7d975ab8cb 100644 (file)
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -25,7 +25,7 @@
 
 #include <stdint.h>
 
-#include "logging.h"
+#include "virlog.h"
 #include "memory.h"
 #include "util.h"
 #include "cpu.h"

diff --git a/src/datatypes.c b/src/datatypes.c
index c0ed3a2700074baffda4bc008ae611d9289647ad..73a2fd05f3aeaa8f11f08d3626bb55134907422e 100644 (file)
--- a/src/datatypes.c
+++ b/src/datatypes.c
@@ -24,7 +24,7 @@
 
 #include "datatypes.h"
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 #include "memory.h"
 #include "uuid.h"
 #include "util.h"

diff --git a/src/driver.c b/src/driver.c
index 6d2feb9b813fdd4c63af18674066d0ef5ccfbe71..4ef6fd2d5f9f87e4796364dd6bd2a9911f4a2dfd 100644 (file)
--- a/src/driver.c
+++ b/src/driver.c
@@ -26,7 +26,7 @@
 
 #include "driver.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "util.h"
 #include "configmake.h"
 

diff --git a/src/esx/esx_device_monitor.c b/src/esx/esx_device_monitor.c
index c3f9339b0ef5e1c49cc25404934a13fa1274ea4f..0ad95f51067a03582d975356447e4d796801a78d 100644 (file)
--- a/src/esx/esx_device_monitor.c
+++ b/src/esx/esx_device_monitor.c
@@ -27,7 +27,7 @@
 #include "internal.h"
 #include "util.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "uuid.h"
 #include "esx_private.h"
 #include "esx_device_monitor.h"

diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
index 4171beb460d94be29d38890339ee73c5aafb460b..488d18dd0ea86ba3faeac5482152deb92a0a85ba 100644 (file)
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -30,7 +30,7 @@
 #include "virauth.h"
 #include "util.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "uuid.h"
 #include "vmx.h"
 #include "virtypedparam.h"

diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c
index 35bc7fac430e6ef0451ccd17ddaf30ac4cd0aaa1..4760264441942fabee5ad807393909dca32c313f 100644 (file)
--- a/src/esx/esx_interface_driver.c
+++ b/src/esx/esx_interface_driver.c
@@ -27,7 +27,7 @@
 #include "internal.h"
 #include "util.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "uuid.h"
 #include "interface_conf.h"
 #include "virsocketaddr.h"

diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c
index 6a87abd97eda96bbc06c22b59a3cc223ecd2e7c3..3e25aa2df68abc2c0b57a7e738d545dee5bbbf4f 100644 (file)
--- a/src/esx/esx_network_driver.c
+++ b/src/esx/esx_network_driver.c
@@ -28,7 +28,7 @@
 #include "internal.h"
 #include "util.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "uuid.h"
 #include "network_conf.h"
 #include "esx_private.h"

diff --git a/src/esx/esx_nwfilter_driver.c b/src/esx/esx_nwfilter_driver.c
index 9780ca6cfd7ba6977dac85b06e4848e9f98be106..f5e710d5a20d8dd7ad898afdd0116deaabadbfb5 100644 (file)
--- a/src/esx/esx_nwfilter_driver.c
+++ b/src/esx/esx_nwfilter_driver.c
@@ -27,7 +27,7 @@
 #include "internal.h"
 #include "util.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "uuid.h"
 #include "esx_private.h"
 #include "esx_nwfilter_driver.h"

diff --git a/src/esx/esx_secret_driver.c b/src/esx/esx_secret_driver.c
index 55b2e9a1a3799b68803e6c34de92c241549b4a2f..2a98644d263677a2afa877f90dc63f03b729d0dd 100644 (file)
--- a/src/esx/esx_secret_driver.c
+++ b/src/esx/esx_secret_driver.c
@@ -26,7 +26,7 @@
 #include "internal.h"
 #include "util.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "uuid.h"
 #include "esx_private.h"
 #include "esx_secret_driver.h"

diff --git a/src/esx/esx_storage_backend_iscsi.c b/src/esx/esx_storage_backend_iscsi.c
index b6cde96e8d8fcc5d74bf1418066841a642cba9d1..5d4eb3cb7d50be3a1352af6e9a25fb451091df8d 100644 (file)
--- a/src/esx/esx_storage_backend_iscsi.c
+++ b/src/esx/esx_storage_backend_iscsi.c
@@ -30,7 +30,7 @@
 #include "md5.h"
 #include "util.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "uuid.h"
 #include "storage_conf.h"
 #include "storage_file.h"

diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backend_vmfs.c
index 5ef2981f029cef9387b4ded413cc70b906cd7138..c8bba9e7a93fab5d80e930f1733c1b9223120824 100644 (file)
--- a/src/esx/esx_storage_backend_vmfs.c
+++ b/src/esx/esx_storage_backend_vmfs.c
@@ -33,7 +33,7 @@
 #include "md5.h"
 #include "util.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "uuid.h"
 #include "storage_conf.h"
 #include "storage_file.h"

diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c
index b807607b21f5819197d457f609154b4006089a25..6e27fe468c0556cb14b0b7d5bc7ce07697d9d155 100644 (file)
--- a/src/esx/esx_util.c
+++ b/src/esx/esx_util.c
@@ -30,7 +30,7 @@
 #include "datatypes.h"
 #include "util.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "uuid.h"
 #include "vmx.h"
 #include "esx_private.h"

diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c
index d645bfbdcd31443064f3f80d3ac1fc392ef9adf8..76192dfd5998f5a62542588733b826a45da17bc4 100644 (file)
--- a/src/esx/esx_vi.c
+++ b/src/esx/esx_vi.c
@@ -28,7 +28,7 @@
 
 #include "virbuffer.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "util.h"
 #include "uuid.h"
 #include "vmx.h"

diff --git a/src/esx/esx_vi_methods.c b/src/esx/esx_vi_methods.c
index a3c3c8b9784b67211231daa8ac07fbe2ea3e8065..a3870ee8da0b165e60650981d5b29d86f923319e 100644 (file)
--- a/src/esx/esx_vi_methods.c
+++ b/src/esx/esx_vi_methods.c
@@ -25,7 +25,7 @@
 
 #include "virbuffer.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "uuid.h"
 #include "esx_vi_methods.h"
 #include "esx_util.h"

diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c
index 1654e1b1731ab24c4dce0b39c33fd03c5f333c82..d0a2c6c427cc92a0adca73538765b3276622e249 100644 (file)
--- a/src/esx/esx_vi_types.c
+++ b/src/esx/esx_vi_types.c
@@ -30,7 +30,7 @@
 #include "virbuffer.h"
 #include "datatypes.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "util.h"
 #include "esx_vi.h"
 #include "esx_vi_types.h"

diff --git a/src/fdstream.c b/src/fdstream.c
index d1eb04cc848eff59be0cc30e63e0019c7bb1a198..fdbd7a20ee28491741df775d2ab6b20500385a17 100644 (file)
--- a/src/fdstream.c
+++ b/src/fdstream.c
@@ -35,7 +35,7 @@
 #include "fdstream.h"
 #include "virterror_internal.h"
 #include "datatypes.h"
-#include "logging.h"
+#include "virlog.h"
 #include "memory.h"
 #include "util.h"
 #include "virfile.h"

diff --git a/src/hyperv/hyperv_device_monitor.c b/src/hyperv/hyperv_device_monitor.c
index e183798db27531d7812eb1cd7a072e7e46570f48..1fa98b2fb399f820e7703fd1112aacf8d8f2bcd5 100644 (file)
--- a/src/hyperv/hyperv_device_monitor.c
+++ b/src/hyperv/hyperv_device_monitor.c
@@ -28,7 +28,7 @@
 #include "datatypes.h"
 #include "util.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "uuid.h"
 #include "hyperv_device_monitor.h"
 

diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c
index 4aed41fe520bba5200241c1bd9ac7b92e1267a7e..95b0cd96eda3fe87510a44ae1b2158eca5a4a989 100644 (file)
--- a/src/hyperv/hyperv_driver.c
+++ b/src/hyperv/hyperv_driver.c
@@ -29,7 +29,7 @@
 #include "virauth.h"
 #include "util.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "uuid.h"
 #include "hyperv_driver.h"
 #include "hyperv_interface_driver.h"

diff --git a/src/hyperv/hyperv_interface_driver.c b/src/hyperv/hyperv_interface_driver.c
index 9b1bb378b478fa7bf9f34380f3daabdbca4af164..6a3c2cbea35cb5234e2a70b94063e84dff9853d3 100644 (file)
--- a/src/hyperv/hyperv_interface_driver.c
+++ b/src/hyperv/hyperv_interface_driver.c
@@ -28,7 +28,7 @@
 #include "datatypes.h"
 #include "util.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "uuid.h"
 #include "hyperv_interface_driver.h"
 

diff --git a/src/hyperv/hyperv_network_driver.c b/src/hyperv/hyperv_network_driver.c
index 3a61fe66d2191eec645452d32e06f54a495ce100..2f9fcab0e04d82be2e188da0e85d973dd7c39185 100644 (file)
--- a/src/hyperv/hyperv_network_driver.c
+++ b/src/hyperv/hyperv_network_driver.c
@@ -28,7 +28,7 @@
 #include "datatypes.h"
 #include "util.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "uuid.h"
 #include "hyperv_network_driver.h"
 

diff --git a/src/hyperv/hyperv_nwfilter_driver.c b/src/hyperv/hyperv_nwfilter_driver.c
index 9d54f82f8bc17741304c8dc12364ce69aaf7a6f7..c490522405bca13b51fde3520fa03ade32f82d2a 100644 (file)
--- a/src/hyperv/hyperv_nwfilter_driver.c
+++ b/src/hyperv/hyperv_nwfilter_driver.c
@@ -28,7 +28,7 @@
 #include "datatypes.h"
 #include "util.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "uuid.h"
 #include "hyperv_nwfilter_driver.h"
 

diff --git a/src/hyperv/hyperv_secret_driver.c b/src/hyperv/hyperv_secret_driver.c
index 7ee8ce945bbbb49ec934e386afe5d90650457275..3d58b016d9df6b1d2df47495c8ae12e77b35bd8a 100644 (file)
--- a/src/hyperv/hyperv_secret_driver.c
+++ b/src/hyperv/hyperv_secret_driver.c
@@ -28,7 +28,7 @@
 #include "datatypes.h"
 #include "util.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "uuid.h"
 #include "hyperv_secret_driver.h"
 

diff --git a/src/hyperv/hyperv_storage_driver.c b/src/hyperv/hyperv_storage_driver.c
index 2e0316248112dd12d279ce3a15908bc8624c2d80..7fbc14ded02c433884c7bfca1be37c4cebf92365 100644 (file)
--- a/src/hyperv/hyperv_storage_driver.c
+++ b/src/hyperv/hyperv_storage_driver.c
@@ -28,7 +28,7 @@
 #include "datatypes.h"
 #include "util.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "uuid.h"
 #include "hyperv_storage_driver.h"
 

diff --git a/src/hyperv/hyperv_util.c b/src/hyperv/hyperv_util.c
index 3050d617b8b4c9608fd22b4ab6508d37b5457918..1ef6dae4524f044085c813028bf316f018918bda 100644 (file)
--- a/src/hyperv/hyperv_util.c
+++ b/src/hyperv/hyperv_util.c
@@ -26,7 +26,7 @@
 #include "datatypes.h"
 #include "util.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "uuid.h"
 #include "hyperv_private.h"
 #include "hyperv_util.h"

diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c
index 0a6b1077780069b350cb3b9e8791cb378576af58..069ebe68693837b7cc1864176d2d8b43be50ac3d 100644 (file)
--- a/src/hyperv/hyperv_wmi.c
+++ b/src/hyperv/hyperv_wmi.c
@@ -27,7 +27,7 @@
 #include "internal.h"
 #include "virterror_internal.h"
 #include "datatypes.h"
-#include "logging.h"
+#include "virlog.h"
 #include "memory.h"
 #include "util.h"
 #include "uuid.h"

diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c
index 226e020cb528ee59f399015d3728dc83987843bf..1f42920f2c3cd5465d5230168bb438f6aa474028 100644 (file)
--- a/src/interface/interface_backend_netcf.c
+++ b/src/interface/interface_backend_netcf.c
@@ -30,7 +30,7 @@
 #include "interface_driver.h"
 #include "interface_conf.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 
 #define VIR_FROM_THIS VIR_FROM_INTERFACE
 

diff --git a/src/libvirt-qemu.c b/src/libvirt-qemu.c
index cc98bbbcbc359eef0e3fc7be44556e3ba6b3caf4..8d53b5c7b74118c7aeee4ce0103419a0cef62683 100644 (file)
--- a/src/libvirt-qemu.c
+++ b/src/libvirt-qemu.c
@@ -24,7 +24,7 @@
 #include <config.h>
 
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 #include "datatypes.h"
 #include "libvirt/libvirt-qemu.h"
 

diff --git a/src/libvirt.c b/src/libvirt.c
index 8f7a86953817985bae9412d707f79d60dcf1bd08..d078304be84b719b709c0eeb949b5d15518b445d 100644 (file)
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -46,7 +46,7 @@
 #endif
 
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 #include "datatypes.h"
 #include "driver.h"
 

diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index 5f02b9542dd54bfda22e216b65e125a532609744..0ccab50a2aba6aea3c578bb6ecb4f60df452b7c4 100644 (file)
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -31,7 +31,7 @@
 #include <sys/socket.h>
 
 #include "internal.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virterror_internal.h"
 #include "datatypes.h"
 #include "virfile.h"

diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index 77457c8c02614d35ff033710252ffc1dcd3a6c93..b7e6630f3d704dad893b0e1dc9931d410f5f991e 100644 (file)
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -31,7 +31,7 @@
 #include <fcntl.h>
 
 #include "internal.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virterror_internal.h"
 #include "virconf.h"
 #include "datatypes.h"

diff --git a/src/locking/domain_lock.c b/src/locking/domain_lock.c
index 1e3da5fa5a4e96377855055bd411b6961a141f79..00861cfec067de30236cbf71c3749d3d7e42d089 100644 (file)
--- a/src/locking/domain_lock.c
+++ b/src/locking/domain_lock.c
@@ -25,7 +25,7 @@
 #include "memory.h"
 #include "uuid.h"
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 
 #define VIR_FROM_THIS VIR_FROM_LOCKING
 

diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c
index 08caa1644ae93c283d475514ecf3983e61c5d405..3c2a50c15a240b6d81fb16ad5c93bc8f2d7c92b8 100644 (file)
--- a/src/locking/lock_daemon.c
+++ b/src/locking/lock_daemon.c
@@ -38,7 +38,7 @@
 #include "virpidfile.h"
 #include "virprocess.h"
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 #include "memory.h"
 #include "virconf.h"
 #include "rpc/virnetserver.h"

diff --git a/src/locking/lock_daemon_config.c b/src/locking/lock_daemon_config.c
index c2d9a76129db60e126bd77221d0934ae250e4cc1..9557b8c2bb4fd3c65c07e8159954f36db1c91739 100644 (file)
--- a/src/locking/lock_daemon_config.c
+++ b/src/locking/lock_daemon_config.c
@@ -27,7 +27,7 @@
 #include "virconf.h"
 #include "memory.h"
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 #include "rpc/virnetserver.h"
 #include "configmake.h"
 

diff --git a/src/locking/lock_daemon_dispatch.c b/src/locking/lock_daemon_dispatch.c
index bb4dcfa12bc39d47f0012d4101b6220af8930268..78c97266b50a56dbb69c78051fd2015ca5d36ac8 100644 (file)
--- a/src/locking/lock_daemon_dispatch.c
+++ b/src/locking/lock_daemon_dispatch.c
@@ -25,7 +25,7 @@
 #include "rpc/virnetserver.h"
 #include "rpc/virnetserverclient.h"
 #include "util.h"
-#include "logging.h"
+#include "virlog.h"
 
 #include "lock_daemon.h"
 #include "lock_protocol.h"

diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c
index c88c5af9aa4c2d17184a71db11d5f7f93dea9908..d5d721d6d3ec787e79d0807fa7c706dee2a36ec4 100644 (file)
--- a/src/locking/lock_driver_lockd.c
+++ b/src/locking/lock_driver_lockd.c
@@ -24,7 +24,7 @@
 #include "lock_driver.h"
 #include "virconf.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "uuid.h"
 #include "util.h"
 #include "virfile.h"

diff --git a/src/locking/lock_driver_nop.c b/src/locking/lock_driver_nop.c
index c9ab806f0dfccdc13f93280118e9f745cf91674e..745a0bf41c63b66964905101d93cabaa71183392 100644 (file)
--- a/src/locking/lock_driver_nop.c
+++ b/src/locking/lock_driver_nop.c
@@ -23,7 +23,7 @@
 
 #include "lock_driver_nop.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "uuid.h"
 
 

diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c
index 2eadc07f72c1f02286935b5b1c9ecb1e5da15a97..1e8df2625d1d7a3d410433d5071927563e715771 100644 (file)
--- a/src/locking/lock_driver_sanlock.c
+++ b/src/locking/lock_driver_sanlock.c
@@ -37,7 +37,7 @@
 
 #include "dirname.h"
 #include "lock_driver.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virterror_internal.h"
 #include "memory.h"
 #include "util.h"

diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c
index e6d930854edcf083e3ac3262aa8d4d6732e8bb8a..f038d4e27f3f23d8deb6467adf35081dea14a4ae 100644 (file)
--- a/src/locking/lock_manager.c
+++ b/src/locking/lock_manager.c
@@ -24,7 +24,7 @@
 #include "lock_manager.h"
 #include "lock_driver_nop.h"
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 #include "util.h"
 #include "memory.h"
 #include "uuid.h"

diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c
index 5f092de20622817ae99f365334c6af4499ec6879..d023b84b1b929cbaf6c208736bbce41fabe9783a 100644 (file)
--- a/src/lxc/lxc_cgroup.c
+++ b/src/lxc/lxc_cgroup.c
@@ -25,7 +25,7 @@
 #include "lxc_container.h"
 #include "virfile.h"
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 #include "memory.h"
 #include "vircgroup.h"
 

diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c
index 905734b5fb7943cc5945aa9054b359da67bb8372..a5ba2f75687409eac360bc59f50d23cc6302bf4f 100644 (file)
--- a/src/lxc/lxc_conf.c
+++ b/src/lxc/lxc_conf.c
@@ -31,7 +31,7 @@
 #include "virterror_internal.h"
 #include "virconf.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "uuid.h"
 #include "configmake.h"
 #include "lxc_container.h"

diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 717811f3afb24f534bbcb54bbbda3f4ec0709c7c..760d3af631ca603d8263ff1ae585d479d9f9fb67 100644 (file)
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -54,7 +54,7 @@
 #endif
 
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 #include "lxc_container.h"
 #include "util.h"
 #include "memory.h"

diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index bfe21268d05a8df679e30aa96afe634924cac883..f0e08e33919ff8a0ce31746d2a2e186a92445974 100644 (file)
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -52,7 +52,7 @@
 #endif
 
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 #include "util.h"
 
 #include "lxc_conf.h"

diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c
index bd80d9fe9a9945ca5fa48e1856af77a6c2336361..77a64dd134c08db3e038fabb647bccf61e0e80cf 100644 (file)
--- a/src/lxc/lxc_domain.c
+++ b/src/lxc/lxc_domain.c
@@ -24,7 +24,7 @@
 #include "lxc_domain.h"
 
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virterror_internal.h"
 
 #define VIR_FROM_THIS VIR_FROM_LXC

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 6f297680b8d876f6e4b6aaacf916d4492a88a39d..826532838be3b29646272167138e69274103a09b 100644 (file)
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -37,7 +37,7 @@
 #include <wait.h>
 
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 #include "datatypes.h"
 #include "lxc_cgroup.h"
 #include "lxc_conf.h"

diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c
index 4e7df552eaca3fdb7a358d90feca3dcd0ec4b685..485456ef368b0cad447b47d0cbd802b9e8997584 100644 (file)
--- a/src/lxc/lxc_fuse.c
+++ b/src/lxc/lxc_fuse.c
@@ -32,7 +32,7 @@
 #include "lxc_fuse.h"
 #include "lxc_cgroup.h"
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virfile.h"
 #include "virbuffer.h"
 

diff --git a/src/lxc/lxc_hostdev.c b/src/lxc/lxc_hostdev.c
index c063aa01899d9696f11484d997eda3f97d4e2dc3..aa450ecfe8eb039b69313350cf5e4bb575e8229e 100644 (file)
--- a/src/lxc/lxc_hostdev.c
+++ b/src/lxc/lxc_hostdev.c
@@ -24,7 +24,7 @@
 #include <config.h>
 
 #include "lxc_hostdev.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virterror_internal.h"
 #include "memory.h"
 

diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c
index 4d177c9596b1c7498968978a0e99a65c3c715d5f..9eb587d8af4b4d0e904663a0b7ffee4833cc4f63 100644 (file)
--- a/src/lxc/lxc_monitor.c
+++ b/src/lxc/lxc_monitor.c
@@ -28,7 +28,7 @@
 #include "memory.h"
 
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 #include "threads.h"
 #include "rpc/virnetclient.h"
 

diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
index fa53217f9c595b5cd3effeb8cb4a7be7324aab1f..762a23de2f2a1d58d7819852062bc2341274b652 100644 (file)
--- a/src/lxc/lxc_process.c
+++ b/src/lxc/lxc_process.c
@@ -41,7 +41,7 @@
 #include "memory.h"
 #include "domain_audit.h"
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 #include "vircommand.h"
 #include "lxc_hostdev.h"
 #include "virhook.h"

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index fdac7120550bc409a3bf1a5746163a81ecd2756b..e33650384fd9717b39dce77b5289769752d4d5a3 100644 (file)
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -57,7 +57,7 @@
 #include "memory.h"
 #include "uuid.h"
 #include "viriptables.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virdnsmasq.h"
 #include "configmake.h"
 #include "virnetdev.h"

diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c
index 4d3e01b428f58a27ea6f59e846ad58c7a38ea1c7..48360e3b73afd044b1b596f8a82a9d3a1962faaf 100644 (file)
--- a/src/node_device/node_device_driver.c
+++ b/src/node_device/node_device_driver.c
@@ -33,7 +33,7 @@
 #include "virterror_internal.h"
 #include "datatypes.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "node_device_conf.h"
 #include "node_device_hal.h"
 #include "node_device_driver.h"

diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c
index 080aaeda45a3620249f8e85487cfbfac8faf5a75..59ba5c384c325768d2f57f6b62036dd07c0d0cd8 100644 (file)
--- a/src/node_device/node_device_hal.c
+++ b/src/node_device/node_device_hal.c
@@ -36,7 +36,7 @@
 #include "memory.h"
 #include "uuid.h"
 #include "pci.h"
-#include "logging.h"
+#include "virlog.h"
 #include "node_device_driver.h"
 #include "virdbus.h"
 

diff --git a/src/node_device/node_device_linux_sysfs.c b/src/node_device/node_device_linux_sysfs.c
index 3048e3360fce4ec21e128925e32d23909817814c..fbe0da517b431c94d3393569708c617c7082d04c 100644 (file)
--- a/src/node_device/node_device_linux_sysfs.c
+++ b/src/node_device/node_device_linux_sysfs.c
@@ -30,7 +30,7 @@
 #include "node_device_hal.h"
 #include "virterror_internal.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virfile.h"
 
 #define VIR_FROM_THIS VIR_FROM_NODEDEV

diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index b3499fb3049079feea127e726b100f183663a536..fef00ad131b7b7b968a5d7fa1029ae412e48a0f7 100644 (file)
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -32,7 +32,7 @@
 #include "node_device_driver.h"
 #include "driver.h"
 #include "datatypes.h"
-#include "logging.h"
+#include "virlog.h"
 #include "memory.h"
 #include "uuid.h"
 #include "util.h"

diff --git a/src/nodeinfo.c b/src/nodeinfo.c
index 48fa21de7af9c2f8ca06f1de45f5e980988c78c7..0a456fa5dc67455925ea236ad993905f12889e74 100644 (file)
--- a/src/nodeinfo.c
+++ b/src/nodeinfo.c
@@ -48,7 +48,7 @@
 #include "nodeinfo.h"
 #include "physmem.h"
 #include "util.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virterror_internal.h"
 #include "count-one-bits.h"
 #include "intprops.h"

diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c
index e4c895fc4d21799605f3e1a6c8010022b1690352..68aa233fbfc80e2216d2519eec22db5efd1f7fc0 100644 (file)
--- a/src/nwfilter/nwfilter_dhcpsnoop.c
+++ b/src/nwfilter/nwfilter_dhcpsnoop.c
@@ -55,7 +55,7 @@
 #include <net/if.h>
 
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "datatypes.h"
 #include "virterror_internal.h"
 #include "conf/domain_conf.h"

diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
index 3aa026ae4d50389c20de2e64ab562d9b8ce54d43..7fde656bf7b24f2557ca3ac4748fff5672832810 100644 (file)
--- a/src/nwfilter/nwfilter_driver.c
+++ b/src/nwfilter/nwfilter_driver.c
@@ -28,7 +28,7 @@
 #include <config.h>
 
 #include "virdbus.h"
-#include "logging.h"
+#include "virlog.h"
 
 #include "internal.h"
 

diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c
index 6966acffc24c767d1047c607fa7386d1f941f83e..23a43d2da312ed98fb2dfb9d9e44e7e011fd360d 100644 (file)
--- a/src/nwfilter/nwfilter_ebiptables_driver.c
+++ b/src/nwfilter/nwfilter_ebiptables_driver.c
@@ -32,7 +32,7 @@
 
 #include "virbuffer.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virterror_internal.h"
 #include "domain_conf.h"
 #include "nwfilter_conf.h"

diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c
index 572acf4c8bb3d141f5e5855ec3debb17642cfff7..6be4a930f81c3b3cb865eebc2526a3e6401eb643 100644 (file)
--- a/src/nwfilter/nwfilter_gentech_driver.c
+++ b/src/nwfilter/nwfilter_gentech_driver.c
@@ -27,7 +27,7 @@
 #include "internal.h"
 
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "domain_conf.h"
 #include "virterror_internal.h"
 #include "nwfilter_gentech_driver.h"

diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c
index 361bdce3b234fd48529340be92e5bfc5ec915d71..110eae845e32149b35e7e64355ccaf1e9f090b5f 100644 (file)
--- a/src/nwfilter/nwfilter_learnipaddr.c
+++ b/src/nwfilter/nwfilter_learnipaddr.c
@@ -43,7 +43,7 @@
 #include "intprops.h"
 #include "virbuffer.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "datatypes.h"
 #include "virnetdev.h"
 #include "virterror_internal.h"

diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index 9297777d6e17279f91b11dfb51b096a4c96eb4d8..e51bf296c13277fa5d938caa65c41e4881d572de 100644 (file)
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -55,7 +55,7 @@
 #include "memory.h"
 #include "virfile.h"
 #include "virtypedparam.h"
-#include "logging.h"
+#include "virlog.h"
 #include "vircommand.h"
 #include "viruri.h"
 #include "stats_linux.h"

diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c
index 641491398f82564203c328ab8127f246d9bd0476..cc65117b0e98f2a90e418810beaa74ed06319389 100644 (file)
--- a/src/parallels/parallels_driver.c
+++ b/src/parallels/parallels_driver.c
@@ -44,7 +44,7 @@
 #include "virterror_internal.h"
 #include "memory.h"
 #include "util.h"
-#include "logging.h"
+#include "virlog.h"
 #include "vircommand.h"
 #include "configmake.h"
 #include "storage_file.h"

diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index e81bc090fa9a629525df5ffaf85a17a049725512..f1d994c02e42ee4f30d6b69c3690661c9e2a7b57 100644 (file)
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -48,7 +48,7 @@
 #include "datatypes.h"
 #include "virbuffer.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "driver.h"
 #include "libvirt/libvirt.h"
 #include "virterror_internal.h"

diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index 6727294979ea3eb7eb2196433cfee4de5debedc1..421e43f0945ef489d2e401b5b1ed288b77b5cf46 100644 (file)
--- a/src/qemu/qemu_agent.c
+++ b/src/qemu/qemu_agent.c
@@ -35,7 +35,7 @@
 #include "qemu_agent.h"
 #include "qemu_command.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virterror_internal.h"
 #include "virjson.h"
 #include "virfile.h"

diff --git a/src/qemu/qemu_bridge_filter.c b/src/qemu/qemu_bridge_filter.c
index a6d0d4f1ab59b0415f608888abe83288a24b4613..08a9f1a67c2611b78d3950e1fb3ed0c0b891b8fd 100644 (file)
--- a/src/qemu/qemu_bridge_filter.c
+++ b/src/qemu/qemu_bridge_filter.c
@@ -27,7 +27,7 @@
 #include "qemu_driver.h"
 #include "util.h"
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 
 #include "qemu_bridge_filter.h"
 

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index c4cf367f4a932ad4cd96665cfead3a38b3e43020..592ddd1e73aee2630773e6190a448ed374530328 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -25,7 +25,7 @@
 
 #include "qemu_capabilities.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virterror_internal.h"
 #include "util.h"
 #include "virfile.h"

diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index 445d085a9e4927559828ba9db6504db799bc10dc..80ceee5459de10968356c10f72713d3d51b7f8c4 100644 (file)
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -27,7 +27,7 @@
 #include "qemu_domain.h"
 #include "qemu_process.h"
 #include "vircgroup.h"
-#include "logging.h"
+#include "virlog.h"
 #include "memory.h"
 #include "virterror_internal.h"
 #include "util.h"

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 199eb6d1eac28281fdb94d7dacc5ca1c33e77ee5..52a96b941cfe75ce81eaf787c53c4f513eb9e451 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -29,7 +29,7 @@
 #include "qemu_bridge_filter.h"
 #include "cpu/cpu.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virterror_internal.h"
 #include "util.h"
 #include "virarch.h"

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 91af49bf29413c5d87758f11ec2edb4d8b7a6b80..2073fd5acb3d015b2e91c909e43f834d7498199a 100644 (file)
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -47,7 +47,7 @@
 #include "datatypes.h"
 #include "xml.h"
 #include "nodeinfo.h"
-#include "logging.h"
+#include "virlog.h"
 #include "cpu/cpu.h"
 #include "domain_nwfilter.h"
 #include "virfile.h"

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 8d8cf02c355c3cfb9589537f9c90b89fd7fdc5b0..e6eaa58413df01ba189c1ca2026435562c88a5cf 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -28,7 +28,7 @@
 #include "qemu_capabilities.h"
 #include "qemu_migration.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virterror_internal.h"
 #include "c-ctype.h"
 #include "cpu/cpu.h"

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 477c20883444403a0d2cc1369fccce4bcfdc8fea..4d81a730ecb3eeeff22ff1611b64d239dfd4a9fa 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -59,7 +59,7 @@
 #include "qemu_migration.h"
 
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 #include "datatypes.h"
 #include "virbuffer.h"
 #include "util.h"

diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c
index 08094d1cdbf71a42bc05d0aed41dc0bc777cb758..94b5ae003acc9e83b9b206283d5b6870f52f39d2 100644 (file)
--- a/src/qemu/qemu_hostdev.c
+++ b/src/qemu/qemu_hostdev.c
@@ -24,7 +24,7 @@
 #include <config.h>
 
 #include "qemu_hostdev.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virterror_internal.h"
 #include "memory.h"
 #include "pci.h"

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 5aab00bfeba556ffcaf13e20b72233351689e69b..f8420c4c3d325af5c980a74278366b6bb0ad715a 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -32,7 +32,7 @@
 #include "qemu_hostdev.h"
 #include "domain_audit.h"
 #include "domain_nwfilter.h"
-#include "logging.h"
+#include "virlog.h"
 #include "datatypes.h"
 #include "virterror_internal.h"
 #include "memory.h"

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index d7cdcaf3fde4f2f38392678a3ca7d3c430224338..4248298ee81e7ec46b7ddfa295d785f10a4af2b0 100644 (file)
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -36,7 +36,7 @@
 #include "qemu_cgroup.h"
 
 #include "domain_audit.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virterror_internal.h"
 #include "memory.h"
 #include "util.h"

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 131e8df358d2edc3f273da7b9c607d7d7bed63a7..920453d27028722b39c682c72dcdb951e15e01f1 100644 (file)
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -33,7 +33,7 @@
 #include "qemu_monitor_json.h"
 #include "virterror_internal.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virfile.h"
 #include "virprocess.h"
 #include "virobject.h"

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 618166883a035d30369c534b6a6ccdaa0c29dc55..e14134b47a29cb57c749336b47a582dd3bac165f 100644 (file)
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -36,7 +36,7 @@
 #include "qemu_command.h"
 #include "qemu_capabilities.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "driver.h"
 #include "datatypes.h"
 #include "virterror_internal.h"

diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
index a12adb65c6fc7beea9d54973279b86b750ce9c88..28690b16cbfc117851deccf33e43f28efd760413 100644 (file)
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
@@ -35,7 +35,7 @@
 #include "c-ctype.h"
 #include "c-strcasestr.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "driver.h"
 #include "datatypes.h"
 #include "virterror_internal.h"

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index ef88ba2d4c7374ed788e2fbafd5e4a1614496dca..00ff24302e8fbc156e48e8999ff55ccaa42dd83c 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -51,7 +51,7 @@
 #endif
 
 #include "datatypes.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virterror_internal.h"
 #include "memory.h"
 #include "virhook.h"

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 8b77e7dfa2627fb838f796e062825e0b17cd4697..1e9151ab6cfc6cd3aea7f4750a64f16a71dc28fb 100644 (file)
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -30,7 +30,7 @@
 #include "virnetclientprogram.h"
 #include "virnetclientstream.h"
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 #include "datatypes.h"
 #include "domain_event.h"
 #include "driver.h"

diff --git a/src/rpc/virkeepalive.c b/src/rpc/virkeepalive.c
index 309f22f87c7193c6aa3dbda4a9b113371ae674ed..8fc1cba46b7bb193bdc9a6a588514b303340cedb 100644 (file)
--- a/src/rpc/virkeepalive.c
+++ b/src/rpc/virkeepalive.c
@@ -25,7 +25,7 @@
 #include "memory.h"
 #include "threads.h"
 #include "virfile.h"
-#include "logging.h"
+#include "virlog.h"
 #include "util.h"
 #include "virterror_internal.h"
 #include "virnetsocket.h"

diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
index bf2547cd6ed79652369b6deb887d2f6d640694e6..7370ae06d73d07c7a490b2bd359c7b384427c20c 100644 (file)
--- a/src/rpc/virnetclient.c
+++ b/src/rpc/virnetclient.c
@@ -33,7 +33,7 @@
 #include "memory.h"
 #include "threads.h"
 #include "virfile.h"
-#include "logging.h"
+#include "virlog.h"
 #include "util.h"
 #include "virterror_internal.h"
 

diff --git a/src/rpc/virnetclientprogram.c b/src/rpc/virnetclientprogram.c
index 1f08640aeb1fbf54a78121c11641e69dce70cd49..dec3943a892c73f64e6a5c2973cffcc6a050efb6 100644 (file)
--- a/src/rpc/virnetclientprogram.c
+++ b/src/rpc/virnetclientprogram.c
@@ -30,7 +30,7 @@
 
 #include "memory.h"
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 #include "util.h"
 #include "virfile.h"
 #include "threads.h"

diff --git a/src/rpc/virnetclientstream.c b/src/rpc/virnetclientstream.c
index 0e7e38e76a58b39588796b1dd728e1d069611964..26dc2924c703d5316a2c733399cdecb68fb1d3c8 100644 (file)
--- a/src/rpc/virnetclientstream.c
+++ b/src/rpc/virnetclientstream.c
@@ -26,7 +26,7 @@
 #include "virnetclient.h"
 #include "memory.h"
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 #include "threads.h"
 
 #define VIR_FROM_THIS VIR_FROM_RPC

diff --git a/src/rpc/virnetmessage.c b/src/rpc/virnetmessage.c
index cf76e2133b7d1b8324c111cac1d1e9044709ae75..16d8e61ba6bf9419cac81ab151a635927e3101b6 100644 (file)
--- a/src/rpc/virnetmessage.c
+++ b/src/rpc/virnetmessage.c
@@ -26,7 +26,7 @@
 #include "virnetmessage.h"
 #include "memory.h"
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virfile.h"
 #include "util.h"
 

diff --git a/src/rpc/virnetsaslcontext.c b/src/rpc/virnetsaslcontext.c
index b6b68d5556792030fb4255a50d3cad7fca37a3c3..e880127fcc4e101513466458911943d35b5cfd9c 100644 (file)
--- a/src/rpc/virnetsaslcontext.c
+++ b/src/rpc/virnetsaslcontext.c
@@ -28,7 +28,7 @@
 #include "virterror_internal.h"
 #include "memory.h"
 #include "threads.h"
-#include "logging.h"
+#include "virlog.h"
 
 #define VIR_FROM_THIS VIR_FROM_RPC
 

diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
index f686a8ff4f9f70fe8ca45f9bc82cb3cfabec51bf..6d3532ad6e4a3ba3a27fe6ec418db857ca8fa18a 100644 (file)
--- a/src/rpc/virnetserver.c
+++ b/src/rpc/virnetserver.c
@@ -28,7 +28,7 @@
 #include <fcntl.h>
 
 #include "virnetserver.h"
-#include "logging.h"
+#include "virlog.h"
 #include "memory.h"
 #include "virterror_internal.h"
 #include "threads.h"

diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c
index ed26719741d19d8aa9466a4338d617070e96326c..9642ea5496551d2b163cec0f8277cf7180a4118a 100644 (file)
--- a/src/rpc/virnetserverclient.c
+++ b/src/rpc/virnetserverclient.c
@@ -29,7 +29,7 @@
 
 #include "virnetserverclient.h"
 
-#include "logging.h"
+#include "virlog.h"
 #include "virterror_internal.h"
 #include "memory.h"
 #include "threads.h"

diff --git a/src/rpc/virnetservermdns.c b/src/rpc/virnetservermdns.c
index 166b4eba219831821798046630fb183fdea26db5..c17b65dd30501e8b426a4e08f594f052c70c27f3 100644 (file)
--- a/src/rpc/virnetservermdns.c
+++ b/src/rpc/virnetservermdns.c
@@ -44,7 +44,7 @@
 #include "vireventpoll.h"
 #include "memory.h"
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 
 #define VIR_FROM_THIS VIR_FROM_RPC
 

diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c
index e4aa2da2cda7acaab93119cdd025236c6f0231b1..5b96c34039689137349730156f1b4067547ba134 100644 (file)
--- a/src/rpc/virnetserverprogram.c
+++ b/src/rpc/virnetserverprogram.c
@@ -28,7 +28,7 @@
 
 #include "memory.h"
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virfile.h"
 #include "threads.h"
 

diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
index 5a2eab3c4c64b2650180a20305fe3b70fb8f3a62..aa8f4b9c472a9b206c71f20b35c05627ab099e64 100644 (file)
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -44,7 +44,7 @@
 #include "util.h"
 #include "memory.h"
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virfile.h"
 #include "threads.h"
 #include "virprocess.h"

diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c
index d89056967b715beb081e619104c089b1e3d758a3..734acaaba45a2c1360856c08b20993a4c69f673f 100644 (file)
--- a/src/rpc/virnetsshsession.c
+++ b/src/rpc/virnetsshsession.c
@@ -28,7 +28,7 @@
 #include "internal.h"
 #include "virbuffer.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "configmake.h"
 #include "threads.h"
 #include "util.h"

diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c
index 1d32327fb694f4d00f19d6c1cc7c7b579e15bb85..29310030df58d8e4f7a4735cd9968d0fce53ba6a 100644 (file)
--- a/src/rpc/virnettlscontext.c
+++ b/src/rpc/virnettlscontext.c
@@ -33,7 +33,7 @@
 #include "memory.h"
 #include "virterror_internal.h"
 #include "util.h"
-#include "logging.h"
+#include "virlog.h"
 #include "threads.h"
 #include "configmake.h"
 

diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c
index d9ba42bc2654fbc807ab25e7df709a2276a0b350..415935801fd8a77e19ffadbaa54c58e1151602ec 100644 (file)
--- a/src/secret/secret_driver.c
+++ b/src/secret/secret_driver.c
@@ -32,7 +32,7 @@
 #include "base64.h"
 #include "datatypes.h"
 #include "driver.h"
-#include "logging.h"
+#include "virlog.h"
 #include "memory.h"
 #include "secret_conf.h"
 #include "secret_driver.h"

diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c
index 2b3a2e20fc5535561b3d27e4365382b85fac62f6..92620919ea4b879c8e0e79cb484ac7896645874d 100644 (file)
--- a/src/security/security_apparmor.c
+++ b/src/security/security_apparmor.c
@@ -48,7 +48,7 @@
 #include "virfile.h"
 #include "configmake.h"
 #include "vircommand.h"
-#include "logging.h"
+#include "virlog.h"
 
 #define VIR_FROM_THIS VIR_FROM_SECURITY
 #define SECURITY_APPARMOR_VOID_DOI      "0"

diff --git a/src/security/security_dac.c b/src/security/security_dac.c
index 8ad61d74a9fbcaad58a7107c79503788ed406075..931ae4ee56aabee13447aa33fdbc2ce48a50daed 100644 (file)
--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
@@ -27,7 +27,7 @@
 #include "virterror_internal.h"
 #include "util.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "pci.h"
 #include "virusb.h"
 #include "storage_file.h"

diff --git a/src/security/security_driver.c b/src/security/security_driver.c
index c7ff8a570956c14b3418b00835d5ed1ec5273c6e..82d3ca9cb5908f53c06f3cc32f2ba468303f931b 100644 (file)
--- a/src/security/security_driver.c
+++ b/src/security/security_driver.c
@@ -24,7 +24,7 @@
 #include <string.h>
 
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 
 #include "security_driver.h"
 #ifdef WITH_SECDRIVER_SELINUX

diff --git a/src/security/security_manager.c b/src/security/security_manager.c
index db9483763bab6e523c64ece4437efea723210f59..c675715c6881d1f89dfbf0450ff7ff1dd696be3f 100644 (file)
--- a/src/security/security_manager.c
+++ b/src/security/security_manager.c
@@ -28,7 +28,7 @@
 #include "security_dac.h"
 #include "virterror_internal.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 
 #define VIR_FROM_THIS VIR_FROM_SECURITY
 

diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index 8ac647309d02b01a180d0c436f7830a43ad7b5e1..11f839f3339df28796a6ca0b2c2c7b9f0d7b99ac 100644 (file)
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -36,7 +36,7 @@
 #include "virterror_internal.h"
 #include "util.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "pci.h"
 #include "virusb.h"
 #include "storage_file.h"

diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
index 083028d89ade87a70769800f5bb7b1c4422fcd68..899caeb5ed684328d6b4b94ab108df186d3b2612 100644 (file)
--- a/src/storage/storage_backend.c
+++ b/src/storage/storage_backend.c
@@ -54,7 +54,7 @@
 #include "uuid.h"
 #include "storage_file.h"
 #include "storage_backend.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virfile.h"
 #include "stat-time.h"
 

diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c
index c6aa40701af8d8a81c5cc2c9a32a0a01a6387ea1..7e1d3ecbb628f3d4a452ff528c47648732c42bdd 100644 (file)
--- a/src/storage/storage_backend_disk.c
+++ b/src/storage/storage_backend_disk.c
@@ -27,7 +27,7 @@
 #include <stdio.h>
 
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 #include "storage_backend_disk.h"
 #include "util.h"
 #include "memory.h"

diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
index cdf93af0325cbe529b600fbbb2cd21b896403788..78b50f003c27def6b0e035aeb712532a8ea7b664 100644 (file)
--- a/src/storage/storage_backend_fs.c
+++ b/src/storage/storage_backend_fs.c
@@ -49,7 +49,7 @@
 #include "memory.h"
 #include "xml.h"
 #include "virfile.h"
-#include "logging.h"
+#include "virlog.h"
 
 #define VIR_FROM_THIS VIR_FROM_STORAGE
 

diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c
index c468b1be6ee62528df7bf3c71a66e20c8f497d32..46659af4030374186b100cda5f9614bc33f9981b 100644 (file)
--- a/src/storage/storage_backend_iscsi.c
+++ b/src/storage/storage_backend_iscsi.c
@@ -39,7 +39,7 @@
 #include "storage_backend_iscsi.h"
 #include "util.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virfile.h"
 #include "vircommand.h"
 #include "virrandom.h"

diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c
index 53e6c6172e0431091d49e25c62887972ae36dc43..f28c663661ccc217b2c0737e932771ce6efa8fb7 100644 (file)
--- a/src/storage/storage_backend_logical.c
+++ b/src/storage/storage_backend_logical.c
@@ -36,7 +36,7 @@
 #include "storage_conf.h"
 #include "vircommand.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virfile.h"
 
 #define VIR_FROM_THIS VIR_FROM_STORAGE

diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_backend_mpath.c
index efcfb285268a75cff5e9b47a6ee6dc71e6b21365..1ca120fb330cd6e7a2218d45bf62cbd0496ff21e 100644 (file)
--- a/src/storage/storage_backend_mpath.c
+++ b/src/storage/storage_backend_mpath.c
@@ -33,7 +33,7 @@
 #include "storage_conf.h"
 #include "storage_backend.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virfile.h"
 
 #define VIR_FROM_THIS VIR_FROM_STORAGE

diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c
index bc61cf7dfa267ed6272bf3495d9ed83a3c19e0c8..4e58911f8f5ca9e71fc792eefd15bbec7c47d721 100644 (file)
--- a/src/storage/storage_backend_rbd.c
+++ b/src/storage/storage_backend_rbd.c
@@ -27,7 +27,7 @@
 #include "storage_conf.h"
 #include "util.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "base64.h"
 #include "uuid.h"
 #include "rados/librados.h"

diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c
index 6515e57f0d365385a757626cc4448a190c8fe811..32713be0c5557a98456e032602223852cd626813 100644 (file)
--- a/src/storage/storage_backend_scsi.c
+++ b/src/storage/storage_backend_scsi.c
@@ -31,7 +31,7 @@
 #include "virterror_internal.h"
 #include "storage_backend_scsi.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virfile.h"
 #include "vircommand.h"
 

diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c
index ecca7a806aac112ae664684648c4dc339d608faf..05deeeb161d8adb95daf7582e3779e4006cd55c8 100644 (file)
--- a/src/storage/storage_backend_sheepdog.c
+++ b/src/storage/storage_backend_sheepdog.c
@@ -32,7 +32,7 @@
 #include "vircommand.h"
 #include "util.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 
 #define VIR_FROM_THIS VIR_FROM_STORAGE
 

diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index c567fffc4b3ac47cef88368fa0f47c3b55cfd40a..6076f6cbbb7b76dff303734410157c3bbd8be1d5 100644 (file)
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -44,7 +44,7 @@
 #include "storage_conf.h"
 #include "memory.h"
 #include "storage_backend.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virfile.h"
 #include "fdstream.h"
 #include "configmake.h"

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 63066beab367ca261843e12a629cd4a984b9d766..8dd56948077d45fa93313b4b2e46a760f413566d 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -48,7 +48,7 @@
 #include "node_device_conf.h"
 #include "xml.h"
 #include "threads.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virfile.h"
 #include "virtypedparam.h"
 #include "virrandom.h"

diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c
index b669b5a292a55e7c9a0a7642e50a716f42c2f5c2..6b14f231e33a3d3110aeff083a2ae3cd15d002a8 100644 (file)
--- a/src/uml/uml_conf.c
+++ b/src/uml/uml_conf.c
@@ -41,7 +41,7 @@
 #include "util.h"
 #include "memory.h"
 #include "nodeinfo.h"
-#include "logging.h"
+#include "virlog.h"
 #include "domain_nwfilter.h"
 #include "virfile.h"
 #include "vircommand.h"

diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
index 8dece668509e5e99cd1230f9cabd70d490d9a62e..90c9b662cae034e2ad34301ac46825c373ce855c 100644 (file)
--- a/src/uml/uml_driver.c
+++ b/src/uml/uml_driver.c
@@ -56,7 +56,7 @@
 #include "domain_conf.h"
 #include "domain_audit.h"
 #include "datatypes.h"
-#include "logging.h"
+#include "virlog.h"
 #include "domain_nwfilter.h"
 #include "virfile.h"
 #include "fdstream.h"

diff --git a/src/util/memory.c b/src/util/memory.c
index b224f303c0e1b132122ee17bf2542dd5e85ed986..186d3b61b4c1bb3689e68df6b3787042ed755d01 100644 (file)
--- a/src/util/memory.c
+++ b/src/util/memory.c
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 
 #if TEST_OOM
 static int testMallocNext = 0;

diff --git a/src/util/pci.c b/src/util/pci.c
index bf46fca303c99c38c016b2289d1499296940c8f0..7adce758b7a8540a6c8b5496972708deed579769 100644 (file)
--- a/src/util/pci.c
+++ b/src/util/pci.c
@@ -34,7 +34,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-#include "logging.h"
+#include "virlog.h"
 #include "memory.h"
 #include "vircommand.h"
 #include "virterror_internal.h"

diff --git a/src/util/storage_file.c b/src/util/storage_file.c
index eebf59a1da65308e3d2cf94d99e5ed4084e18dfa..6c3390b6c48c7c434ba3ad9f9a747d01825c8d31 100644 (file)
--- a/src/util/storage_file.c
+++ b/src/util/storage_file.c
@@ -37,7 +37,7 @@
 #include "dirname.h"
 #include "memory.h"
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virfile.h"
 #include "c-ctype.h"
 #include "vircommand.h"

diff --git a/src/util/sysinfo.c b/src/util/sysinfo.c
index 2f5c161c6c84f447cd2e7e629df70caf912e5b8a..f07c2d8344b365d0b970c00c768d5b9259910677 100644 (file)
--- a/src/util/sysinfo.c
+++ b/src/util/sysinfo.c
@@ -33,7 +33,7 @@
 #include "virterror_internal.h"
 #include "sysinfo.h"
 #include "util.h"
-#include "logging.h"
+#include "virlog.h"
 #include "memory.h"
 #include "vircommand.h"
 

diff --git a/src/util/util.c b/src/util/util.c
index f8ba7b491b8936081a68cadf9b513d5cee80274d..f941dfdb7949554e771fe5366e965121ec2960c8 100644 (file)
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -76,7 +76,7 @@
 #include "c-ctype.h"
 #include "dirname.h"
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virbuffer.h"
 #include "util.h"
 #include "storage_file.h"

diff --git a/src/util/uuid.c b/src/util/uuid.c
index 5c3b32c5e2eb2d5c7750e1f8af63b0c4d3884bd1..6efc7be91477dcbdb08e336e815c4de50191d17f 100644 (file)
--- a/src/util/uuid.c
+++ b/src/util/uuid.c
@@ -37,7 +37,7 @@
 #include "internal.h"
 #include "util.h"
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 #include "memory.h"
 #include "virfile.h"
 #include "virrandom.h"

diff --git a/src/util/virarch.c b/src/util/virarch.c
index 1376887577df595f7679cc056d3abe9db6ec9b20..ffd07dcabb27ab76d5577056623cba7add323af0 100644 (file)
--- a/src/util/virarch.c
+++ b/src/util/virarch.c
@@ -23,7 +23,7 @@
 
 #include <sys/utsname.h>
 
-#include "logging.h"
+#include "virlog.h"
 #include "virarch.h"
 #include "verify.h"
 

diff --git a/src/util/viraudit.c b/src/util/viraudit.c
index 9bdc5ed9938eabe418b3fa4affb6273739f48325..c4e0129716d2dc14a8a2affe0bf0a4bca5714986 100644 (file)
--- a/src/util/viraudit.c
+++ b/src/util/viraudit.c
@@ -28,7 +28,7 @@
 #include <unistd.h>
 
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 #include "viraudit.h"
 #include "util.h"
 #include "virfile.h"

diff --git a/src/util/virauth.c b/src/util/virauth.c
index 6d9935d6e55140964bd620762ec805ed2a9b8e23..a1bad6aa5f240af6e4d82b210386fd549a47ceac 100644 (file)
--- a/src/util/virauth.c
+++ b/src/util/virauth.c
@@ -27,7 +27,7 @@
 #include "virauth.h"
 #include "util.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "datatypes.h"
 #include "virterror_internal.h"
 #include "configmake.h"

diff --git a/src/util/virauthconfig.c b/src/util/virauthconfig.c
index 49a4466e0520ca0644f8ff2e720809e1b5e6a98b..46ba04051de971d312418ebbc72e25655330eb6e 100644 (file)
--- a/src/util/virauthconfig.c
+++ b/src/util/virauthconfig.c
@@ -27,7 +27,7 @@
 #include "virkeyfile.h"
 #include "memory.h"
 #include "util.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virterror_internal.h"
 
 

diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
index e9fc67ff26c4fc2434470f8664de21b0c5f1aec8..82e661346834a543adaaf5166fd6de50a2453180 100644 (file)
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -41,7 +41,7 @@
 #include "util.h"
 #include "memory.h"
 #include "vircgroup.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virfile.h"
 #include "virhash.h"
 #include "virhashcode.h"

diff --git a/src/util/vircommand.c b/src/util/vircommand.c
index 3046658a2de0259534ea52e546be6112b19ef255..7bed04e2451e658de9b2c74ddfdfd762c93b09b7 100644 (file)
--- a/src/util/vircommand.c
+++ b/src/util/vircommand.c
@@ -37,7 +37,7 @@
 #include "memory.h"
 #include "virterror_internal.h"
 #include "util.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virfile.h"
 #include "virpidfile.h"
 #include "virprocess.h"

diff --git a/src/util/virconf.c b/src/util/virconf.c
index 695e6d8f15383291bc82b80ac3a1733c0ac1127a..84d3c698b8363f8ca9c782b3b3d781a8a9090f82 100644 (file)
--- a/src/util/virconf.c
+++ b/src/util/virconf.c
@@ -35,7 +35,7 @@
 #include "virconf.h"
 #include "util.h"
 #include "c-ctype.h"
-#include "logging.h"
+#include "virlog.h"
 #include "memory.h"
 #include "virfile.h"
 

diff --git a/src/util/virdbus.c b/src/util/virdbus.c
index 2a96778d82f7cc671427ab622e9849d369101b9e..b6c66422337d3620d1d9531265ba478dc32cdb1b 100644 (file)
--- a/src/util/virdbus.c
+++ b/src/util/virdbus.c
@@ -24,7 +24,7 @@
 #include "virdbus.h"
 #include "memory.h"
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 #include "threads.h"
 
 #define VIR_FROM_THIS VIR_FROM_DBUS

diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c
index 1c930602dfcec62377b3420b8fbdf2a8e8b6fd9b..e1c3133ea54b2dd172d01483440bce89ca0f385c 100644 (file)
--- a/src/util/virdnsmasq.c
+++ b/src/util/virdnsmasq.c
@@ -47,7 +47,7 @@
 #include "vircommand.h"
 #include "memory.h"
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virfile.h"
 
 #define VIR_FROM_THIS VIR_FROM_NETWORK

diff --git a/src/util/virebtables.c b/src/util/virebtables.c
index 3b97c00c717c69031f5211305968e37a327c9e08..e8fdb8c584be354a1f80562f03298d7b111176ef 100644 (file)
--- a/src/util/virebtables.c
+++ b/src/util/virebtables.c
@@ -46,7 +46,7 @@
 #include "vircommand.h"
 #include "memory.h"
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 #include "threads.h"
 
 #if HAVE_FIREWALLD

diff --git a/src/util/virevent.c b/src/util/virevent.c
index 736f183fc602f9549794b9c4e9caacc956df354f..e45f96e9612b8faf6bd652119bf12d9c915c9202 100644 (file)
--- a/src/util/virevent.c
+++ b/src/util/virevent.c
@@ -25,7 +25,7 @@
 
 #include "virevent.h"
 #include "vireventpoll.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virterror_internal.h"
 
 #include <stdlib.h>

diff --git a/src/util/vireventpoll.c b/src/util/vireventpoll.c
index 287439f6a70eef9ba59593813584584e1e4e53ba..bdd405ff84500df6a9012a9a69cfb038ca2d88a6 100644 (file)
--- a/src/util/vireventpoll.c
+++ b/src/util/vireventpoll.c
@@ -32,7 +32,7 @@
 #include <fcntl.h>
 
 #include "threads.h"
-#include "logging.h"
+#include "virlog.h"
 #include "vireventpoll.h"
 #include "memory.h"
 #include "util.h"

diff --git a/src/util/virfile.c b/src/util/virfile.c
index d77b72661d93ea0f0455c1489899eb769f79ed51..30294a2917c6e3c57082511e4d4cd9c7d073c754 100644 (file)
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -41,7 +41,7 @@
 #include "configmake.h"
 #include "memory.h"
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/src/util/virhash.c b/src/util/virhash.c
index 1576dd326ac008c8d30a9fbb3863c98b0e3711c7..077abcac8a79813f66e6ec46a7cb756cd1864b10 100644 (file)
--- a/src/util/virhash.c
+++ b/src/util/virhash.c
@@ -27,7 +27,7 @@
 #include "virterror_internal.h"
 #include "virhash.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virhashcode.h"
 #include "virrandom.h"
 

diff --git a/src/util/virhook.c b/src/util/virhook.c
index 76571da17bb1208ca5e44089ba1bf8a63f0cb2f8..b005f392fff741b504343d32c6661af3dc1e9d2e 100644 (file)
--- a/src/util/virhook.c
+++ b/src/util/virhook.c
@@ -33,7 +33,7 @@
 #include "virterror_internal.h"
 #include "virhook.h"
 #include "util.h"
-#include "logging.h"
+#include "virlog.h"
 #include "memory.h"
 #include "virfile.h"
 #include "configmake.h"

diff --git a/src/util/viriptables.c b/src/util/viriptables.c
index 941dd46891dccc874a3a4da48868a7c8c11ed753..13dd31e24225f94027b9ab27c8a7804f252b1fdf 100644 (file)
--- a/src/util/viriptables.c
+++ b/src/util/viriptables.c
@@ -44,7 +44,7 @@
 #include "vircommand.h"
 #include "memory.h"
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 #include "threads.h"
 
 #if HAVE_FIREWALLD

diff --git a/src/util/virjson.c b/src/util/virjson.c
index a719989c7e1ba84d78bb1ac5c2e9b14743205d01..b0d5a1523bd6b036f250622149b4731c85fbe43a 100644 (file)
--- a/src/util/virjson.c
+++ b/src/util/virjson.c
@@ -26,7 +26,7 @@
 #include "virjson.h"
 #include "memory.h"
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 #include "util.h"
 
 #if HAVE_YAJL

diff --git a/src/util/virkeyfile.c b/src/util/virkeyfile.c
index 3c2ce2616cb95a77cf94aeb73d2421fccf8c8697..b43b92de53bda0176bcf3b14a6045a14f9918c7e 100644 (file)
--- a/src/util/virkeyfile.c
+++ b/src/util/virkeyfile.c
@@ -26,7 +26,7 @@
 #include <stdio.h>
 
 #include "c-ctype.h"
-#include "logging.h"
+#include "virlog.h"
 #include "memory.h"
 #include "util.h"
 #include "virhash.h"

diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c
index 99b61827a1774e109adfe4fd789903dbef149236..b6522946ae508d31bb02e9956e2d0065e3fb25c5 100644 (file)
--- a/src/util/virlockspace.c
+++ b/src/util/virlockspace.c
@@ -22,7 +22,7 @@
 #include <config.h>
 
 #include "virlockspace.h"
-#include "logging.h"
+#include "virlog.h"
 #include "memory.h"
 #include "virterror_internal.h"
 #include "util.h"

diff --git a/src/util/logging.c b/src/util/virlog.c
similarity index 99%
rename from src/util/logging.c
rename to src/util/virlog.c
index 0df354905a1b903f1d21bf3f59d49031ff9dc861..3e0f7059ba9bcc3478b1aba63ebf931b5a95febf 100644 (file)
--- a/src/util/logging.c
+++ b/src/util/virlog.c
@@ -1,5 +1,5 @@
 /*
- * logging.c: internal logging and debugging
+ * virlog.c: internal logging and debugging
  *
  * Copyright (C) 2008, 2010-2012 Red Hat, Inc.
  *
@@ -41,7 +41,7 @@
 #endif
 
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 #include "memory.h"
 #include "util.h"
 #include "virbuffer.h"

diff --git a/src/util/logging.h b/src/util/virlog.h
similarity index 99%
rename from src/util/logging.h
rename to src/util/virlog.h
index 028b791ac930da3d1164b93882f022ab3e101cc3..aa81d6a57887159a85db95be590ac231a3d58542 100644 (file)
--- a/src/util/logging.h
+++ b/src/util/virlog.h
@@ -1,5 +1,5 @@
 /*
- * logging.h: internal logging and debugging
+ * virlog.h: internal logging and debugging
  *
  * Copyright (C) 2006-2008, 2011-2012 Red Hat, Inc.
  *

diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
index ba09891d1e6b56c106bf2900a2ed77d84dfc4846..5846aff5dba7d52307e3c1f883febb19696869d0 100644 (file)
--- a/src/util/virnetdev.c
+++ b/src/util/virnetdev.c
@@ -29,7 +29,7 @@
 #include "vircommand.h"
 #include "memory.h"
 #include "pci.h"
-#include "logging.h"
+#include "virlog.h"
 
 #include <sys/ioctl.h>
 #include <net/if.h>

diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c
index 657c484158db9c03cf255a289247b915c43933d5..8d2574c88a4375231c06965b6f1e75102bf6aa00 100644 (file)
--- a/src/util/virnetdevmacvlan.c
+++ b/src/util/virnetdevmacvlan.c
@@ -57,7 +57,7 @@ VIR_ENUM_IMPL(virNetDevMacVLanMode, VIR_NETDEV_MACVLAN_MODE_LAST,
 # endif
 
 # include "memory.h"
-# include "logging.h"
+# include "virlog.h"
 # include "uuid.h"
 # include "virfile.h"
 # include "virnetlink.h"

diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c
index 0eadd6cf2e6ae821d097c0967e1f875e378f1204..644e9a4187a8a017880496a94bdd48b4331f5ad2 100644 (file)
--- a/src/util/virnetdevtap.c
+++ b/src/util/virnetdevtap.c
@@ -31,7 +31,7 @@
 #include "virfile.h"
 #include "virterror_internal.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "util.h"
 
 #include <sys/ioctl.h>

diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c
index 3261337751d242d15a1196d854f127fd5867a579..630b7c92a12fc358122583e47ca16e784f4fd3e6 100644 (file)
--- a/src/util/virnetdevveth.c
+++ b/src/util/virnetdevveth.c
@@ -27,7 +27,7 @@
 
 #include "virnetdevveth.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "vircommand.h"
 #include "virterror_internal.h"
 

diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c
index ac7aa5fcbf4038d7ae18b2c7610ee5678c4a97f1..834b9b9f30d3beee2089115d26603cff211a703e 100644 (file)
--- a/src/util/virnetdevvportprofile.c
+++ b/src/util/virnetdevvportprofile.c
@@ -53,7 +53,7 @@ VIR_ENUM_IMPL(virNetDevVPortProfileOp, VIR_NETDEV_VPORT_PROFILE_OP_LAST,
 
 # include "virnetlink.h"
 # include "virfile.h"
-# include "logging.h"
+# include "virlog.h"
 # include "virnetdev.h"
 
 # define MICROSEC_PER_SEC       (1000 * 1000)

diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c
index 8a8bfae3fbed679848c59003a6fccfeaac723d10..830e9b9084e4a8cdddfcca7dd8cd75321201a758 100644 (file)
--- a/src/util/virnetlink.c
+++ b/src/util/virnetlink.c
@@ -36,7 +36,7 @@
 #include <sys/socket.h>
 
 #include "virnetlink.h"
-#include "logging.h"
+#include "virlog.h"
 #include "memory.h"
 #include "threads.h"
 #include "virmacaddr.h"

diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c
index a34ca6a3cef138c198cdb94e8865cd6d837003b4..e37a2d6f630a7fc220abf45296a5a45b57662b10 100644 (file)
--- a/src/util/virnodesuspend.c
+++ b/src/util/virnodesuspend.c
@@ -27,7 +27,7 @@
 #include "datatypes.h"
 
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virterror_internal.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE

diff --git a/src/util/virobject.c b/src/util/virobject.c
index 101507f51a464827e94926b4534fd14d7e6f5f1c..aa80cabb80deb7760540370e9fdadb09222c23af 100644 (file)
--- a/src/util/virobject.c
+++ b/src/util/virobject.c
@@ -26,7 +26,7 @@
 #include "memory.h"
 #include "viratomic.h"
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c
index 90a79c5e789b84210e6aaf7fe9d3e504a5f0f42f..6ec97603bf2e51dadd2453befab697d08e980fa6 100644 (file)
--- a/src/util/virpidfile.c
+++ b/src/util/virpidfile.c
@@ -32,7 +32,7 @@
 #include "memory.h"
 #include "util.h"
 #include "intprops.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virterror_internal.h"
 #include "c-ctype.h"
 #include "areadlink.h"

diff --git a/src/util/virprocess.c b/src/util/virprocess.c
index f8a8a49b3e674a8ae5f63e8093d6b6de3fc6a4c2..3c0ed8a2eea9f39e46096fd17321472d524e191a 100644 (file)
--- a/src/util/virprocess.c
+++ b/src/util/virprocess.c
@@ -29,7 +29,7 @@
 #include "virprocess.h"
 #include "virterror_internal.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "util.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE

diff --git a/src/util/virrandom.c b/src/util/virrandom.c
index 002f655900fe28efb49cb838c8f9ba95d50ae5f7..c24bf3b0e6130e2b999501c9805aa5eaf3cd0a36 100644 (file)
--- a/src/util/virrandom.c
+++ b/src/util/virrandom.c
@@ -31,7 +31,7 @@
 #include "count-one-bits.h"
 #include "util.h"
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/src/util/virterror.c b/src/util/virterror.c
index 1142c40a63f27711bcbc12e703b8ca94e4718fad..6e3301bef72f3d11ff8f893f981ec02ccee7ac3e 100644 (file)
--- a/src/util/virterror.c
+++ b/src/util/virterror.c
@@ -29,7 +29,7 @@
 
 #include "virterror_internal.h"
 #include "datatypes.h"
-#include "logging.h"
+#include "virlog.h"
 #include "memory.h"
 #include "threads.h"
 #include "util.h"

diff --git a/src/util/virusb.c b/src/util/virusb.c
index c1413850d267dec6e1d36ef86ce2ec9d9a96b6bb..d0e30246b931a7131eda01ac9c8e6c6f6c12ff41 100644 (file)
--- a/src/util/virusb.c
+++ b/src/util/virusb.c
@@ -34,7 +34,7 @@
 #include <unistd.h>
 
 #include "virusb.h"
-#include "logging.h"
+#include "virlog.h"
 #include "memory.h"
 #include "util.h"
 #include "virterror_internal.h"

diff --git a/src/vbox/vbox_MSCOMGlue.c b/src/vbox/vbox_MSCOMGlue.c
index 9ddc89c5ac0c9636340b2656a68c06c3cbd9e9bb..3194b7c7f6bfe9dbc22250727920b79b277707cb 100644 (file)
--- a/src/vbox/vbox_MSCOMGlue.c
+++ b/src/vbox/vbox_MSCOMGlue.c
@@ -32,7 +32,7 @@
 #include "internal.h"
 #include "memory.h"
 #include "util.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virterror_internal.h"
 #include "vbox_MSCOMGlue.h"
 

diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c
index 63470ae30f4c8155c3235269a896a0991e2eff44..5f7028305b01437d0382b399465110800711a41b 100644 (file)
--- a/src/vbox/vbox_XPCOMCGlue.c
+++ b/src/vbox/vbox_XPCOMCGlue.c
@@ -39,7 +39,7 @@
 #include "internal.h"
 #include "memory.h"
 #include "util.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virterror_internal.h"
 
 #define VIR_FROM_THIS VIR_FROM_VBOX

diff --git a/src/vbox/vbox_driver.c b/src/vbox/vbox_driver.c
index 56726edab57c97f80b2400c2538edf3f5fa3c27f..cd29e1957c63a4b5a6fdd1b97392646a6d71a0b1 100644 (file)
--- a/src/vbox/vbox_driver.c
+++ b/src/vbox/vbox_driver.c
@@ -34,7 +34,7 @@
 #include "internal.h"
 
 #include "datatypes.h"
-#include "logging.h"
+#include "virlog.h"
 #include "vbox_driver.h"
 #include "vbox_glue.h"
 #include "virterror_internal.h"

diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index 383b1a5d285a288883c13e10206a0752ae8bb0b5..3a456467efd6949e51a1cfaaf5480b6630329d3c 100644 (file)
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
@@ -51,7 +51,7 @@
 #include "uuid.h"
 #include "memory.h"
 #include "nodeinfo.h"
-#include "logging.h"
+#include "virlog.h"
 #include "vbox_driver.h"
 #include "configmake.h"
 #include "virfile.h"

diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index 4de9f3382092683ca2a596a375ac24107e144bb8..e34e15e4a43d906af27937fcc0393d091891d908 100644 (file)
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -29,7 +29,7 @@
 #include "virterror_internal.h"
 #include "virconf.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "uuid.h"
 #include "vmx.h"
 #include "viruri.h"

diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index d9174b6f56eb8a043fab513fd758061bf27dcdf9..c281c009e5c64b7e54f8b99c4382dfdbcc585986 100644 (file)
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -40,7 +40,7 @@
 #include <xen/dom0_ops.h>
 
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 #include "datatypes.h"
 #include "xen_driver.h"
 

diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
index f7daaa61083708457eab86298cb6b50b00c4e206..d6d387453cbd3343d2752beb2439ff4002730391 100644 (file)
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
@@ -63,7 +63,7 @@
 #include <xen/sched.h>
 
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 #include "datatypes.h"
 #include "driver.h"
 #include "util.h"

diff --git a/src/xen/xen_inotify.c b/src/xen/xen_inotify.c
index bcafdd089af84f5071df2ecee2a87ae7f7e06db7..073663f46accae19135c89ab2f5c783021bf7952 100644 (file)
--- a/src/xen/xen_inotify.c
+++ b/src/xen/xen_inotify.c
@@ -36,7 +36,7 @@
 #include "domain_conf.h"
 #include "xen_inotify.h"
 #include "xend_internal.h"
-#include "logging.h"
+#include "virlog.h"
 #include "uuid.h"
 #include "virfile.h"
 

diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
index 9407e95ad187aed73ed3d1f85c492595f5fa024d..0364f846ea448fde390578f3ebea2d42c35f22db 100644 (file)
--- a/src/xen/xend_internal.c
+++ b/src/xen/xend_internal.c
@@ -30,7 +30,7 @@
 #include <errno.h>
 
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 #include "datatypes.h"
 #include "xend_internal.h"
 #include "driver.h"

diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c
index 2cd4b95e0206054736c107d2eddd0d037805df46..fc7b581304d747eb9b8beac0046af1fa476af1ed 100644 (file)
--- a/src/xen/xm_internal.c
+++ b/src/xen/xm_internal.c
@@ -47,7 +47,7 @@
 #include "uuid.h"
 #include "util.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "count-one-bits.h"
 
 #define VIR_FROM_THIS VIR_FROM_XENXM

diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c
index 8a0af624267fd4ce68f19443e9387c1bdeb89af7..4cc82d8d49960e3355da1590df27ae57999c9222 100644 (file)
--- a/src/xen/xs_internal.c
+++ b/src/xen/xs_internal.c
@@ -45,7 +45,7 @@
 #include "datatypes.h"
 #include "driver.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "uuid.h"
 #include "xen_driver.h"
 #include "xs_internal.h"

diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c
index dbdb22d390c694085b120fb06a301b5e3b9345c3..6f51100e44e99f448a7281da24cf1cc35e41ec15 100644 (file)
--- a/src/xenapi/xenapi_utils.c
+++ b/src/xenapi/xenapi_utils.c
@@ -33,7 +33,7 @@
 #include "uuid.h"
 #include "memory.h"
 #include "virbuffer.h"
-#include "logging.h"
+#include "virlog.h"
 #include "viruri.h"
 #include "xenapi_driver_private.h"
 #include "xenapi_utils.h"

diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c
index ed0c9e10e68d2be0756b370aae24714edebf7a43..2aa384dc7291c4ea8b16595cc7dea5ed62dc9c96 100644 (file)
--- a/src/xenxs/xen_sxpr.c
+++ b/src/xenxs/xen_sxpr.c
@@ -32,7 +32,7 @@
 #include "memory.h"
 #include "verify.h"
 #include "uuid.h"
-#include "logging.h"
+#include "virlog.h"
 #include "count-one-bits.h"
 #include "xenxs_private.h"
 #include "xen_sxpr.h"

diff --git a/tests/eventtest.c b/tests/eventtest.c
index bc8d4430857f54c4d3eb59deff70c008265129ae..cd36a2d885f4789db93326fd08ef37ea2c50a9fd 100644 (file)
--- a/tests/eventtest.c
+++ b/tests/eventtest.c
@@ -29,7 +29,7 @@
 #include "testutils.h"
 #include "internal.h"
 #include "threads.h"
-#include "logging.h"
+#include "virlog.h"
 #include "util.h"
 #include "vireventpoll.h"
 

diff --git a/tests/libvirtdconftest.c b/tests/libvirtdconftest.c
index c2b02a6e40d3f276b418a2b9dac722df252ae61a..0365ade12e481f31e570188ddf8a9562c3937c77 100644 (file)
--- a/tests/libvirtdconftest.c
+++ b/tests/libvirtdconftest.c
@@ -27,7 +27,7 @@
 #include "util.h"
 #include "c-ctype.h"
 #include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virconf.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE

diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c
index b55d86718709033c2cee18bfe3ec502fd9888fb6..e4194ded3f7c73647f5f9b81a46eeca2f7da0532 100644 (file)
--- a/tests/qemumonitortestutils.c
+++ b/tests/qemumonitortestutils.c
@@ -31,7 +31,7 @@
 #include "rpc/virnetsocket.h"
 #include "memory.h"
 #include "util.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virterror_internal.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE

diff --git a/tests/securityselinuxtest.c b/tests/securityselinuxtest.c
index 0fa70ba9a9ef349f7d47c15877c9347a2a5cd120..f8a248129b664ddc5fd01332b5f61a9a64975922 100644 (file)
--- a/tests/securityselinuxtest.c
+++ b/tests/securityselinuxtest.c
@@ -32,7 +32,7 @@
 #include "testutils.h"
 #include "memory.h"
 #include "util.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virterror_internal.h"
 #include "security/security_manager.h"
 

diff --git a/tests/sockettest.c b/tests/sockettest.c
index 2f85307efbe8ff9f9e6c4097536ff48be1b49074..c6a175fa4e640b307038e5a4849408e523ad58ae 100644 (file)
--- a/tests/sockettest.c
+++ b/tests/sockettest.c
@@ -27,7 +27,7 @@
 
 #include "virsocketaddr.h"
 #include "testutils.h"
-#include "logging.h"
+#include "virlog.h"
 #include "memory.h"
 
 static void testQuietError(void *userData ATTRIBUTE_UNUSED,

diff --git a/tests/testutils.c b/tests/testutils.c
index 1315cb58aaab430d599c0a4259dcdcbdbec0d7cf..96e24d47435fef988397387cc245454274c307bc 100644 (file)
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -44,7 +44,7 @@
 #include "threads.h"
 #include "virterror_internal.h"
 #include "virbuffer.h"
-#include "logging.h"
+#include "virlog.h"
 #include "vircommand.h"
 #include "virrandom.h"
 #include "dirname.h"

diff --git a/tests/virauthconfigtest.c b/tests/virauthconfigtest.c
index 4d37af6ff3c84bd409a8150657f8c351158d1ca1..74cc18700eed5e8ed659bef092e8db8d7a724f57 100644 (file)
--- a/tests/virauthconfigtest.c
+++ b/tests/virauthconfigtest.c
@@ -27,7 +27,7 @@
 #include "util.h"
 #include "virterror_internal.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 
 #include "virauthconfig.h"
 

diff --git a/tests/virdrivermoduletest.c b/tests/virdrivermoduletest.c
index 53a772e765edfdcb666e35bc2362a842d0636263..440ee8e1d811bb092f836bb3c1c6b4c343be04e0 100644 (file)
--- a/tests/virdrivermoduletest.c
+++ b/tests/virdrivermoduletest.c
@@ -24,7 +24,7 @@
 #include "util.h"
 #include "virterror_internal.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "driver.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE

diff --git a/tests/virhashtest.c b/tests/virhashtest.c
index 721e877911646a711f91dc3570d81c08654004b1..7de16d0c029005a87bb315fb77ee1cc222ebaa2e 100644 (file)
--- a/tests/virhashtest.c
+++ b/tests/virhashtest.c
@@ -11,7 +11,7 @@
 #include "testutils.h"
 #include "memory.h"
 #include "util.h"
-#include "logging.h"
+#include "virlog.h"
 
 
 #define testError(...)                                          \

diff --git a/tests/virkeyfiletest.c b/tests/virkeyfiletest.c
index 3667c8c67ac4f45d8858bc43967ed74deff34d47..c6aca862a9412a6103b771817d0aee1dcf58b445 100644 (file)
--- a/tests/virkeyfiletest.c
+++ b/tests/virkeyfiletest.c
@@ -27,7 +27,7 @@
 #include "util.h"
 #include "virterror_internal.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 
 #include "virkeyfile.h"
 

diff --git a/tests/virlockspacetest.c b/tests/virlockspacetest.c
index ee58f9512ff1f481c27a813078ae805bbf674e8a..c95f5d84e5bea057c8637fd6842051819a0486bd 100644 (file)
--- a/tests/virlockspacetest.c
+++ b/tests/virlockspacetest.c
@@ -28,7 +28,7 @@
 #include "util.h"
 #include "virterror_internal.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 
 #include "virlockspace.h"
 

diff --git a/tests/virnetmessagetest.c b/tests/virnetmessagetest.c
index eff8ea75f564fcea9350688aaab27905f741d7a6..c20f5e6e588391208ddb0da27abab480a1c4d3f1 100644 (file)
--- a/tests/virnetmessagetest.c
+++ b/tests/virnetmessagetest.c
@@ -27,7 +27,7 @@
 #include "util.h"
 #include "virterror_internal.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 
 #include "rpc/virnetmessage.h"
 

diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
index e31f19a6a54c65c0a79ba923130957a87a759684..ba281e990fa4d603c0552c37dc2527d9435b9c9e 100644 (file)
--- a/tests/virnetsockettest.c
+++ b/tests/virnetsockettest.c
@@ -31,7 +31,7 @@
 #include "util.h"
 #include "virterror_internal.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virfile.h"
 
 #include "rpc/virnetsocket.h"

diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c
index d421feb49d91657af3e954732b633d3e2dd49276..023665907b31e6d52a58a2c554d35be43a97fce9 100644 (file)
--- a/tests/virnettlscontexttest.c
+++ b/tests/virnettlscontexttest.c
@@ -30,7 +30,7 @@
 #include "util.h"
 #include "virterror_internal.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 #include "virfile.h"
 #include "vircommand.h"
 #include "virsocketaddr.h"

diff --git a/tests/virstringtest.c b/tests/virstringtest.c
index 7e726c60c2bf4dfac788517a2c9573fa5f028a0d..27e490ffe1032d33d9190f00b52c7051317e29d2 100644 (file)
--- a/tests/virstringtest.c
+++ b/tests/virstringtest.c
@@ -26,7 +26,7 @@
 #include "util.h"
 #include "virterror_internal.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 
 #include "virstring.h"
 

diff --git a/tests/virtimetest.c b/tests/virtimetest.c
index dca4efbb7eb9617d20abfba7dadd833c92ebbc92..c8e9a2e8c8f4ad50c273f51f77fdd61989090a21 100644 (file)
--- a/tests/virtimetest.c
+++ b/tests/virtimetest.c
@@ -27,7 +27,7 @@
 #include "util.h"
 #include "virterror_internal.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 
 #include "virtime.h"
 

diff --git a/tests/viruritest.c b/tests/viruritest.c
index 430bcb65c9db2bfbcb4bad22b09db1382d3970c3..46964b3a416bb692533693395ba862c4e2d39210 100644 (file)
--- a/tests/viruritest.c
+++ b/tests/viruritest.c
@@ -27,7 +27,7 @@
 #include "util.h"
 #include "virterror_internal.h"
 #include "memory.h"
-#include "logging.h"
+#include "virlog.h"
 
 #include "viruri.h"
 

diff --git a/tools/console.c b/tools/console.c
index 40de8eb2df4a937b11b92a485fc3d4e796df7621..dbdaab747a5a33719c5e9b49af203ad16601f726 100644 (file)
--- a/tools/console.c
+++ b/tools/console.c
@@ -38,7 +38,7 @@
 
 # include "internal.h"
 # include "console.h"
-# include "logging.h"
+# include "virlog.h"
 # include "util.h"
 # include "virfile.h"
 # include "memory.h"