From 936d95d347ca0217c44c926fa833d11c690f064c Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Wed, 12 Dec 2012 17:59:27 +0000 Subject: [PATCH] Rename logging.{c,h} to virlog.{c,h} --- daemon/libvirtd-config.c | 2 +- daemon/libvirtd.h | 2 +- daemon/remote.c | 2 +- daemon/stream.c | 2 +- src/Makefile.am | 2 +- src/conf/domain_audit.c | 2 +- src/conf/domain_conf.c | 2 +- src/conf/domain_event.c | 2 +- src/conf/nwfilter_params.c | 2 +- src/conf/secret_conf.c | 2 +- src/conf/snapshot_conf.c | 2 +- src/conf/virconsole.c | 2 +- src/cpu/cpu.c | 2 +- src/cpu/cpu_powerpc.c | 2 +- src/cpu/cpu_x86.c | 2 +- src/datatypes.c | 2 +- src/driver.c | 2 +- src/esx/esx_device_monitor.c | 2 +- src/esx/esx_driver.c | 2 +- src/esx/esx_interface_driver.c | 2 +- src/esx/esx_network_driver.c | 2 +- src/esx/esx_nwfilter_driver.c | 2 +- src/esx/esx_secret_driver.c | 2 +- src/esx/esx_storage_backend_iscsi.c | 2 +- src/esx/esx_storage_backend_vmfs.c | 2 +- src/esx/esx_util.c | 2 +- src/esx/esx_vi.c | 2 +- src/esx/esx_vi_methods.c | 2 +- src/esx/esx_vi_types.c | 2 +- src/fdstream.c | 2 +- src/hyperv/hyperv_device_monitor.c | 2 +- src/hyperv/hyperv_driver.c | 2 +- src/hyperv/hyperv_interface_driver.c | 2 +- src/hyperv/hyperv_network_driver.c | 2 +- src/hyperv/hyperv_nwfilter_driver.c | 2 +- src/hyperv/hyperv_secret_driver.c | 2 +- src/hyperv/hyperv_storage_driver.c | 2 +- src/hyperv/hyperv_util.c | 2 +- src/hyperv/hyperv_wmi.c | 2 +- src/interface/interface_backend_netcf.c | 2 +- src/libvirt-qemu.c | 2 +- src/libvirt.c | 2 +- src/libxl/libxl_conf.c | 2 +- src/libxl/libxl_driver.c | 2 +- src/locking/domain_lock.c | 2 +- src/locking/lock_daemon.c | 2 +- src/locking/lock_daemon_config.c | 2 +- src/locking/lock_daemon_dispatch.c | 2 +- src/locking/lock_driver_lockd.c | 2 +- src/locking/lock_driver_nop.c | 2 +- src/locking/lock_driver_sanlock.c | 2 +- src/locking/lock_manager.c | 2 +- src/lxc/lxc_cgroup.c | 2 +- src/lxc/lxc_conf.c | 2 +- src/lxc/lxc_container.c | 2 +- src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_domain.c | 2 +- src/lxc/lxc_driver.c | 2 +- src/lxc/lxc_fuse.c | 2 +- src/lxc/lxc_hostdev.c | 2 +- src/lxc/lxc_monitor.c | 2 +- src/lxc/lxc_process.c | 2 +- src/network/bridge_driver.c | 2 +- src/node_device/node_device_driver.c | 2 +- src/node_device/node_device_hal.c | 2 +- src/node_device/node_device_linux_sysfs.c | 2 +- src/node_device/node_device_udev.c | 2 +- src/nodeinfo.c | 2 +- src/nwfilter/nwfilter_dhcpsnoop.c | 2 +- src/nwfilter/nwfilter_driver.c | 2 +- src/nwfilter/nwfilter_ebiptables_driver.c | 2 +- src/nwfilter/nwfilter_gentech_driver.c | 2 +- src/nwfilter/nwfilter_learnipaddr.c | 2 +- src/openvz/openvz_driver.c | 2 +- src/parallels/parallels_driver.c | 2 +- src/phyp/phyp_driver.c | 2 +- src/qemu/qemu_agent.c | 2 +- src/qemu/qemu_bridge_filter.c | 2 +- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_cgroup.c | 2 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_conf.c | 2 +- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hostdev.c | 2 +- src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_monitor.c | 2 +- src/qemu/qemu_monitor_json.c | 2 +- src/qemu/qemu_monitor_text.c | 2 +- src/qemu/qemu_process.c | 2 +- src/remote/remote_driver.c | 2 +- src/rpc/virkeepalive.c | 2 +- src/rpc/virnetclient.c | 2 +- src/rpc/virnetclientprogram.c | 2 +- src/rpc/virnetclientstream.c | 2 +- src/rpc/virnetmessage.c | 2 +- src/rpc/virnetsaslcontext.c | 2 +- src/rpc/virnetserver.c | 2 +- src/rpc/virnetserverclient.c | 2 +- src/rpc/virnetservermdns.c | 2 +- src/rpc/virnetserverprogram.c | 2 +- src/rpc/virnetsocket.c | 2 +- src/rpc/virnetsshsession.c | 2 +- src/rpc/virnettlscontext.c | 2 +- src/secret/secret_driver.c | 2 +- src/security/security_apparmor.c | 2 +- src/security/security_dac.c | 2 +- src/security/security_driver.c | 2 +- src/security/security_manager.c | 2 +- src/security/security_selinux.c | 2 +- src/storage/storage_backend.c | 2 +- src/storage/storage_backend_disk.c | 2 +- src/storage/storage_backend_fs.c | 2 +- src/storage/storage_backend_iscsi.c | 2 +- src/storage/storage_backend_logical.c | 2 +- src/storage/storage_backend_mpath.c | 2 +- src/storage/storage_backend_rbd.c | 2 +- src/storage/storage_backend_scsi.c | 2 +- src/storage/storage_backend_sheepdog.c | 2 +- src/storage/storage_driver.c | 2 +- src/test/test_driver.c | 2 +- src/uml/uml_conf.c | 2 +- src/uml/uml_driver.c | 2 +- src/util/memory.c | 2 +- src/util/pci.c | 2 +- src/util/storage_file.c | 2 +- src/util/sysinfo.c | 2 +- src/util/util.c | 2 +- src/util/uuid.c | 2 +- src/util/virarch.c | 2 +- src/util/viraudit.c | 2 +- src/util/virauth.c | 2 +- src/util/virauthconfig.c | 2 +- src/util/vircgroup.c | 2 +- src/util/vircommand.c | 2 +- src/util/virconf.c | 2 +- src/util/virdbus.c | 2 +- src/util/virdnsmasq.c | 2 +- src/util/virebtables.c | 2 +- src/util/virevent.c | 2 +- src/util/vireventpoll.c | 2 +- src/util/virfile.c | 2 +- src/util/virhash.c | 2 +- src/util/virhook.c | 2 +- src/util/viriptables.c | 2 +- src/util/virjson.c | 2 +- src/util/virkeyfile.c | 2 +- src/util/virlockspace.c | 2 +- src/util/{logging.c => virlog.c} | 4 ++-- src/util/{logging.h => virlog.h} | 2 +- src/util/virnetdev.c | 2 +- src/util/virnetdevmacvlan.c | 2 +- src/util/virnetdevtap.c | 2 +- src/util/virnetdevveth.c | 2 +- src/util/virnetdevvportprofile.c | 2 +- src/util/virnetlink.c | 2 +- src/util/virnodesuspend.c | 2 +- src/util/virobject.c | 2 +- src/util/virpidfile.c | 2 +- src/util/virprocess.c | 2 +- src/util/virrandom.c | 2 +- src/util/virterror.c | 2 +- src/util/virusb.c | 2 +- src/vbox/vbox_MSCOMGlue.c | 2 +- src/vbox/vbox_XPCOMCGlue.c | 2 +- src/vbox/vbox_driver.c | 2 +- src/vbox/vbox_tmpl.c | 2 +- src/vmx/vmx.c | 2 +- src/xen/xen_driver.c | 2 +- src/xen/xen_hypervisor.c | 2 +- src/xen/xen_inotify.c | 2 +- src/xen/xend_internal.c | 2 +- src/xen/xm_internal.c | 2 +- src/xen/xs_internal.c | 2 +- src/xenapi/xenapi_utils.c | 2 +- src/xenxs/xen_sxpr.c | 2 +- tests/eventtest.c | 2 +- tests/libvirtdconftest.c | 2 +- tests/qemumonitortestutils.c | 2 +- tests/securityselinuxtest.c | 2 +- tests/sockettest.c | 2 +- tests/testutils.c | 2 +- tests/virauthconfigtest.c | 2 +- tests/virdrivermoduletest.c | 2 +- tests/virhashtest.c | 2 +- tests/virkeyfiletest.c | 2 +- tests/virlockspacetest.c | 2 +- tests/virnetmessagetest.c | 2 +- tests/virnetsockettest.c | 2 +- tests/virnettlscontexttest.c | 2 +- tests/virstringtest.c | 2 +- tests/virtimetest.c | 2 +- tests/viruritest.c | 2 +- tools/console.c | 2 +- 195 files changed, 196 insertions(+), 196 deletions(-) rename src/util/{logging.c => virlog.c} (99%) rename src/util/{logging.h => virlog.h} (99%) diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c index 0ca185c069..f61f08df3a 100644 --- 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 e389151650..b04cc7112a 100644 --- a/daemon/libvirtd.h +++ b/daemon/libvirtd.h @@ -33,7 +33,7 @@ # include # 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 3cee038669..bb38689604 100644 --- 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 fa14eeb565..d63e0092e1 100644 --- 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 d0c391ec2e..59958c6679 100644 --- 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 97b3aa41f4..a73c7231c2 100644 --- 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 51327bf331..30b1a0fa4a 100644 --- 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 cf37308663..f1e247b7a7 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -24,7 +24,7 @@ #include #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 7254519a2c..f8cf98025b 100644 --- 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 ec67f57a7b..24d7aa0df5 100644 --- 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 38a3e2a36a..63618102ea 100644 --- 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 143c1a684e..92179ccc2d 100644 --- 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 53c4cc3eb8..be1f4cecae 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -23,7 +23,7 @@ #include -#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 36d601e952..26991d8023 100644 --- a/src/cpu/cpu_powerpc.c +++ b/src/cpu/cpu_powerpc.c @@ -26,7 +26,7 @@ #include #include -#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 1447141557..2970573c77 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -25,7 +25,7 @@ #include -#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 c0ed3a2700..73a2fd05f3 100644 --- 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 6d2feb9b81..4ef6fd2d5f 100644 --- 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 c3f9339b0e..0ad95f5106 100644 --- 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 4171beb460..488d18dd0e 100644 --- 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 35bc7fac43..4760264441 100644 --- 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 6a87abd97e..3e25aa2df6 100644 --- 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 9780ca6cfd..f5e710d5a2 100644 --- 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 55b2e9a1a3..2a98644d26 100644 --- 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 b6cde96e8d..5d4eb3cb7d 100644 --- 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 5ef2981f02..c8bba9e7a9 100644 --- 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 b807607b21..6e27fe468c 100644 --- 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 d645bfbdcd..76192dfd59 100644 --- 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 a3c3c8b978..a3870ee8da 100644 --- 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 1654e1b173..d0a2c6c427 100644 --- 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 d1eb04cc84..fdbd7a20ee 100644 --- 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 e183798db2..1fa98b2fb3 100644 --- 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 4aed41fe52..95b0cd96ed 100644 --- 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 9b1bb378b4..6a3c2cbea3 100644 --- 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 3a61fe66d2..2f9fcab0e0 100644 --- 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 9d54f82f8b..c490522405 100644 --- 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 7ee8ce945b..3d58b016d9 100644 --- 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 2e03162481..7fbc14ded0 100644 --- 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 3050d617b8..1ef6dae452 100644 --- 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 0a6b107778..069ebe6869 100644 --- 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 226e020cb5..1f42920f2c 100644 --- 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 cc98bbbcbc..8d53b5c7b7 100644 --- a/src/libvirt-qemu.c +++ b/src/libvirt-qemu.c @@ -24,7 +24,7 @@ #include #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 8f7a869538..d078304be8 100644 --- 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 5f02b9542d..0ccab50a2a 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -31,7 +31,7 @@ #include #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 77457c8c02..b7e6630f3d 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -31,7 +31,7 @@ #include #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 1e3da5fa5a..00861cfec0 100644 --- 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 08caa1644a..3c2a50c15a 100644 --- 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 c2d9a76129..9557b8c2bb 100644 --- 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 bb4dcfa12b..78c97266b5 100644 --- 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 c88c5af9aa..d5d721d6d3 100644 --- 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 c9ab806f0d..745a0bf41c 100644 --- 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 2eadc07f72..1e8df2625d 100644 --- 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 e6d930854e..f038d4e27f 100644 --- 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 5f092de206..d023b84b1b 100644 --- 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 905734b5fb..a5ba2f7568 100644 --- 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 717811f3af..760d3af631 100644 --- 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 bfe21268d0..f0e08e3391 100644 --- 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 bd80d9fe9a..77a64dd134 100644 --- 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 6f297680b8..826532838b 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -37,7 +37,7 @@ #include #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 4e7df552ea..485456ef36 100644 --- 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 c063aa0189..aa450ecfe8 100644 --- a/src/lxc/lxc_hostdev.c +++ b/src/lxc/lxc_hostdev.c @@ -24,7 +24,7 @@ #include #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 4d177c9596..9eb587d8af 100644 --- 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 fa53217f9c..762a23de2f 100644 --- 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 fdac712055..e33650384f 100644 --- 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 4d3e01b428..48360e3b73 100644 --- 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 080aaeda45..59ba5c384c 100644 --- 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 3048e3360f..fbe0da517b 100644 --- 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 b3499fb304..fef00ad131 100644 --- 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 48fa21de7a..0a456fa5dc 100644 --- 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 e4c895fc4d..68aa233fbf 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -55,7 +55,7 @@ #include #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 3aa026ae4d..7fde656bf7 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -28,7 +28,7 @@ #include #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 6966acffc2..23a43d2da3 100644 --- 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 572acf4c8b..6be4a930f8 100644 --- 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 361bdce3b2..110eae845e 100644 --- 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 9297777d6e..e51bf296c1 100644 --- 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 641491398f..cc65117b0e 100644 --- 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 e81bc090fa..f1d994c02e 100644 --- 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 6727294979..421e43f094 100644 --- 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 a6d0d4f1ab..08a9f1a67c 100644 --- 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 c4cf367f4a..592ddd1e73 100644 --- 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 445d085a9e..80ceee5459 100644 --- 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 199eb6d1ea..52a96b941c 100644 --- 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 91af49bf29..2073fd5acb 100644 --- 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 8d8cf02c35..e6eaa58413 100644 --- 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 477c208834..4d81a730ec 100644 --- 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 08094d1cdb..94b5ae003a 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -24,7 +24,7 @@ #include #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 5aab00bfeb..f8420c4c3d 100644 --- 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 d7cdcaf3fd..4248298ee8 100644 --- 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 131e8df358..920453d270 100644 --- 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 618166883a..e14134b47a 100644 --- 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 a12adb65c6..28690b16cb 100644 --- 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 ef88ba2d4c..00ff24302e 100644 --- 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 8b77e7dfa2..1e9151ab6c 100644 --- 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 309f22f87c..8fc1cba46b 100644 --- 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 bf2547cd6e..7370ae06d7 100644 --- 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 1f08640aeb..dec3943a89 100644 --- 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 0e7e38e76a..26dc2924c7 100644 --- 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 cf76e2133b..16d8e61ba6 100644 --- 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 b6b68d5556..e880127fcc 100644 --- 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 f686a8ff4f..6d3532ad6e 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -28,7 +28,7 @@ #include #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 ed26719741..9642ea5496 100644 --- 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 166b4eba21..c17b65dd30 100644 --- 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 e4aa2da2cd..5b96c34039 100644 --- 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 5a2eab3c4c..aa8f4b9c47 100644 --- 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 d89056967b..734acaaba4 100644 --- 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 1d32327fb6..29310030df 100644 --- 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 d9ba42bc26..415935801f 100644 --- 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 2b3a2e20fc..92620919ea 100644 --- 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 8ad61d74a9..931ae4ee56 100644 --- 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 c7ff8a5709..82d3ca9cb5 100644 --- a/src/security/security_driver.c +++ b/src/security/security_driver.c @@ -24,7 +24,7 @@ #include #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 db9483763b..c675715c68 100644 --- 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 8ac647309d..11f839f333 100644 --- 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 083028d89a..899caeb5ed 100644 --- 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 c6aa40701a..7e1d3ecbb6 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -27,7 +27,7 @@ #include #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 cdf93af032..78b50f003c 100644 --- 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 c468b1be6e..46659af403 100644 --- 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 53e6c6172e..f28c663661 100644 --- 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 efcfb28526..1ca120fb33 100644 --- 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 bc61cf7dfa..4e58911f8f 100644 --- 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 6515e57f0d..32713be0c5 100644 --- 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 ecca7a806a..05deeeb161 100644 --- 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 c567fffc4b..6076f6cbbb 100644 --- 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 63066beab3..8dd5694807 100644 --- 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 b669b5a292..6b14f231e3 100644 --- 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 8dece66850..90c9b662ca 100644 --- 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 b224f303c0..186d3b61b4 100644 --- a/src/util/memory.c +++ b/src/util/memory.c @@ -24,7 +24,7 @@ #include #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 bf46fca303..7adce758b7 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -34,7 +34,7 @@ #include #include -#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 eebf59a1da..6c3390b6c4 100644 --- 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 2f5c161c6c..f07c2d8344 100644 --- 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 f8ba7b491b..f941dfdb79 100644 --- 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 5c3b32c5e2..6efc7be914 100644 --- 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 1376887577..ffd07dcabb 100644 --- a/src/util/virarch.c +++ b/src/util/virarch.c @@ -23,7 +23,7 @@ #include -#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 9bdc5ed993..c4e0129716 100644 --- a/src/util/viraudit.c +++ b/src/util/viraudit.c @@ -28,7 +28,7 @@ #include #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 6d9935d6e5..a1bad6aa5f 100644 --- 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 49a4466e05..46ba04051d 100644 --- 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 e9fc67ff26..82e6613468 100644 --- 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 3046658a2d..7bed04e245 100644 --- 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 695e6d8f15..84d3c698b8 100644 --- 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 2a96778d82..b6c6642233 100644 --- 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 1c930602df..e1c3133ea5 100644 --- 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 3b97c00c71..e8fdb8c584 100644 --- 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 736f183fc6..e45f96e961 100644 --- 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 diff --git a/src/util/vireventpoll.c b/src/util/vireventpoll.c index 287439f6a7..bdd405ff84 100644 --- a/src/util/vireventpoll.c +++ b/src/util/vireventpoll.c @@ -32,7 +32,7 @@ #include #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 d77b72661d..30294a2917 100644 --- 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 1576dd326a..077abcac8a 100644 --- 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 76571da17b..b005f392ff 100644 --- 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 941dd46891..13dd31e242 100644 --- 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 a719989c7e..b0d5a1523b 100644 --- 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 3c2ce2616c..b43b92de53 100644 --- a/src/util/virkeyfile.c +++ b/src/util/virkeyfile.c @@ -26,7 +26,7 @@ #include #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 99b61827a1..b6522946ae 100644 --- a/src/util/virlockspace.c +++ b/src/util/virlockspace.c @@ -22,7 +22,7 @@ #include #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 0df354905a..3e0f7059ba 100644 --- 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 028b791ac9..aa81d6a578 100644 --- 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 ba09891d1e..5846aff5db 100644 --- 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 #include diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 657c484158..8d2574c88a 100644 --- 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 0eadd6cf2e..644e9a4187 100644 --- 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 diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c index 3261337751..630b7c92a1 100644 --- 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 ac7aa5fcbf..834b9b9f30 100644 --- 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 8a8bfae3fb..830e9b9084 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -36,7 +36,7 @@ #include #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 a34ca6a3ce..e37a2d6f63 100644 --- 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 101507f51a..aa80cabb80 100644 --- 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 90a79c5e78..6ec97603bf 100644 --- 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 f8a8a49b3e..3c0ed8a2ee 100644 --- 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 002f655900..c24bf3b0e6 100644 --- 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 1142c40a63..6e3301bef7 100644 --- 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 c1413850d2..d0e30246b9 100644 --- a/src/util/virusb.c +++ b/src/util/virusb.c @@ -34,7 +34,7 @@ #include #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 9ddc89c5ac..3194b7c7f6 100644 --- 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 63470ae30f..5f7028305b 100644 --- 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 56726edab5..cd29e1957c 100644 --- 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 383b1a5d28..3a456467ef 100644 --- 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 4de9f33820..e34e15e4a4 100644 --- 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 d9174b6f56..c281c009e5 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -40,7 +40,7 @@ #include #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 f7daaa6108..d6d387453c 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -63,7 +63,7 @@ #include #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 bcafdd089a..073663f46a 100644 --- 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 9407e95ad1..0364f846ea 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -30,7 +30,7 @@ #include #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 2cd4b95e02..fc7b581304 100644 --- 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 8a0af62426..4cc82d8d49 100644 --- 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 dbdb22d390..6f51100e44 100644 --- 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 ed0c9e10e6..2aa384dc72 100644 --- 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 bc8d443085..cd36a2d885 100644 --- 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 c2b02a6e40..0365ade12e 100644 --- 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 b55d867187..e4194ded3f 100644 --- 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 0fa70ba9a9..f8a248129b 100644 --- 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 2f85307efb..c6a175fa4e 100644 --- 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 1315cb58aa..96e24d4743 100644 --- 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 4d37af6ff3..74cc18700e 100644 --- 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 53a772e765..440ee8e1d8 100644 --- 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 721e877911..7de16d0c02 100644 --- 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 3667c8c67a..c6aca862a9 100644 --- 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 ee58f9512f..c95f5d84e5 100644 --- 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 eff8ea75f5..c20f5e6e58 100644 --- 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 e31f19a6a5..ba281e990f 100644 --- 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 d421feb49d..023665907b 100644 --- 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 7e726c60c2..27e490ffe1 100644 --- 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 dca4efbb7e..c8e9a2e8c8 100644 --- 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 430bcb65c9..46964b3a41 100644 --- 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 40de8eb2df..dbdaab747a 100644 --- 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" -- 2.39.5