From: "Zeeshan Ali (Khattak)" <zeeshanak@gnome.org> GLib >= 2.31 filters debug messages by default now[1] and provides ways to output debug log from selected domains only. This patch won't be any good without defining proper fine-grained log domains though. http://blogs.gnome.org/mclasen/2011/11/09/better-logging/ --- examples/event-test.c | 4 +-- libvirt-gconfig/libvirt-gconfig-capabilities.c | 6 +---- libvirt-gconfig/libvirt-gconfig-domain-clock.c | 6 +---- libvirt-gconfig/libvirt-gconfig-domain-device.c | 6 +---- libvirt-gconfig/libvirt-gconfig-domain-disk.c | 6 +---- .../libvirt-gconfig-domain-graphics-spice.c | 6 +---- libvirt-gconfig/libvirt-gconfig-domain-graphics.c | 6 +---- libvirt-gconfig/libvirt-gconfig-domain-input.c | 6 +---- .../libvirt-gconfig-domain-interface-network.c | 6 +---- libvirt-gconfig/libvirt-gconfig-domain-interface.c | 6 +---- libvirt-gconfig/libvirt-gconfig-domain-os.c | 6 +---- libvirt-gconfig/libvirt-gconfig-domain-snapshot.c | 6 +---- libvirt-gconfig/libvirt-gconfig-domain-timer.c | 6 +---- libvirt-gconfig/libvirt-gconfig-domain-video.c | 6 +---- libvirt-gconfig/libvirt-gconfig-domain.c | 6 +---- libvirt-gconfig/libvirt-gconfig-interface.c | 6 +---- libvirt-gconfig/libvirt-gconfig-network-filter.c | 6 +---- libvirt-gconfig/libvirt-gconfig-network.c | 6 +---- libvirt-gconfig/libvirt-gconfig-node-device.c | 6 +---- libvirt-gconfig/libvirt-gconfig-object.c | 10 +------ libvirt-gconfig/libvirt-gconfig-secret.c | 6 +---- libvirt-gconfig/libvirt-gconfig-storage-pool.c | 6 +---- libvirt-gconfig/libvirt-gconfig-storage-vol.c | 6 +---- libvirt-glib/libvirt-glib-event.c | 26 ++++++++----------- libvirt-glib/libvirt-glib-main.c | 10 +------- libvirt-gobject/libvirt-gobject-connection.c | 12 +++------ libvirt-gobject/libvirt-gobject-domain-device.c | 8 +---- libvirt-gobject/libvirt-gobject-domain-disk.c | 8 +---- libvirt-gobject/libvirt-gobject-domain-interface.c | 8 +---- libvirt-gobject/libvirt-gobject-domain-snapshot.c | 8 +---- libvirt-gobject/libvirt-gobject-domain.c | 8 +---- libvirt-gobject/libvirt-gobject-input-stream.c | 6 +---- libvirt-gobject/libvirt-gobject-interface.c | 8 +---- libvirt-gobject/libvirt-gobject-main.c | 8 ------ libvirt-gobject/libvirt-gobject-manager.c | 8 +---- libvirt-gobject/libvirt-gobject-network-filter.c | 8 +---- libvirt-gobject/libvirt-gobject-network.c | 8 +---- libvirt-gobject/libvirt-gobject-node-device.c | 8 +---- libvirt-gobject/libvirt-gobject-output-stream.c | 6 +---- libvirt-gobject/libvirt-gobject-secret.c | 8 +---- libvirt-gobject/libvirt-gobject-storage-pool.c | 8 +---- libvirt-gobject/libvirt-gobject-storage-vol.c | 8 +---- libvirt-gobject/libvirt-gobject-stream.c | 6 +---- 43 files changed, 69 insertions(+), 249 deletions(-) diff --git a/examples/event-test.c b/examples/event-test.c index fdd70bf..4fb000e 100644 --- a/examples/event-test.c +++ b/examples/event-test.c @@ -6,8 +6,6 @@ #include <libvirt/libvirt.h> #include <libvirt-glib/libvirt-glib.h> -#define DEBUG0(fmt) printf("%s:%d :: " fmt "\n", __FUNCTION__, __LINE__) -#define DEBUG(fmt, ...) printf("%s:%d: " fmt "\n", __FUNCTION__, __LINE__, __VA_ARGS__) #define STREQ(a,b) (strcmp((a),(b)) == 0) #ifndef ATTRIBUTE_UNUSED @@ -171,7 +169,7 @@ int main(int argc, char **argv) return -1; } - DEBUG0("Registering domain event cbs"); + g_debug("Registering domain event cbs"); /* Add 2 callbacks to prove this works with more than just one */ virConnectDomainEventRegister(dconn, myDomainEventCallback1, NULL, NULL); diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities.c b/libvirt-gconfig/libvirt-gconfig-capabilities.c index 70bd33d..b517944 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities.c @@ -27,10 +27,6 @@ #include "libvirt-gconfig/libvirt-gconfig.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_CAPABILITIES_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_CAPABILITIES, GVirConfigCapabilitiesPrivate)) @@ -50,7 +46,7 @@ static void gvir_config_capabilities_class_init(GVirConfigCapabilitiesClass *kla static void gvir_config_capabilities_init(GVirConfigCapabilities *conn) { - DEBUG("Init GVirConfigCapabilities=%p", conn); + g_debug("Init GVirConfigCapabilities=%p", conn); conn->priv = GVIR_CONFIG_CAPABILITIES_GET_PRIVATE(conn); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-clock.c b/libvirt-gconfig/libvirt-gconfig-domain-clock.c index 27d1e67..d092b64 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-clock.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-clock.c @@ -30,10 +30,6 @@ #include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" #include "libvirt-gconfig/libvirt-gconfig-object-private.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_DOMAIN_CLOCK_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN_CLOCK, GVirConfigDomainClockPrivate)) @@ -53,7 +49,7 @@ static void gvir_config_domain_clock_class_init(GVirConfigDomainClockClass *klas static void gvir_config_domain_clock_init(GVirConfigDomainClock *klock) { - DEBUG("Init GVirConfigDomainClock=%p", klock); + g_debug("Init GVirConfigDomainClock=%p", klock); klock->priv = GVIR_CONFIG_DOMAIN_CLOCK_GET_PRIVATE(klock); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-device.c b/libvirt-gconfig/libvirt-gconfig-domain-device.c index 6dd0df1..1c4e465 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-device.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-device.c @@ -28,10 +28,6 @@ #include "libvirt-gconfig/libvirt-gconfig.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_DOMAIN_DEVICE_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN_DEVICE, GVirConfigDomainDevicePrivate)) @@ -51,7 +47,7 @@ static void gvir_config_domain_device_class_init(GVirConfigDomainDeviceClass *kl static void gvir_config_domain_device_init(GVirConfigDomainDevice *device) { - DEBUG("Init GVirConfigDomainDevice=%p", device); + g_debug("Init GVirConfigDomainDevice=%p", device); device->priv = GVIR_CONFIG_DOMAIN_DEVICE_GET_PRIVATE(device); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-disk.c b/libvirt-gconfig/libvirt-gconfig-domain-disk.c index 8a9d6e6..879afc7 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-disk.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-disk.c @@ -30,10 +30,6 @@ #include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" #include "libvirt-gconfig/libvirt-gconfig-object-private.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_DOMAIN_DISK_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN_DISK, GVirConfigDomainDiskPrivate)) @@ -53,7 +49,7 @@ static void gvir_config_domain_disk_class_init(GVirConfigDomainDiskClass *klass) static void gvir_config_domain_disk_init(GVirConfigDomainDisk *disk) { - DEBUG("Init GVirConfigDomainDisk=%p", disk); + g_debug("Init GVirConfigDomainDisk=%p", disk); disk->priv = GVIR_CONFIG_DOMAIN_DISK_GET_PRIVATE(disk); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c index e5c2ff8..1539009 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c @@ -30,10 +30,6 @@ #include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" #include "libvirt-gconfig/libvirt-gconfig-object-private.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_DOMAIN_GRAPHICS_SPICE_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN_GRAPHICS_SPICE, GVirConfigDomainGraphicsSpicePrivate)) @@ -53,7 +49,7 @@ static void gvir_config_domain_graphics_spice_class_init(GVirConfigDomainGraphic static void gvir_config_domain_graphics_spice_init(GVirConfigDomainGraphicsSpice *graphics_spice) { - DEBUG("Init GVirConfigDomainGraphicsSpice=%p", graphics_spice); + g_debug("Init GVirConfigDomainGraphicsSpice=%p", graphics_spice); graphics_spice->priv = GVIR_CONFIG_DOMAIN_GRAPHICS_SPICE_GET_PRIVATE(graphics_spice); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics.c index 1c2a2ad..833f693 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics.c @@ -28,10 +28,6 @@ #include "libvirt-gconfig/libvirt-gconfig.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_DOMAIN_GRAPHICS_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN_GRAPHICS, GVirConfigDomainGraphicsPrivate)) @@ -51,7 +47,7 @@ static void gvir_config_domain_graphics_class_init(GVirConfigDomainGraphicsClass static void gvir_config_domain_graphics_init(GVirConfigDomainGraphics *graphics) { - DEBUG("Init GVirConfigDomainGraphics=%p", graphics); + g_debug("Init GVirConfigDomainGraphics=%p", graphics); graphics->priv = GVIR_CONFIG_DOMAIN_GRAPHICS_GET_PRIVATE(graphics); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-input.c b/libvirt-gconfig/libvirt-gconfig-domain-input.c index ad11472..5c9b4ef 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-input.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-input.c @@ -30,10 +30,6 @@ #include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" #include "libvirt-gconfig/libvirt-gconfig-object-private.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_DOMAIN_INPUT_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN_INPUT, GVirConfigDomainInputPrivate)) @@ -53,7 +49,7 @@ static void gvir_config_domain_input_class_init(GVirConfigDomainInputClass *klas static void gvir_config_domain_input_init(GVirConfigDomainInput *device_input) { - DEBUG("Init GVirConfigDomainInput=%p", device_input); + g_debug("Init GVirConfigDomainInput=%p", device_input); device_input->priv = GVIR_CONFIG_DOMAIN_INPUT_GET_PRIVATE(device_input); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c index e559df4..02fc2eb 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c @@ -30,10 +30,6 @@ #include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" #include "libvirt-gconfig/libvirt-gconfig-object-private.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_DOMAIN_INTERFACE_NETWORK_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN_INTERFACE_NETWORK, GVirConfigDomainInterfaceNetworkPrivate)) @@ -53,7 +49,7 @@ static void gvir_config_domain_interface_network_class_init(GVirConfigDomainInte static void gvir_config_domain_interface_network_init(GVirConfigDomainInterfaceNetwork *conn) { - DEBUG("Init GVirConfigDomainInterfaceNetwork=%p", conn); + g_debug("Init GVirConfigDomainInterfaceNetwork=%p", conn); conn->priv = GVIR_CONFIG_DOMAIN_INTERFACE_NETWORK_GET_PRIVATE(conn); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface.c b/libvirt-gconfig/libvirt-gconfig-domain-interface.c index 3af98ee..c825fee 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface.c @@ -27,10 +27,6 @@ #include "libvirt-gconfig/libvirt-gconfig.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_DOMAIN_INTERFACE_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN_INTERFACE, GVirConfigDomainInterfacePrivate)) @@ -50,7 +46,7 @@ static void gvir_config_domain_interface_class_init(GVirConfigDomainInterfaceCla static void gvir_config_domain_interface_init(GVirConfigDomainInterface *interface) { - DEBUG("Init GVirConfigDomainInterface=%p", interface); + g_debug("Init GVirConfigDomainInterface=%p", interface); interface->priv = GVIR_CONFIG_DOMAIN_INTERFACE_GET_PRIVATE(interface); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-os.c b/libvirt-gconfig/libvirt-gconfig-domain-os.c index f1802ae..f5939d8 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-os.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-os.c @@ -30,10 +30,6 @@ #include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" #include "libvirt-gconfig/libvirt-gconfig-object-private.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_DOMAIN_OS_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN_OS, GVirConfigDomainOsPrivate)) @@ -53,7 +49,7 @@ static void gvir_config_domain_os_class_init(GVirConfigDomainOsClass *klass) static void gvir_config_domain_os_init(GVirConfigDomainOs *os) { - DEBUG("Init GVirConfigDomainOs=%p", os); + g_debug("Init GVirConfigDomainOs=%p", os); os->priv = GVIR_CONFIG_DOMAIN_OS_GET_PRIVATE(os); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c b/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c index 5835e69..421269d 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c @@ -27,10 +27,6 @@ #include "libvirt-gconfig/libvirt-gconfig.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_DOMAIN_SNAPSHOT_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN_SNAPSHOT, GVirConfigDomainSnapshotPrivate)) @@ -50,7 +46,7 @@ static void gvir_config_domain_snapshot_class_init(GVirConfigDomainSnapshotClass static void gvir_config_domain_snapshot_init(GVirConfigDomainSnapshot *conn) { - DEBUG("Init GVirConfigDomainSnapshot=%p", conn); + g_debug("Init GVirConfigDomainSnapshot=%p", conn); conn->priv = GVIR_CONFIG_DOMAIN_SNAPSHOT_GET_PRIVATE(conn); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-timer.c b/libvirt-gconfig/libvirt-gconfig-domain-timer.c index e03a2a2..c1610fa 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-timer.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-timer.c @@ -28,10 +28,6 @@ #include "libvirt-gconfig/libvirt-gconfig.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_DOMAIN_TIMER_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN_TIMER, GVirConfigDomainTimerPrivate)) @@ -51,7 +47,7 @@ static void gvir_config_domain_timer_class_init(GVirConfigDomainTimerClass *klas static void gvir_config_domain_timer_init(GVirConfigDomainTimer *timer) { - DEBUG("Init GVirConfigDomainTimer=%p", timer); + g_debug("Init GVirConfigDomainTimer=%p", timer); timer->priv = GVIR_CONFIG_DOMAIN_TIMER_GET_PRIVATE(timer); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-video.c b/libvirt-gconfig/libvirt-gconfig-domain-video.c index 8c6c9fb..7c62985 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-video.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-video.c @@ -30,10 +30,6 @@ #include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" #include "libvirt-gconfig/libvirt-gconfig-object-private.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_DOMAIN_VIDEO_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN_VIDEO, GVirConfigDomainVideoPrivate)) @@ -53,7 +49,7 @@ static void gvir_config_domain_video_class_init(GVirConfigDomainVideoClass *klas static void gvir_config_domain_video_init(GVirConfigDomainVideo *video) { - DEBUG("Init GVirConfigDomainVideo=%p", video); + g_debug("Init GVirConfigDomainVideo=%p", video); video->priv = GVIR_CONFIG_DOMAIN_VIDEO_GET_PRIVATE(video); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain.c b/libvirt-gconfig/libvirt-gconfig-domain.c index 2c21219..8f59dc4 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-domain.c @@ -29,10 +29,6 @@ #include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" #include "libvirt-gconfig/libvirt-gconfig-object-private.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_DOMAIN_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN, GVirConfigDomainPrivate)) @@ -151,7 +147,7 @@ static void gvir_config_domain_class_init(GVirConfigDomainClass *klass) static void gvir_config_domain_init(GVirConfigDomain *conn) { - DEBUG("Init GVirConfigDomain=%p", conn); + g_debug("Init GVirConfigDomain=%p", conn); conn->priv = GVIR_CONFIG_DOMAIN_GET_PRIVATE(conn); } diff --git a/libvirt-gconfig/libvirt-gconfig-interface.c b/libvirt-gconfig/libvirt-gconfig-interface.c index cffd840..6152c35 100644 --- a/libvirt-gconfig/libvirt-gconfig-interface.c +++ b/libvirt-gconfig/libvirt-gconfig-interface.c @@ -27,10 +27,6 @@ #include "libvirt-gconfig/libvirt-gconfig.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_INTERFACE_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_INTERFACE, GVirConfigInterfacePrivate)) @@ -50,7 +46,7 @@ static void gvir_config_interface_class_init(GVirConfigInterfaceClass *klass) static void gvir_config_interface_init(GVirConfigInterface *conn) { - DEBUG("Init GVirConfigInterface=%p", conn); + g_debug("Init GVirConfigInterface=%p", conn); conn->priv = GVIR_CONFIG_INTERFACE_GET_PRIVATE(conn); } diff --git a/libvirt-gconfig/libvirt-gconfig-network-filter.c b/libvirt-gconfig/libvirt-gconfig-network-filter.c index dcf9e56..47469ed 100644 --- a/libvirt-gconfig/libvirt-gconfig-network-filter.c +++ b/libvirt-gconfig/libvirt-gconfig-network-filter.c @@ -27,10 +27,6 @@ #include "libvirt-gconfig/libvirt-gconfig.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_NETWORK_FILTER_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_NETWORK_FILTER, GVirConfigNetworkFilterPrivate)) @@ -50,7 +46,7 @@ static void gvir_config_network_filter_class_init(GVirConfigNetworkFilterClass * static void gvir_config_network_filter_init(GVirConfigNetworkFilter *conn) { - DEBUG("Init GVirConfigNetworkFilter=%p", conn); + g_debug("Init GVirConfigNetworkFilter=%p", conn); conn->priv = GVIR_CONFIG_NETWORK_FILTER_GET_PRIVATE(conn); } diff --git a/libvirt-gconfig/libvirt-gconfig-network.c b/libvirt-gconfig/libvirt-gconfig-network.c index 73092de..9fe4181 100644 --- a/libvirt-gconfig/libvirt-gconfig-network.c +++ b/libvirt-gconfig/libvirt-gconfig-network.c @@ -27,10 +27,6 @@ #include "libvirt-gconfig/libvirt-gconfig.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_NETWORK_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_NETWORK, GVirConfigNetworkPrivate)) @@ -50,7 +46,7 @@ static void gvir_config_network_class_init(GVirConfigNetworkClass *klass) static void gvir_config_network_init(GVirConfigNetwork *conn) { - DEBUG("Init GVirConfigNetwork=%p", conn); + g_debug("Init GVirConfigNetwork=%p", conn); conn->priv = GVIR_CONFIG_NETWORK_GET_PRIVATE(conn); } diff --git a/libvirt-gconfig/libvirt-gconfig-node-device.c b/libvirt-gconfig/libvirt-gconfig-node-device.c index fa679b1..f89aeb1 100644 --- a/libvirt-gconfig/libvirt-gconfig-node-device.c +++ b/libvirt-gconfig/libvirt-gconfig-node-device.c @@ -27,10 +27,6 @@ #include "libvirt-gconfig/libvirt-gconfig.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_NODE_DEVICE_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_NODE_DEVICE, GVirConfigNodeDevicePrivate)) @@ -50,7 +46,7 @@ static void gvir_config_node_device_class_init(GVirConfigNodeDeviceClass *klass) static void gvir_config_node_device_init(GVirConfigNodeDevice *conn) { - DEBUG("Init GVirConfigNodeDevice=%p", conn); + g_debug("Init GVirConfigNodeDevice=%p", conn); conn->priv = GVIR_CONFIG_NODE_DEVICE_GET_PRIVATE(conn); } diff --git a/libvirt-gconfig/libvirt-gconfig-object.c b/libvirt-gconfig/libvirt-gconfig-object.c index edbaf57..714a68a 100644 --- a/libvirt-gconfig/libvirt-gconfig-object.c +++ b/libvirt-gconfig/libvirt-gconfig-object.c @@ -31,12 +31,6 @@ #include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" #include "libvirt-gconfig/libvirt-gconfig-object-private.h" - -//extern gboolean debugFlag; -gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_OBJECT_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_OBJECT, GVirConfigObjectPrivate)) @@ -127,7 +121,7 @@ static void gvir_config_object_finalize(GObject *object) GVirConfigObject *conn = GVIR_CONFIG_OBJECT(object); GVirConfigObjectPrivate *priv = conn->priv; - DEBUG("Finalize GVirConfigObject=%p", conn); + g_debug("Finalize GVirConfigObject=%p", conn); g_free(priv->schema); @@ -178,7 +172,7 @@ static void gvir_config_object_class_init(GVirConfigObjectClass *klass) static void gvir_config_object_init(GVirConfigObject *conn) { - DEBUG("Init GVirConfigObject=%p", conn); + g_debug("Init GVirConfigObject=%p", conn); conn->priv = GVIR_CONFIG_OBJECT_GET_PRIVATE(conn); } diff --git a/libvirt-gconfig/libvirt-gconfig-secret.c b/libvirt-gconfig/libvirt-gconfig-secret.c index 0c5de85..6f57aaa 100644 --- a/libvirt-gconfig/libvirt-gconfig-secret.c +++ b/libvirt-gconfig/libvirt-gconfig-secret.c @@ -27,10 +27,6 @@ #include "libvirt-gconfig/libvirt-gconfig.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_SECRET_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_SECRET, GVirConfigSecretPrivate)) @@ -50,7 +46,7 @@ static void gvir_config_secret_class_init(GVirConfigSecretClass *klass) static void gvir_config_secret_init(GVirConfigSecret *conn) { - DEBUG("Init GVirConfigSecret=%p", conn); + g_debug("Init GVirConfigSecret=%p", conn); conn->priv = GVIR_CONFIG_SECRET_GET_PRIVATE(conn); } diff --git a/libvirt-gconfig/libvirt-gconfig-storage-pool.c b/libvirt-gconfig/libvirt-gconfig-storage-pool.c index aad60ed..c95cf59 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-pool.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-pool.c @@ -27,10 +27,6 @@ #include "libvirt-gconfig/libvirt-gconfig.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_STORAGE_POOL_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_STORAGE_POOL, GVirConfigStoragePoolPrivate)) @@ -50,7 +46,7 @@ static void gvir_config_storage_pool_class_init(GVirConfigStoragePoolClass *klas static void gvir_config_storage_pool_init(GVirConfigStoragePool *conn) { - DEBUG("Init GVirConfigStoragePool=%p", conn); + g_debug("Init GVirConfigStoragePool=%p", conn); conn->priv = GVIR_CONFIG_STORAGE_POOL_GET_PRIVATE(conn); } diff --git a/libvirt-gconfig/libvirt-gconfig-storage-vol.c b/libvirt-gconfig/libvirt-gconfig-storage-vol.c index 4a59b72..5a31c80 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-vol.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-vol.c @@ -27,10 +27,6 @@ #include "libvirt-gconfig/libvirt-gconfig.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONFIG_STORAGE_VOL_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_STORAGE_VOL, GVirConfigStorageVolPrivate)) @@ -50,7 +46,7 @@ static void gvir_config_storage_vol_class_init(GVirConfigStorageVolClass *klass) static void gvir_config_storage_vol_init(GVirConfigStorageVol *conn) { - DEBUG("Init GVirConfigStorageVol=%p", conn); + g_debug("Init GVirConfigStorageVol=%p", conn); conn->priv = GVIR_CONFIG_STORAGE_VOL_GET_PRIVATE(conn); } diff --git a/libvirt-glib/libvirt-glib-event.c b/libvirt-glib/libvirt-glib-event.c index 0775632..ac14354 100644 --- a/libvirt-glib/libvirt-glib-event.c +++ b/libvirt-glib/libvirt-glib-event.c @@ -31,10 +31,6 @@ #include "libvirt-glib/libvirt-glib.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - struct gvir_event_handle { int watch; @@ -83,7 +79,7 @@ gvir_event_handle_dispatch(GIOChannel *source G_GNUC_UNUSED, if (condition & G_IO_ERR) events |= VIR_EVENT_HANDLE_ERROR; - DEBUG("Dispatch handler %d %d %p\n", data->fd, events, data->opaque); + g_debug("Dispatch handler %d %d %p\n", data->fd, events, data->opaque); (data->cb)(data->watch, data->fd, events, data->opaque); @@ -119,7 +115,7 @@ gvir_event_handle_add(int fd, data->channel = g_io_channel_unix_new(fd); data->ff = ff; - DEBUG("Add handle %d %d %p\n", data->fd, events, data->opaque); + g_debug("Add handle %d %d %p\n", data->fd, events, data->opaque); data->source = g_io_add_watch(data->channel, cond, @@ -168,7 +164,7 @@ gvir_event_handle_update(int watch, data = gvir_event_handle_find(watch, NULL); if (!data) { - DEBUG("Update for missing handle watch %d", watch); + g_debug("Update for missing handle watch %d", watch); goto cleanup; } @@ -227,11 +223,11 @@ gvir_event_handle_remove(int watch) data = gvir_event_handle_find(watch, &idx); if (!data) { - DEBUG("Remove of missing watch %d", watch); + g_debug("Remove of missing watch %d", watch); goto cleanup; } - DEBUG("Remove handle %d %d\n", watch, data->fd); + g_debug("Remove handle %d %d\n", watch, data->fd); if (!data->source) goto cleanup; @@ -253,7 +249,7 @@ static gboolean gvir_event_timeout_dispatch(void *opaque) { struct gvir_event_timeout *data = opaque; - DEBUG("Dispatch timeout %p %p %d %p\n", data, data->cb, data->timer, data->opaque); + g_debug("Dispatch timeout %p %p %d %p\n", data, data->cb, data->timer, data->opaque); (data->cb)(data->timer, data->opaque); return TRUE; @@ -283,7 +279,7 @@ gvir_event_timeout_add(int interval, g_ptr_array_add(timeouts, data); - DEBUG("Add timeout %p %d %p %p %d\n", data, interval, cb, opaque, data->timer); + g_debug("Add timeout %p %d %p %p %d\n", data, interval, cb, opaque, data->timer); ret = data->timer; @@ -329,11 +325,11 @@ gvir_event_timeout_update(int timer, data = gvir_event_timeout_find(timer, NULL); if (!data) { - DEBUG("Update of missing timer %d", timer); + g_debug("Update of missing timer %d", timer); goto cleanup; } - DEBUG("Update timeout %p %d %d\n", data, timer, interval); + g_debug("Update timeout %p %d %d\n", data, timer, interval); if (interval >= 0) { if (data->source) @@ -379,11 +375,11 @@ gvir_event_timeout_remove(int timer) data = gvir_event_timeout_find(timer, &idx); if (!data) { - DEBUG("Remove of missing timer %d", timer); + g_debug("Remove of missing timer %d", timer); goto cleanup; } - DEBUG("Remove timeout %p %d\n", data, timer); + g_debug("Remove timeout %p %d\n", data, timer); if (!data->source) goto cleanup; diff --git a/libvirt-glib/libvirt-glib-main.c b/libvirt-glib/libvirt-glib-main.c index 4dc7d58..8d2f216 100644 --- a/libvirt-glib/libvirt-glib-main.c +++ b/libvirt-glib/libvirt-glib-main.c @@ -28,15 +28,11 @@ #include "libvirt-glib-main.h" -gboolean debugFlag = FALSE; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - static void gvir_error_func(gpointer opaque G_GNUC_UNUSED, virErrorPtr err) { - DEBUG("Error: %s", err->message); + g_debug("Error: %s", err->message); } @@ -55,10 +51,6 @@ gboolean gvir_init_check(int *argc G_GNUC_UNUSED, char ***argv G_GNUC_UNUSED, GError **err G_GNUC_UNUSED) { - char *debugEnv = getenv("LIBVIRT_GLIB_DEBUG"); - if (debugEnv && *debugEnv && *debugEnv != '0') - debugFlag = 1; - virSetErrorFunc(NULL, gvir_error_func); if (!g_thread_supported()) g_thread_init(NULL); diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index a258847..ee0fb1b 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -30,10 +30,6 @@ #include "libvirt-gobject/libvirt-gobject.h" #include "libvirt-gobject-compat.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_CONNECTION_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONNECTION, GVirConnectionPrivate)) @@ -128,7 +124,7 @@ static void gvir_connection_finalize(GObject *object) GVirConnection *conn = GVIR_CONNECTION(object); GVirConnectionPrivate *priv = conn->priv; - DEBUG("Finalize GVirConnection=%p", conn); + g_debug("Finalize GVirConnection=%p", conn); if (gvir_connection_is_open(conn)) gvir_connection_close(conn); @@ -230,7 +226,7 @@ static void gvir_connection_init(GVirConnection *conn) { GVirConnectionPrivate *priv; - DEBUG("Init GVirConnection=%p", conn); + g_debug("Init GVirConnection=%p", conn); priv = conn->priv = GVIR_CONNECTION_GET_PRIVATE(conn); @@ -270,7 +266,7 @@ static int domain_event_cb(virConnectPtr conn G_GNUC_UNUSED, return 0; } - DEBUG("%s: %s event:%d, detail:%d", G_STRFUNC, uuid, event, detail); + g_debug("%s: %s event:%d, detail:%d", G_STRFUNC, uuid, event, detail); g_mutex_lock(priv->lock); gdom = g_hash_table_lookup(priv->domains, uuid); @@ -499,7 +495,7 @@ gboolean gvir_connection_is_open(GVirConnection *conn) void gvir_connection_close(GVirConnection *conn) { GVirConnectionPrivate *priv = conn->priv; - DEBUG("Close GVirConnection=%p", conn); + g_debug("Close GVirConnection=%p", conn); g_mutex_lock(priv->lock); diff --git a/libvirt-gobject/libvirt-gobject-domain-device.c b/libvirt-gobject/libvirt-gobject-domain-device.c index ae03489..4264c65 100644 --- a/libvirt-gobject/libvirt-gobject-domain-device.c +++ b/libvirt-gobject/libvirt-gobject-domain-device.c @@ -30,10 +30,6 @@ #include "libvirt-gobject/libvirt-gobject-domain-device-private.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_DOMAIN_DEVICE_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_DOMAIN_DEVICE, GVirDomainDevicePrivate)) @@ -93,7 +89,7 @@ static void gvir_domain_device_finalize(GObject *object) GVirDomainDevice *self = GVIR_DOMAIN_DEVICE(object); GVirDomainDevicePrivate *priv = self->priv; - DEBUG("Finalize GVirDomainDevice=%p", self); + g_debug("Finalize GVirDomainDevice=%p", self); g_clear_object(&priv->domain); @@ -123,7 +119,7 @@ static void gvir_domain_device_class_init(GVirDomainDeviceClass *klass) static void gvir_domain_device_init(GVirDomainDevice *self) { - DEBUG("Init GVirDomainDevice=%p", self); + g_debug("Init GVirDomainDevice=%p", self); self->priv = GVIR_DOMAIN_DEVICE_GET_PRIVATE(self); } diff --git a/libvirt-gobject/libvirt-gobject-domain-disk.c b/libvirt-gobject/libvirt-gobject-domain-disk.c index b8f9dbb..3659758 100644 --- a/libvirt-gobject/libvirt-gobject-domain-disk.c +++ b/libvirt-gobject/libvirt-gobject-domain-disk.c @@ -31,10 +31,6 @@ #include "libvirt-gobject/libvirt-gobject-domain-device-private.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_DOMAIN_DISK_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_DOMAIN_DISK, GVirDomainDiskPrivate)) @@ -103,7 +99,7 @@ static void gvir_domain_disk_finalize(GObject *object) GVirDomainDisk *self = GVIR_DOMAIN_DISK(object); GVirDomainDiskPrivate *priv = self->priv; - DEBUG("Finalize GVirDomainDisk=%p", self); + g_debug("Finalize GVirDomainDisk=%p", self); g_free(priv->path); @@ -133,7 +129,7 @@ static void gvir_domain_disk_class_init(GVirDomainDiskClass *klass) static void gvir_domain_disk_init(GVirDomainDisk *self) { - DEBUG("Init GVirDomainDisk=%p", self); + g_debug("Init GVirDomainDisk=%p", self); self->priv = GVIR_DOMAIN_DISK_GET_PRIVATE(self); } diff --git a/libvirt-gobject/libvirt-gobject-domain-interface.c b/libvirt-gobject/libvirt-gobject-domain-interface.c index a6720c8..9f6ce8d 100644 --- a/libvirt-gobject/libvirt-gobject-domain-interface.c +++ b/libvirt-gobject/libvirt-gobject-domain-interface.c @@ -31,10 +31,6 @@ #include "libvirt-gobject/libvirt-gobject-domain-device-private.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_DOMAIN_INTERFACE_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_DOMAIN_INTERFACE, GVirDomainInterfacePrivate)) @@ -103,7 +99,7 @@ static void gvir_domain_interface_finalize(GObject *object) GVirDomainInterface *self = GVIR_DOMAIN_INTERFACE(object); GVirDomainInterfacePrivate *priv = self->priv; - DEBUG("Finalize GVirDomainInterface=%p", self); + g_debug("Finalize GVirDomainInterface=%p", self); g_free(priv->path); @@ -133,7 +129,7 @@ static void gvir_domain_interface_class_init(GVirDomainInterfaceClass *klass) static void gvir_domain_interface_init(GVirDomainInterface *self) { - DEBUG("Init GVirDomainInterface=%p", self); + g_debug("Init GVirDomainInterface=%p", self); self->priv = GVIR_DOMAIN_INTERFACE_GET_PRIVATE(self); } diff --git a/libvirt-gobject/libvirt-gobject-domain-snapshot.c b/libvirt-gobject/libvirt-gobject-domain-snapshot.c index afd1e96..578e348 100644 --- a/libvirt-gobject/libvirt-gobject-domain-snapshot.c +++ b/libvirt-gobject/libvirt-gobject-domain-snapshot.c @@ -30,10 +30,6 @@ #include "libvirt-gobject/libvirt-gobject.h" #include "libvirt-gobject-compat.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_DOMAIN_SNAPSHOT_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_DOMAIN_SNAPSHOT, GVirDomainSnapshotPrivate)) @@ -105,7 +101,7 @@ static void gvir_domain_snapshot_finalize(GObject *object) GVirDomainSnapshot *conn = GVIR_DOMAIN_SNAPSHOT(object); GVirDomainSnapshotPrivate *priv = conn->priv; - DEBUG("Finalize GVirDomainSnapshot=%p", conn); + g_debug("Finalize GVirDomainSnapshot=%p", conn); virDomainSnapshotFree(priv->handle); @@ -140,7 +136,7 @@ static void gvir_domain_snapshot_class_init(GVirDomainSnapshotClass *klass) static void gvir_domain_snapshot_init(GVirDomainSnapshot *conn) { - DEBUG("Init GVirDomainSnapshot=%p", conn); + g_debug("Init GVirDomainSnapshot=%p", conn); conn->priv = GVIR_DOMAIN_SNAPSHOT_GET_PRIVATE(conn); } diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index 464d287..506f5fd 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -30,10 +30,6 @@ #include "libvirt-gobject/libvirt-gobject.h" #include "libvirt-gobject-compat.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_DOMAIN_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_DOMAIN, GVirDomainPrivate)) @@ -116,7 +112,7 @@ static void gvir_domain_finalize(GObject *object) GVirDomain *conn = GVIR_DOMAIN(object); GVirDomainPrivate *priv = conn->priv; - DEBUG("Finalize GVirDomain=%p", conn); + g_debug("Finalize GVirDomain=%p", conn); virDomainFree(priv->handle); @@ -215,7 +211,7 @@ static void gvir_domain_class_init(GVirDomainClass *klass) static void gvir_domain_init(GVirDomain *conn) { - DEBUG("Init GVirDomain=%p", conn); + g_debug("Init GVirDomain=%p", conn); conn->priv = GVIR_DOMAIN_GET_PRIVATE(conn); } diff --git a/libvirt-gobject/libvirt-gobject-input-stream.c b/libvirt-gobject/libvirt-gobject-input-stream.c index 39459c4..3519aaf 100644 --- a/libvirt-gobject/libvirt-gobject-input-stream.c +++ b/libvirt-gobject/libvirt-gobject-input-stream.c @@ -30,10 +30,6 @@ #include "libvirt-gobject/libvirt-gobject.h" #include "libvirt-gobject-input-stream.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define gvir_input_stream_get_type _gvir_input_stream_get_type G_DEFINE_TYPE(GVirInputStream, gvir_input_stream, G_TYPE_INPUT_STREAM); @@ -92,7 +88,7 @@ static void gvir_input_stream_finalize(GObject *object) { GVirInputStream *stream = GVIR_INPUT_STREAM(object); - DEBUG("Finalize input stream GVirStream=%p", stream->priv->stream); + g_debug("Finalize input stream GVirStream=%p", stream->priv->stream); stream->priv->stream = NULL; // unowned if (G_OBJECT_CLASS(gvir_input_stream_parent_class)->finalize) diff --git a/libvirt-gobject/libvirt-gobject-interface.c b/libvirt-gobject/libvirt-gobject-interface.c index 3be633c..07f857c 100644 --- a/libvirt-gobject/libvirt-gobject-interface.c +++ b/libvirt-gobject/libvirt-gobject-interface.c @@ -29,10 +29,6 @@ #include "libvirt-glib/libvirt-glib.h" #include "libvirt-gobject/libvirt-gobject.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_INTERFACE_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_INTERFACE, GVirInterfacePrivate)) @@ -104,7 +100,7 @@ static void gvir_interface_finalize(GObject *object) GVirInterface *conn = GVIR_INTERFACE(object); GVirInterfacePrivate *priv = conn->priv; - DEBUG("Finalize GVirInterface=%p", conn); + g_debug("Finalize GVirInterface=%p", conn); virInterfaceFree(priv->handle); @@ -139,7 +135,7 @@ static void gvir_interface_class_init(GVirInterfaceClass *klass) static void gvir_interface_init(GVirInterface *conn) { - DEBUG("Init GVirInterface=%p", conn); + g_debug("Init GVirInterface=%p", conn); conn->priv = GVIR_INTERFACE_GET_PRIVATE(conn); } diff --git a/libvirt-gobject/libvirt-gobject-main.c b/libvirt-gobject/libvirt-gobject-main.c index b29552c..0b90b2a 100644 --- a/libvirt-gobject/libvirt-gobject-main.c +++ b/libvirt-gobject/libvirt-gobject-main.c @@ -28,10 +28,6 @@ #include "libvirt-glib/libvirt-glib.h" #include "libvirt-gobject/libvirt-gobject.h" -gboolean debugFlag = FALSE; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - /** * gvir_init_object: * @argc: (inout): pointer to application's argc @@ -58,10 +54,6 @@ gboolean gvir_init_object_check(int *argc, char ***argv, GError **err) { - char *debugEnv = getenv("LIBVIRT_GOBJECT_DEBUG"); - if (debugEnv && *debugEnv && *debugEnv != '0') - debugFlag = 1; - g_type_init(); gvir_event_register(); diff --git a/libvirt-gobject/libvirt-gobject-manager.c b/libvirt-gobject/libvirt-gobject-manager.c index 5f3a11a..35308ca 100644 --- a/libvirt-gobject/libvirt-gobject-manager.c +++ b/libvirt-gobject/libvirt-gobject-manager.c @@ -29,10 +29,6 @@ #include "libvirt-glib/libvirt-glib.h" #include "libvirt-gobject/libvirt-gobject.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_MANAGER_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_MANAGER, GVirManagerPrivate)) @@ -66,7 +62,7 @@ static void gvir_manager_finalize(GObject *object) GVirManager *man = GVIR_MANAGER(object); GVirManagerPrivate *priv = man->priv; - DEBUG("Finalize GVirManager=%p", man); + g_debug("Finalize GVirManager=%p", man); GList *tmp = priv->connections; while (tmp) { @@ -115,7 +111,7 @@ static void gvir_manager_init(GVirManager *conn) { GVirManagerPrivate *priv; - DEBUG("Init GVirManager=%p", conn); + g_debug("Init GVirManager=%p", conn); priv = conn->priv = GVIR_MANAGER_GET_PRIVATE(conn); diff --git a/libvirt-gobject/libvirt-gobject-network-filter.c b/libvirt-gobject/libvirt-gobject-network-filter.c index 01e9636..3a66590 100644 --- a/libvirt-gobject/libvirt-gobject-network-filter.c +++ b/libvirt-gobject/libvirt-gobject-network-filter.c @@ -30,10 +30,6 @@ #include "libvirt-gobject/libvirt-gobject.h" #include "libvirt-gobject-compat.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_NETWORK_FILTER_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_NETWORK_FILTER, GVirNetworkFilterPrivate)) @@ -106,7 +102,7 @@ static void gvir_network_filter_finalize(GObject *object) GVirNetworkFilter *nf = GVIR_NETWORK_FILTER(object); GVirNetworkFilterPrivate *priv = nf->priv; - DEBUG("Finalize GVirNetworkFilter=%p", nf); + g_debug("Finalize GVirNetworkFilter=%p", nf); virNWFilterFree(priv->handle); @@ -156,7 +152,7 @@ static void gvir_network_filter_class_init(GVirNetworkFilterClass *klass) static void gvir_network_filter_init(GVirNetworkFilter *conn) { - DEBUG("Init GVirNetworkFilter=%p", conn); + g_debug("Init GVirNetworkFilter=%p", conn); conn->priv = GVIR_NETWORK_FILTER_GET_PRIVATE(conn); } diff --git a/libvirt-gobject/libvirt-gobject-network.c b/libvirt-gobject/libvirt-gobject-network.c index 3c49117..662fc2f 100644 --- a/libvirt-gobject/libvirt-gobject-network.c +++ b/libvirt-gobject/libvirt-gobject-network.c @@ -30,10 +30,6 @@ #include "libvirt-gobject/libvirt-gobject.h" #include "libvirt-gobject-compat.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_NETWORK_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_NETWORK, GVirNetworkPrivate)) @@ -106,7 +102,7 @@ static void gvir_network_finalize(GObject *object) GVirNetwork *conn = GVIR_NETWORK(object); GVirNetworkPrivate *priv = conn->priv; - DEBUG("Finalize GVirNetwork=%p", conn); + g_debug("Finalize GVirNetwork=%p", conn); virNetworkFree(priv->handle); @@ -154,7 +150,7 @@ static void gvir_network_class_init(GVirNetworkClass *klass) static void gvir_network_init(GVirNetwork *conn) { - DEBUG("Init GVirNetwork=%p", conn); + g_debug("Init GVirNetwork=%p", conn); conn->priv = GVIR_NETWORK_GET_PRIVATE(conn); } diff --git a/libvirt-gobject/libvirt-gobject-node-device.c b/libvirt-gobject/libvirt-gobject-node-device.c index 04d7d04..3d1809c 100644 --- a/libvirt-gobject/libvirt-gobject-node-device.c +++ b/libvirt-gobject/libvirt-gobject-node-device.c @@ -30,10 +30,6 @@ #include "libvirt-gobject/libvirt-gobject.h" #include "libvirt-gobject-compat.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_NODE_DEVICE_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_NODE_DEVICE, GVirNodeDevicePrivate)) @@ -105,7 +101,7 @@ static void gvir_node_device_finalize(GObject *object) GVirNodeDevice *conn = GVIR_NODE_DEVICE(object); GVirNodeDevicePrivate *priv = conn->priv; - DEBUG("Finalize GVirNodeDevice=%p", conn); + g_debug("Finalize GVirNodeDevice=%p", conn); virNodeDeviceFree(priv->handle); @@ -140,7 +136,7 @@ static void gvir_node_device_class_init(GVirNodeDeviceClass *klass) static void gvir_node_device_init(GVirNodeDevice *conn) { - DEBUG("Init GVirNodeDevice=%p", conn); + g_debug("Init GVirNodeDevice=%p", conn); conn->priv = GVIR_NODE_DEVICE_GET_PRIVATE(conn); } diff --git a/libvirt-gobject/libvirt-gobject-output-stream.c b/libvirt-gobject/libvirt-gobject-output-stream.c index 30ee519..78d08a5 100644 --- a/libvirt-gobject/libvirt-gobject-output-stream.c +++ b/libvirt-gobject/libvirt-gobject-output-stream.c @@ -30,10 +30,6 @@ #include "libvirt-gobject/libvirt-gobject.h" #include "libvirt-gobject-output-stream.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define gvir_output_stream_get_type _gvir_output_stream_get_type G_DEFINE_TYPE(GVirOutputStream, gvir_output_stream, G_TYPE_OUTPUT_STREAM); @@ -92,7 +88,7 @@ static void gvir_output_stream_finalize(GObject *object) { GVirOutputStream *stream = GVIR_OUTPUT_STREAM(object); - DEBUG("Finalize output stream GVirStream=%p", stream->priv->stream); + g_debug("Finalize output stream GVirStream=%p", stream->priv->stream); stream->priv->stream = NULL; // unowned if (G_OBJECT_CLASS(gvir_output_stream_parent_class)->finalize) diff --git a/libvirt-gobject/libvirt-gobject-secret.c b/libvirt-gobject/libvirt-gobject-secret.c index f2fd9a8..f2bb611 100644 --- a/libvirt-gobject/libvirt-gobject-secret.c +++ b/libvirt-gobject/libvirt-gobject-secret.c @@ -30,10 +30,6 @@ #include "libvirt-gobject/libvirt-gobject.h" #include "libvirt-gobject-compat.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_SECRET_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_SECRET, GVirSecretPrivate)) @@ -106,7 +102,7 @@ static void gvir_secret_finalize(GObject *object) GVirSecret *conn = GVIR_SECRET(object); GVirSecretPrivate *priv = conn->priv; - DEBUG("Finalize GVirSecret=%p", conn); + g_debug("Finalize GVirSecret=%p", conn); virSecretFree(priv->handle); @@ -156,7 +152,7 @@ static void gvir_secret_class_init(GVirSecretClass *klass) static void gvir_secret_init(GVirSecret *conn) { - DEBUG("Init GVirSecret=%p", conn); + g_debug("Init GVirSecret=%p", conn); conn->priv = GVIR_SECRET_GET_PRIVATE(conn); } diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c index cb69e7e..da8ada5 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.c +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c @@ -30,10 +30,6 @@ #include "libvirt-gobject/libvirt-gobject.h" #include "libvirt-gobject-compat.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_STORAGE_POOL_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_STORAGE_POOL, GVirStoragePoolPrivate)) @@ -109,7 +105,7 @@ static void gvir_storage_pool_finalize(GObject *object) GVirStoragePool *pool = GVIR_STORAGE_POOL(object); GVirStoragePoolPrivate *priv = pool->priv; - DEBUG("Finalize GVirStoragePool=%p", pool); + g_debug("Finalize GVirStoragePool=%p", pool); if (priv->volumes) { g_hash_table_unref(priv->volumes); @@ -168,7 +164,7 @@ static void gvir_storage_pool_init(GVirStoragePool *pool) { GVirStoragePoolPrivate *priv; - DEBUG("Init GVirStoragePool=%p", pool); + g_debug("Init GVirStoragePool=%p", pool); priv = pool->priv = GVIR_STORAGE_POOL_GET_PRIVATE(pool); diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.c b/libvirt-gobject/libvirt-gobject-storage-vol.c index 0c8cb09..6340ad7 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.c +++ b/libvirt-gobject/libvirt-gobject-storage-vol.c @@ -30,10 +30,6 @@ #include "libvirt-gobject/libvirt-gobject.h" #include "libvirt-gobject-compat.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_STORAGE_VOL_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_STORAGE_VOL, GVirStorageVolPrivate)) @@ -105,7 +101,7 @@ static void gvir_storage_vol_finalize(GObject *object) GVirStorageVol *conn = GVIR_STORAGE_VOL(object); GVirStorageVolPrivate *priv = conn->priv; - DEBUG("Finalize GVirStorageVol=%p", conn); + g_debug("Finalize GVirStorageVol=%p", conn); virStorageVolFree(priv->handle); @@ -140,7 +136,7 @@ static void gvir_storage_vol_class_init(GVirStorageVolClass *klass) static void gvir_storage_vol_init(GVirStorageVol *conn) { - DEBUG("Init GVirStorageVol=%p", conn); + g_debug("Init GVirStorageVol=%p", conn); conn->priv = GVIR_STORAGE_VOL_GET_PRIVATE(conn); } diff --git a/libvirt-gobject/libvirt-gobject-stream.c b/libvirt-gobject/libvirt-gobject-stream.c index 0d1c2d1..080a697 100644 --- a/libvirt-gobject/libvirt-gobject-stream.c +++ b/libvirt-gobject/libvirt-gobject-stream.c @@ -34,10 +34,6 @@ #include "libvirt-gobject/libvirt-gobject-input-stream.h" #include "libvirt-gobject/libvirt-gobject-output-stream.h" -extern gboolean debugFlag; - -#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) - #define GVIR_STREAM_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_STREAM, GVirStreamPrivate)) @@ -187,7 +183,7 @@ static void gvir_stream_finalize(GObject *object) GVirStream *self = GVIR_STREAM(object); GVirStreamPrivate *priv = self->priv; - DEBUG("Finalize GVirStream=%p", self); + g_debug("Finalize GVirStream=%p", self); if (self->priv->input_stream) g_object_unref(self->priv->input_stream); -- 1.7.7.3