- Devel - libvirt List Archives

[libvirt] [libvirt-glib] Fix gvir_config_domain_clock_set_variable_offset
by Christophe Fergeau 30 Nov '11

30 Nov '11

It was creating an extra <clock> node as a child of the "main" one which is not what was intended --- libvirt-gconfig/libvirt-gconfig-domain-clock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-clock.c b/libvirt-gconfig/libvirt-gconfig-domain-clock.c index 27d1e67..b28856c 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-clock.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-clock.c @@ -121,7 +121,7 @@ void gvir_config_domain_clock_set_variable_offset(GVirConfigDomainClock *klock, g_return_if_fail(GVIR_IS_CONFIG_DOMAIN_CLOCK(klock)); - node = gvir_config_object_replace_child(GVIR_CONFIG_OBJECT(klock), "clock"); + node = gvir_config_object_get_xml_node(GVIR_CONFIG_OBJECT(klock)); if (node == NULL) return; -- 1.7.7.3

2 1

[libvirt] [libvirt-glib 1/2] Rely on libvirt API to detect transient domains
by Zeeshan Ali (Khattak) 30 Nov '11

30 Nov '11

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gobject/libvirt-gobject-connection.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index c9985b2..b647bfa 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -260,7 +260,6 @@ static int domain_event_cb(virConnectPtr conn G_GNUC_UNUSED, GVirConnection *gconn = opaque; GVirDomain *gdom; GVirConnectionPrivate *priv = gconn->priv; - gboolean was_unknown = FALSE; if (virDomainGetUUIDString(dom, uuid) < 0) { g_warning("Failed to get domain UUID on %p", dom); @@ -279,8 +278,6 @@ static int domain_event_cb(virConnectPtr conn G_GNUC_UNUSED, g_mutex_lock(priv->lock); g_hash_table_insert(priv->domains, (gpointer)gvir_domain_get_uuid(gdom), gdom); g_mutex_unlock(priv->lock); - - was_unknown = TRUE; } switch (event) { @@ -307,8 +304,7 @@ static int domain_event_cb(virConnectPtr conn G_GNUC_UNUSED, case VIR_DOMAIN_EVENT_STARTED: if (detail == VIR_DOMAIN_EVENT_STARTED_BOOTED) { - if (was_unknown) - /* Most probably a transient domain */ + if (!virDomainIsPersistent(dom)) g_signal_emit(gconn, signals[VIR_DOMAIN_ADDED], 0, gdom); g_signal_emit_by_name(gdom, "started::booted"); } else if (detail == VIR_DOMAIN_EVENT_STARTED_MIGRATED) -- 1.7.7.3

3 5

[libvirt] [libvirt-glib 01/13] Add GVirConfigXmlDoc type
by Christophe Fergeau 30 Nov '11

30 Nov '11

This class derives from GObject and wraps an xmlDocPtr. It will be useful to refcount xmlDoc so that it can be shared between multiple GVirConfigObject instances. --- libvirt-gconfig/Makefile.am | 4 +- libvirt-gconfig/libvirt-gconfig-xml-doc.c | 137 +++++++++++++++++++++++++++++ libvirt-gconfig/libvirt-gconfig-xml-doc.h | 66 ++++++++++++++ 3 files changed, 206 insertions(+), 1 deletions(-) create mode 100644 libvirt-gconfig/libvirt-gconfig-xml-doc.c create mode 100644 libvirt-gconfig/libvirt-gconfig-xml-doc.h diff --git a/libvirt-gconfig/Makefile.am b/libvirt-gconfig/Makefile.am index e91c601..8276d07 100644 --- a/libvirt-gconfig/Makefile.am +++ b/libvirt-gconfig/Makefile.am @@ -35,6 +35,7 @@ GCONFIG_HEADER_FILES = \ noinst_HEADERS = \ libvirt-gconfig-helpers-private.h \ libvirt-gconfig-object-private.h + libvirt-gconfig-xml-doc.h GCONFIG_SOURCE_FILES = \ libvirt-gconfig-object.c \ libvirt-gconfig-capabilities.c \ @@ -59,7 +60,8 @@ GCONFIG_SOURCE_FILES = \ libvirt-gconfig-node-device.c \ libvirt-gconfig-secret.c \ libvirt-gconfig-storage-pool.c \ - libvirt-gconfig-storage-vol.c + libvirt-gconfig-storage-vol.c \ + libvirt-gconfig-xml-doc.c libvirt_gconfig_1_0_ladir = $(includedir)/libvirt-gconfig-1.0/libvirt-gconfig libvirt_gconfig_1_0_la_HEADERS = \ diff --git a/libvirt-gconfig/libvirt-gconfig-xml-doc.c b/libvirt-gconfig/libvirt-gconfig-xml-doc.c new file mode 100644 index 0000000..7906158 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-xml-doc.c @@ -0,0 +1,137 @@ +/* + * libvirt-gobject-config-xml-node.c: libvirt glib integration + * + * Copyright (C) 2011 Red Hat + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Christophe Fergeau <cfergeau(a)gmail.com> + */ + +#include <config.h> + +#include <string.h> + +#include <libxml/tree.h> + +#include "libvirt-gconfig/libvirt-gconfig.h" +#include "libvirt-gconfig/libvirt-gconfig-xml-doc.h" + +extern gboolean debugFlag; + +#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) + +#define GVIR_CONFIG_XML_DOC_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_XML_DOC, GVirConfigXmlDocPrivate)) + +struct _GVirConfigXmlDocPrivate +{ + xmlDocPtr doc; +}; + +G_DEFINE_TYPE(GVirConfigXmlDoc, gvir_config_xml_doc, G_TYPE_OBJECT); + +enum { + PROP_0, + PROP_DOC +}; + +static void gvir_config_xml_doc_get_property(GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + GVirConfigXmlDoc *xml_doc = GVIR_CONFIG_XML_DOC(object); + + switch (prop_id) { + case PROP_DOC: + g_value_set_pointer(value, xml_doc->priv->doc); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + } +} + +static void gvir_config_xml_doc_set_property(GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + GVirConfigXmlDoc *doc = GVIR_CONFIG_XML_DOC(object); + + switch (prop_id) { + case PROP_DOC: + doc->priv->doc = g_value_get_pointer(value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + } +} + +static void gvir_config_xml_doc_finalize(GObject *object) +{ + GVirConfigXmlDoc *doc = GVIR_CONFIG_XML_DOC(object); + GVirConfigXmlDocPrivate *priv = doc->priv; + + DEBUG("Finalize GVirConfigXmlDoc=%p", doc); + + if (priv->doc) + xmlFreeDoc(priv->doc); + + G_OBJECT_CLASS(gvir_config_xml_doc_parent_class)->finalize(object); +} + +static void gvir_config_xml_doc_class_init(GVirConfigXmlDocClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS(klass); + + g_type_class_add_private(klass, sizeof(GVirConfigXmlDocPrivate)); + + object_class->finalize = gvir_config_xml_doc_finalize; + object_class->get_property = gvir_config_xml_doc_get_property; + object_class->set_property = gvir_config_xml_doc_set_property; + + g_object_class_install_property(object_class, + PROP_DOC, + g_param_spec_pointer("doc", + "XML Doc", + "The XML doc this config object corresponds to", + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_STRINGS)); +} + + +static void gvir_config_xml_doc_init(GVirConfigXmlDoc *xml_doc) +{ + GVirConfigXmlDocPrivate *priv; + + DEBUG("Init GVirConfigXmlDoc=%p", xml_doc); + + priv = xml_doc->priv = GVIR_CONFIG_XML_DOC_GET_PRIVATE(xml_doc); + + memset(priv, 0, sizeof(*priv)); +} + + +GVirConfigXmlDoc *gvir_config_xml_doc_new(xmlDocPtr doc) +{ + if (doc == NULL) { + doc = xmlNewDoc((xmlChar *)"1.0"); + } + return GVIR_CONFIG_XML_DOC(g_object_new(GVIR_TYPE_CONFIG_XML_DOC, + "doc", doc, + NULL)); +} diff --git a/libvirt-gconfig/libvirt-gconfig-xml-doc.h b/libvirt-gconfig/libvirt-gconfig-xml-doc.h new file mode 100644 index 0000000..079de1e --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-xml-doc.h @@ -0,0 +1,66 @@ +/* + * libvirt-gobject-xml-doc.h: libvirt gobject integration + * + * Copyright (C) 2011 Red Hat + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Christophe Fergeau <cfergeau(a)gmail.com> + */ + +#if !defined(__LIBVIRT_GCONFIG_H__) && !defined(LIBVIRT_GCONFIG_BUILD) +#error "Only <libvirt-gconfig/libvirt-gconfig.h> can be included directly." +#endif + +#ifndef __LIBVIRT_GCONFIG_XML_DOC_H__ +#define __LIBVIRT_GCONFIG_XML_DOC_H__ + +G_BEGIN_DECLS + +#define GVIR_TYPE_CONFIG_XML_DOC (gvir_config_xml_doc_get_type ()) +#define GVIR_CONFIG_XML_DOC(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_TYPE_CONFIG_XML_DOC, GVirConfigXmlDoc)) +#define GVIR_CONFIG_XML_DOC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_TYPE_CONFIG_XML_DOC, GVirConfigXmlDocClass)) +#define GVIR_IS_CONFIG_XML_DOC(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_TYPE_CONFIG_XML_DOC)) +#define GVIR_IS_CONFIG_XML_DOC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_TYPE_CONFIG_XML_DOC)) +#define GVIR_CONFIG_XML_DOC_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_TYPE_CONFIG_XML_DOC, GVirConfigXmlDocClass)) + +typedef struct _GVirConfigXmlDoc GVirConfigXmlDoc; +typedef struct _GVirConfigXmlDocPrivate GVirConfigXmlDocPrivate; +typedef struct _GVirConfigXmlDocClass GVirConfigXmlDocClass; + +struct _GVirConfigXmlDoc +{ + GObject parent; + + GVirConfigXmlDocPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirConfigXmlDocClass +{ + GObjectClass parent_class; + + gpointer padding[20]; +}; + + +GType gvir_config_xml_doc_get_type(void); + +GVirConfigXmlDoc *gvir_config_xml_doc_new(xmlDocPtr doc); + +G_END_DECLS + +#endif /* __LIBVIRT_GCONFIG_XML_DOC_H__ */ -- 1.7.7.3

2 25

[libvirt] [libvirt-glib] Remove transient domain reference on shutdown
by Zeeshan Ali (Khattak) 30 Nov '11

30 Nov '11

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gobject/libvirt-gobject-connection.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index b647bfa..59b828d 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -362,6 +362,15 @@ static int domain_event_cb(virConnectPtr conn G_GNUC_UNUSED, g_signal_emit_by_name(gdom, "stopped::from-snapshot"); else g_warn_if_reached(); + + if (virDomainIsPersistent(dom) != 1) { + g_mutex_lock(priv->lock); + g_hash_table_steal(priv->domains, uuid); + g_mutex_unlock(priv->lock); + + g_signal_emit(gconn, signals[VIR_DOMAIN_REMOVED], 0, gdom); + g_object_unref(gdom); + } break; default: -- 1.7.7.3

2 1

[libvirt] Associate a LUN as disk with WWNN/WWPN
by Osier Yang 30 Nov '11

30 Nov '11

Hi, all This is a rough thought about how to allow the user to associate a LUN as disk with WWNN/WWPN. Never mind if some thought is complete wrong, I'm complete new to this area. :-) The initial idea was to introduce new XML for the vHBA which the LUN which be assisned to in a domain XML, just like comment #2 of RHBZ# 543037: <quote> AFAIU libvirt needs a way to: - Associate a virtual adapter WWN with a VM (in the VM xml) - Learn to start a virtual adapter when the VM is started, and destroy the adapter when the VM is stopped. - Possibly a way to associate a WWN with a scsi pool, to start / stop a virtual adapter with the pool. </quote> But afer thinking more, I'd think it might be not good idea: As far as I could understand, the requirement of the BZ wants a way to create/migrate a guest with NPIV. I'm goint to talk create first,and migration then. === Creation If we try to support this all inside libvirt, it means we need to new XML for indicates the WWNN/WWPN of the vHBA or Physical HBA, this is fine we can do it, though it's a bit annoyed where to add it. The biggest problem is there is a race here, we can't known the path of the LUN unless the storage admin assigned (zone / mask, will already use assign for brevity) a LUN to the (v)HBA, and it appears on host successfully. However, domain define/create doesn't allow the disk source path be empty, except it's CDROM, or Floppy. The works which need to be done before domain define should be: - If the user wants to create new vHBA. 1) auto-generate /or specify WWNN/WWPN (with Qumranet's OUI: 00-1A-4A) 2) allows to select fabric WWN, (to guide the choice of which FC adapter to select for the Vport creation, assuming different adapters connect to different fabrics) 3) create the vHBA with virNodeDeviceCreateXML API 4) Ask / prompt the user to ask the storage admin assigns the LUN to the vHBA. 5) Waits for the LUN shows up on host (perhaps via storage pool API) 6) Use the LUN's path (e.g. /dev/disk/by-id/scsi-3600c0ff000d7a2a5d163ff4490100000000-part1) as the disk source path. - If the user wants to select a existed (v)HBA. 1), 2) and 3) are ommited 3) and 4) might be also ommited if there is a LUN already assigned to the selected (v)HBA. As we can see, there are lots of interaction. If we simply wants to do all these work inside libvirt, we lose the user friendly interaction, and just makes our life harder. So, I would these work should be done in external / upper apps, e.g. virt-manager, or Boxes in future. What libvirt needs to do (as far as I could get): 1) support the fabric WWN in node device XML 2) may be we can do auto-generating the WWNN/WWPN inside libvirt if they are not specified. But from a user's p.o.v, I'd see it is in UI, but not in codes silently. 3) perhaps provides methods to get the (v)HBA's fabric's WWN? === Migration If we do things as explained above for domain's creation, the disk XML will be like: <disk type='disk' device='disk'> <driver name='qemu' type='raw'/> <source file='/dev/disk/by-id/scsi-3600c0ff000d7a2a5d163ff4490100000000-part1/'> <target dev='vda' bus='virtio'/> <alias name='virtio-disk0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03 function='0x0'/> </disk> It's just similiar with disk which uses a normal disk image. So we needs to something to indentify it's special, it's a LUN assigned to a (v)HBA. Ways to do that in my mind are: 1) If we could find the WWNN/WWPN/fabricwwn by the LUN's path, (I'm not sure if there is a good way yet), things will be much simpler, what we need might be just a simple flag to tell the disk source path is LUN assigned to (v)HBA. e.g. <source file='$path_of_lun' type='fc_hba'/> 2) if there is no way to get the WWNN/WWPN/fabricwwn by LUN's path, we might need the whole config of (v)HBA. e.g. <souce protocol='fc' file='$path_of_lun'> <hba> <wwnn>$wwnn</wwnn> <wwpn>$wwpn</wwpn> <fabricwwn>$fabricwwn</fabricwwn> </hba> </source> And then in virt-manager or Boxes, it needs to detect if there is disk use FC LUN, if it's it should teach dest libvirt to create another vHBA, and assign the same LUN to it. Then migration could do just as normal. But problem of doing like so is the migration won't work anyway with virsh. Hmmm, /me thinking if it will be disireable to introduce hook support for migration. Things will be much simpler if we support hooks? Thoughts and Opinions? Regards, Osier

4 9

[libvirt] [PATCH] virsh: correct return value error
by ajia＠redhat.com 30 Nov '11

30 Nov '11

From: Alex Jia <ajia(a)redhat.com> The 'true' bool value should be 1, and false is 0. https://bugzilla.redhat.com/show_bug.cgi?id=758590 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- tools/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 01da8e5..618b0c1 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1745,7 +1745,7 @@ cmdDomblklist(vshControl *ctl, const vshCmd *cmd) VIR_FREE(source); } - ret = 0; + ret = true; cleanup: VIR_FREE(disks); -- 1.7.1

3 3

[libvirt] [PATCH] util: avoid null deref on qcowXGetBackingStore
by ajia＠redhat.com 30 Nov '11

30 Nov '11

From: Alex Jia <ajia(a)redhat.com> Detected by Coverity. the only case is caller passes a NULL to 'format' variable, then taking 'if (format)' false branch, the function qcow2GetBackingStoreFormat will directly dereferences the NULL 'format' pointer variable. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/util/storage_file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/storage_file.c b/src/util/storage_file.c index f33ea74..ba9cfc5 100644 --- a/src/util/storage_file.c +++ b/src/util/storage_file.c @@ -333,7 +333,7 @@ qcowXGetBackingStore(char **res, * between the end of the header (QCOW2_HDR_TOTAL_SIZE) * and the start of the backingStoreName (offset) */ - if (isQCow2) + if (isQCow2 && format) qcow2GetBackingStoreFormat(format, buf, buf_size, QCOW2_HDR_TOTAL_SIZE, offset); return BACKING_STORE_OK; -- 1.7.1

2 1

[libvirt] [PATCH 00/14] Cleanup node suspend code
by Daniel P. Berrange 30 Nov '11

30 Nov '11

This patch series does a large number of pretty small / trivial cleanups of the recently committed node suspend code. There are a few important changes though - Patch 1 changes public API enum values - Patch 3 changes the capabilities XML schema - Patch 11 ensures we don't probe suspend info unles we need it - Patch 14 fixes a bug Obviously due to 1 & 3 we need to do this before the next release

4 44

[libvirt] [libvirt-glib] gir: use libraries from build tree, not installed ones
by Christophe Fergeau 30 Nov '11

30 Nov '11

If we don't explicitly mention path to our uninstalled libraries to g-ir-scanner, it will use installed libvirt-* libraries instead of the ones we just built to run a binary during the generation of the gir file. However this binary will have been compiled with the uninstalled ones, This is an issue if the installed libraries are not ABI compatible with the uninstalled one, and will cause a compile failure because the binary will fail to run. This fix has been suggested by Colin Walters (gobject-introspection maintainer). --- libvirt-gobject/Makefile.am | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libvirt-gobject/Makefile.am b/libvirt-gobject/Makefile.am index 1e0f851..c4405f0 100644 --- a/libvirt-gobject/Makefile.am +++ b/libvirt-gobject/Makefile.am @@ -130,6 +130,8 @@ LibvirtGObject-1.0.gir: libvirt-gobject-1.0.la $(G_IR_SCANNER) Makefile.am --include-uninstalled $(top_builddir)/libvirt-gconfig/LibvirtGConfig-1.0.gir \ --identifier-prefix=GVir \ --symbol-prefix=gvir \ + --library=$(top_builddir)/libvirt-glib/libvirt-glib-1.0.la \ + --library=$(top_builddir)/libvirt-gconfig/libvirt-gconfig-1.0.la \ --library=$(builddir)/libvirt-gobject-1.0.la \ --output $@ \ -I$(top_builddir) \ -- 1.7.7.3

2 1

[libvirt] [PATCH 0/3 v2] Improve async signal safety of timestamp APIs
by Daniel P. Berrange 30 Nov '11

30 Nov '11

An update of https://www.redhat.com/archives/libvir-list/2011-November/msg01609.html In v2: - Rename all APIs which return with errno set to have a Raw postfix ( async signal safe) - Add variants of all APIs which raise errors (async signal dangerous)

2 6

[libvirt] [PATCH] virsh: Update docs for block related commands
by Osier Yang 30 Nov '11

30 Nov '11

commit 3ac26e26 allows to lookup the disk via both target name and source path. But virsh documents were not updated. --- tools/virsh.c | 15 ++++++++++----- tools/virsh.pod | 14 +++++++++----- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 27ecaf3..94b5478 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1059,7 +1059,8 @@ static const vshCmdInfo info_domblkstat[] = { static const vshCmdOptDef opts_domblkstat[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, - {"device", VSH_OT_DATA, VSH_OFLAG_REQ, N_("block device")}, + {"device", VSH_OT_DATA, VSH_OFLAG_REQ, N_("Fully-qualified source path or unique " + "target name of the block device")}, {"human", VSH_OT_BOOL, 0, N_("print a more human readable output")}, {NULL, 0, 0, NULL} }; @@ -1637,7 +1638,8 @@ static const vshCmdInfo info_domblkinfo[] = { static const vshCmdOptDef opts_domblkinfo[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, - {"device", VSH_OT_DATA, VSH_OFLAG_REQ, N_("block device")}, + {"device", VSH_OT_DATA, VSH_OFLAG_REQ, N_("Fully-qualified source path or unique target" + "name of the block device")}, {NULL, 0, 0, NULL} }; @@ -5959,7 +5961,8 @@ static const vshCmdInfo info_block_pull[] = { static const vshCmdOptDef opts_block_pull[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, - {"path", VSH_OT_DATA, VSH_OFLAG_REQ, N_("Fully-qualified path of disk")}, + {"path", VSH_OT_DATA, VSH_OFLAG_REQ, N_("Fully-qualified source path or unique " + "target name of the disk")}, {"bandwidth", VSH_OT_DATA, VSH_OFLAG_NONE, N_("Bandwidth limit in MB/s")}, {NULL, 0, 0, NULL} }; @@ -5983,7 +5986,8 @@ static const vshCmdInfo info_block_job[] = { static const vshCmdOptDef opts_block_job[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, - {"path", VSH_OT_DATA, VSH_OFLAG_REQ, N_("Fully-qualified path of disk")}, + {"path", VSH_OT_DATA, VSH_OFLAG_REQ, N_("Fully-qualified source path or unique" + "target name of the disk")}, {"abort", VSH_OT_BOOL, VSH_OFLAG_NONE, N_("Abort the active job on the speficied disk")}, {"info", VSH_OT_BOOL, VSH_OFLAG_NONE, N_("Get active job information for the specified disk")}, {"bandwidth", VSH_OT_DATA, VSH_OFLAG_NONE, N_("Set the Bandwidth limit in MB/s")}, @@ -6039,7 +6043,8 @@ static const vshCmdInfo info_block_resize[] = { static const vshCmdOptDef opts_block_resize[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, - {"path", VSH_OT_DATA, VSH_OFLAG_REQ, N_("Fully-qualified path of block device")}, + {"path", VSH_OT_DATA, VSH_OFLAG_REQ, N_("Fully-qualified source path or unique " + "target name of the block device")}, {"size", VSH_OT_INT, VSH_OFLAG_REQ, N_("New size of the block device in kilobytes, " "the size must be integer")}, {NULL, 0, 0, NULL} diff --git a/tools/virsh.pod b/tools/virsh.pod index a5758f4..61951e6 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -569,14 +569,16 @@ image has been pulled, the disk no longer depends on the backing image. It pulls data for the entire disk in the background, the process of the operation can be checked with B<blockjob>. -I<path> specifies fully-qualified path of the disk. +I<path> specifies fully-qualified source path (<source file='name'/>) or +unique target name (<target dev='name'/>) of the disk. I<bandwidth> specifies copying bandwidth limit in Mbps. =item B<blockjob> I<domain> I<path> [I<--abort>] [I<--info>] [I<bandwidth>] Manage active block operations. -I<path> specifies fully-qualified path of the disk. +I<path> specifies fully-qualified source path (<source file='name'/>) or +unique target name (<target dev='name'/>) of the disk. If I<--abort> is specified, the active job on the specified disk will be aborted. If I<--info> is specified, the active job information on the specified @@ -585,9 +587,11 @@ I<bandwidth> can be used to set bandwidth limit for the active job. =item B<blockresize> I<domain> I<--path> I<--size> -Resize a block device of domain while the domain is running, I<--path> -specifies the absolute path of the block device, I<--size> specifies the -new size in kilobytes +Resize a block device of domain while the domain is running. + +I<path> specifies fully-qualified source path (<source file='name'/>) or +unique target name (<target dev='name'/>) of the disk. +I<--size> specifies the new size in kilobytes. =item B<dominfo> I<domain-id> -- 1.7.7.3

2 1

[libvirt] gdb works abnormally when debug the libvirt.
by ShaoHe Feng 30 Nov '11

30 Nov '11

When I to use gdb to check whether qemuMonitorJSONIOProcessEvent processes the Event that I expect. but the gdb works abnormally. I list the the position of the source file by gdb. It is the correct functionqemuMonitorJSONIOProcessEvent. However I set break point on this position. then "info b", it is the wrong function qemuMonitorJSONIOProcess. I debug my libvirt on Ubuntu 11.10 this time.But I have set a break point at this function on redhat 6.0 before, it can work well. My gcc version is: gcc (Ubuntu/Linaro 4.6.1-9ubuntu3) 4.6.1 My gdb version is: GNU gdb (Ubuntu/Linaro 7.3-0ubuntu2) 7.3-2011.08 here is the info: (gdb) list qemu/qemu_monitor_json.c:88 83 qemuMonitorJSONIOProcessEvent(qemuMonitorPtr mon, 84 virJSONValuePtr obj) 85 { 86 const char *type; 87 int i; 88 int findEventFlag = -1; 89 VIR_DEBUG("mon=%p obj=%p", mon, obj); 90 91 type = virJSONValueObjectGetString(obj, "event"); 92 if (!type) { (gdb) b qemu/qemu_monitor_json.c:88 Breakpoint 5 at 0x4a18d4: file qemu/qemu_monitor_json.c, line 88. (gdb) info b Num Type Disp Enb Address What 5 breakpoint keep y 0x00000000004a18d4 in qemuMonitorJSONIOProcess at qemu/qemu_monitor_json.c:88 (gdb)

3 3

[libvirt] [PATCH] build: fix typo in last patch
by Eric Blake 29 Nov '11

29 Nov '11

* src/remote_protocol-structs: Use correct RPC name. --- Pushing under the build-breaker rule. Osier attempted to fix this already, but added a typo. src/remote_protocol-structs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index 62c0248..927b6c6 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -2019,5 +2019,5 @@ enum remote_procedure { REMOTE_PROC_DOMAIN_EVENT_DISK_CHANGE = 248, REMOTE_PROC_DOMAIN_OPEN_GRAPHICS = 249, REMOTE_PROC_NODE_SUSPEND_FOR_DURATION = 250, - REMOTE_PROC_NODE_SUSPEND_FOR_DURATION = 251, + REMOTE_PROC_DOMAIN_BLOCK_RESIZE = 251, }; -- 1.7.7.3

1 0

[libvirt] [PATCH] Fix leak build config file path
by Daniel P. Berrange 29 Nov '11

29 Nov '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> * src/libvirt.c: Free user directory path --- src/libvirt.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index cdd111c..55ef743 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -974,8 +974,11 @@ virConnectConfigFile(void) goto error; if (virAsprintf(&path, "%s/.libvirt/libvirt.conf", - userdir) < 0) + userdir) < 0) { + VIR_FREE(userdir); goto no_memory; + } + VIR_FREE(userdir); } return path; -- 1.7.6.4

2 1

[libvirt] [PATCH 0/5] Interface pools and passthrough mode
by Shradha Shah 29 Nov '11

29 Nov '11

Interface Pools and Passthrough mode: Current Method: The passthrough mode uses a macvtap âdirectâ connection to connect each guest to the network. The physical interface to be used is picked from among those listed in <interface> sub elements of the <forward> element. The current specification for <forward> extends to allow 0 or more <interface> sub-elements: Example: <forward mode='passthrough' dev='eth10'/> <interface dev='eth10'/> <interface dev='eth12'/> <interface dev='eth18'/> <interface dev='eth20'/> </forward> However with an ethernet card with 64 VF's or more, the above method gets tedious on the system. On the other hand, just parameterizing a string (eth%d) is inadequate, eg, when there are multiple non-contiguous ranges. Proposed Method: The 5 patches provided along with this introductory e-mail i) Introduce a structure to store the state of all the virtual functions attached to each physical function ii) Find a free virtual function given the physical function. The forward specification will hence only mention the physical function as the interface sub element: Example: <forward mode='passthrough' dev='eth2'/> <interface dev='eth2'/> </forward> Shradha Shah (5): Moving the declaration of _pciDevice and _pciDeviceList to pci.h Added function pciSysfsFile to enable access to the PCI SYSFS files. Adding functions virNetDevGetVirtualFunctions and virNetDevGetNetName virNetDevGetVirtualFunctions: Gets the BDF of all the Virtual Functions given a physical function virNetDevGetNetName: Gets the interface name of the PCI Device. Addition of a new device structure to store the state of a Virtual Function Modifications to the Physical Device Structure to store state of its Virtual Functions If a system has 64 or more VF's, it is quite tedious to mention each VF in the interface pool. The following modification find a Free VF given a Physical Function when mode=passthrough. We also save the state of each VF. Hence modifications to networkAllocateActualDevice, networkNotifyActualDevice and networkReleaseActualDevice were required. The following patch does just that. src/conf/network_conf.c | 19 ++++- src/conf/network_conf.h | 10 ++ src/network/bridge_driver.c | 208 +++++++++++++++++++++++++++++++++++++------ src/util/pci.c | 52 ++++------- src/util/pci.h | 36 ++++++++ src/util/virnetdev.c | 89 ++++++++++++++++++ src/util/virnetdev.h | 10 ++ 7 files changed, 359 insertions(+), 65 deletions(-) -- 1.7.4.4

1 0

[libvirt] [libvirt-glib] gir: Use --pkg=libxml-2.0 instead of LIBXML2_CFLAGS
by Christophe Fergeau 29 Nov '11

29 Nov '11

g-ir-scanner has a standard way of getting the flags for libraries providing .pc files, this commit uses this --pkg flag for libxml instead of using LIBXML2_CFLAGS we computed ourselves. --- libvirt-gconfig/Makefile.am | 2 +- libvirt-gobject/Makefile.am | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libvirt-gconfig/Makefile.am b/libvirt-gconfig/Makefile.am index b14bd92..fe5b1a5 100644 --- a/libvirt-gconfig/Makefile.am +++ b/libvirt-gconfig/Makefile.am @@ -119,9 +119,9 @@ LibvirtGConfig-1.0.gir: libvirt-gconfig-1.0.la $(G_IR_SCANNER) Makefile.am --output $@ \ -I$(top_builddir) \ -I$(top_srcdir) \ - $(LIBXML2_CFLAGS) \ --verbose \ --c-include="libvirt-gconfig/libvirt-gconfig.h" \ + --pkg=libxml-2.0 \ --pkg-export=libvirt-gconfig-1.0 \ $(srcdir)/libvirt-gconfig.h \ $(GCONFIG_SOURCE_FILES:%=$(srcdir)/%) \ diff --git a/libvirt-gobject/Makefile.am b/libvirt-gobject/Makefile.am index 5aa1080..ad746bb 100644 --- a/libvirt-gobject/Makefile.am +++ b/libvirt-gobject/Makefile.am @@ -133,10 +133,10 @@ LibvirtGObject-1.0.gir: libvirt-gobject-1.0.la $(G_IR_SCANNER) Makefile.am --output $@ \ -I$(top_builddir) \ -I$(top_srcdir) \ - $(LIBXML2_CFLAGS) \ --verbose \ - --pkg=gthread-2.0 \ --c-include="libvirt-gobject/libvirt-gobject.h" \ + --pkg=gthread-2.0 \ + --pkg=libxml-2.0 \ --pkg-export=libvirt-gobject-1.0 \ $(srcdir)/libvirt-gobject.h \ $(GOBJECT_SOURCE_FILES:%=$(srcdir)/%) \ -- 1.7.7.3

2 1

[libvirt] [PATCH 0/5 v2] Support block device online resizing
by Osier Yang 29 Nov '11

29 Nov '11

This patch series introduce new API "virDomainBlockResize" to expose qemu monitor command "block_size", which is for resizing the a block device while the domain is running. The prototype for the new API is: int virDomainBlockResize (virDomainPtr dom, const char *disk, unsigned long long size, unsigned int flags) * "@disk" is the absolute source path or device target shorthand of the block device. * The units for "@size" is kilobytes. * "@flags" is unused currently. [PATCH 1/5] block_resize: Define the new API [PATCH 2/5] block_resize: Wire up the remote protocol [PATCH 3/5] block_resize: Implement qemu monitor functions [PATCH 4/5] block_resize: Implement qemu driver method [PATCH 5/5] block_resize: Expose the new API to virsh v1: http://www.redhat.com/archives/libvir-list/2011-July/msg01788.html v1 ~ v2: * Nearly just rebasing, with small improvements, nothing new except updating the API definitions to be consistent with commit 3ac26e26. Regards, Osier

2 11

[libvirt] All virsh commands testing failed with git head
by Osier Yang 29 Nov '11

29 Nov '11

Part of the error log is pasted, looks like it's caused by the calling of virNodeSuspendInit in virInitialize. ================================ cd tests; LIBVIRT_DEBUG=1 VIR_TEST_DEBUG=1 ./virshtest; cd - TEST: virshtest 1) virsh list (default) ... Offset 0 Expect [ ] Actual [2011-11-29 18:44:38.153: 24448: info : libvirt version: 0.9.7 2011-11-29 18:44:38.153: 24448: error : virNodeSuspendInit:86 : Failed to get host power management features ] ... FAILED 2) virsh list (custom) ... Offset 0 Expect [ ] Actual [2011-11-29 18:44:38.180: 24463: info : libvirt version: 0.9.7 2011-11-29 18:44:38.180: 24463: error : virNodeSuspendInit:86 : Failed to get host power management features ] ... FAILED 3) virsh nodeinfo (default) ... Offset 0 Expect [C] Actual [2011-11-29 18:44:38.212: 24478: info : libvirt version: 0.9.7 2011-11-29 18:44:38.212: 24478: error : virNodeSuspendInit:86 : Failed to get host power management features C] ... FAILED Regards, Osier

3 4

[libvirt] [libvirt-glib 1/5] Add various missing packages to libvirt-gobject-1.0.pc
by Christophe Fergeau 29 Nov '11

29 Nov '11

--- libvirt-gobject-1.0.pc.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt-gobject-1.0.pc.in b/libvirt-gobject-1.0.pc.in index 5442ba4..3141e87 100644 --- a/libvirt-gobject-1.0.pc.in +++ b/libvirt-gobject-1.0.pc.in @@ -6,7 +6,7 @@ includedir=@includedir@ Name: libvirt-gobject Version: @VERSION@ Description: libvirt GObject library -Requires: gobject-2.0 libvirt-gconfig-1.0 +Requires: gio-2.0 gobject-2.0 libvirt-gconfig-1.0 Libs: -L${libdir} -lvirt-gobject-1.0 -Libs.private: @LIBVIRT_LIBS@ +Requires.private: gthread-2.0 libvirt Cflags: -I${includedir}/libvirt-gobject-1.0 -- 1.7.7.3

2 12

[libvirt] [PATCH 0/3] Improve async signal safety of timestamp APIs
by Daniel P. Berrange 29 Nov '11

29 Nov '11

There are rare reports of libvirt deadlocking itself which show a fork'd, but not exec'd, child process stuck in localtime_r(). This is because localtime_r() is not an async signal, so if we happened to fork() at the exact time another thread was calling localtime_r() we could get stuck with a stale lock in the child. Although we go to pains to protect the libvirt logging code by acquiring the mutex before forking, this is not sufficient, because some non-logging related code could invoke virTimestamp() which calls localtime_r() too. The only sane approach to fix this is to make our timestamp generation APIs thread safe, by doing a clean impl of gmtime() and strftime() inside libvirt using static buffers and only async safe POSIX apis.

2 5

[libvirt] [libvirt-glib] Ensure 'domain-added' signal on transient domain creation
by Zeeshan Ali (Khattak) 29 Nov '11

29 Nov '11

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gobject/libvirt-gobject-connection.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index a258847..02b54a1 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -264,6 +264,7 @@ static int domain_event_cb(virConnectPtr conn G_GNUC_UNUSED, GVirConnection *gconn = opaque; GVirDomain *gdom; GVirConnectionPrivate *priv = gconn->priv; + gboolean was_unknown = FALSE; if (virDomainGetUUIDString(dom, uuid) < 0) { g_warning("Failed to get domain UUID on %p", dom); @@ -282,6 +283,8 @@ static int domain_event_cb(virConnectPtr conn G_GNUC_UNUSED, g_mutex_lock(priv->lock); g_hash_table_insert(priv->domains, (gpointer)gvir_domain_get_uuid(gdom), gdom); g_mutex_unlock(priv->lock); + + was_unknown = TRUE; } switch (event) { @@ -307,9 +310,12 @@ static int domain_event_cb(virConnectPtr conn G_GNUC_UNUSED, break; case VIR_DOMAIN_EVENT_STARTED: - if (detail == VIR_DOMAIN_EVENT_STARTED_BOOTED) + if (detail == VIR_DOMAIN_EVENT_STARTED_BOOTED) { + if (was_unknown) + /* Most probably a transient domain */ + g_signal_emit(gconn, signals[VIR_DOMAIN_ADDED], 0, gdom); g_signal_emit_by_name(gdom, "started::booted"); - else if (detail == VIR_DOMAIN_EVENT_STARTED_MIGRATED) + } else if (detail == VIR_DOMAIN_EVENT_STARTED_MIGRATED) g_signal_emit_by_name(gdom, "started::migrated"); else if (detail == VIR_DOMAIN_EVENT_STARTED_RESTORED) g_signal_emit_by_name(gdom, "started::restored"); -- 1.7.7.3

2 1

[libvirt] [libvirt-glib] Remove now redundant debug system
by Zeeshan Ali (Khattak) 29 Nov '11

29 Nov '11

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)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

2 2

[libvirt] [PATCH] bandwidth: Fix funky identation
by Michal Privoznik 29 Nov '11

29 Nov '11

--- Pushed under trivial rule src/util/virnetdevbandwidth.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c index 10db1ff..b9bd2e3 100644 --- a/src/util/virnetdevbandwidth.c +++ b/src/util/virnetdevbandwidth.c @@ -90,8 +90,8 @@ virNetDevBandwidthSet(const char *ifname, virCommandFree(cmd); cmd = virCommandNew(TC); - virCommandAddArgList(cmd,"class", "add", "dev", ifname, "parent", - "1:", "classid", "1:1", "htb", NULL); + virCommandAddArgList(cmd,"class", "add", "dev", ifname, "parent", + "1:", "classid", "1:1", "htb", NULL); virCommandAddArgList(cmd, "rate", average, NULL); if (peak) @@ -104,9 +104,9 @@ virNetDevBandwidthSet(const char *ifname, virCommandFree(cmd); cmd = virCommandNew(TC); - virCommandAddArgList(cmd,"filter", "add", "dev", ifname, "parent", - "1:0", "protocol", "ip", "handle", "1", "fw", - "flowid", "1", NULL); + virCommandAddArgList(cmd,"filter", "add", "dev", ifname, "parent", + "1:0", "protocol", "ip", "handle", "1", "fw", + "flowid", "1", NULL); if (virCommandRun(cmd, NULL) < 0) goto cleanup; @@ -243,23 +243,23 @@ bool virNetDevBandwidthEqual(virNetDevBandwidthPtr a, virNetDevBandwidthPtr b) { - if (!a && !b) - return true; + if (!a && !b) + return true; - if (!a || !b) - return false; + if (!a || !b) + return false; - /* in */ - if (a->in->average != b->in->average || - a->in->peak != b->in->peak || - a->in->burst != b->in->burst) - return false; + /* in */ + if (a->in->average != b->in->average || + a->in->peak != b->in->peak || + a->in->burst != b->in->burst) + return false; - /*out*/ - if (a->out->average != b->out->average || - a->out->peak != b->out->peak || - a->out->burst != b->out->burst) - return false; + /*out*/ + if (a->out->average != b->out->average || + a->out->peak != b->out->peak || + a->out->burst != b->out->burst) + return false; - return true; + return true; } -- 1.7.3.4

1 0

[libvirt] [PATCH] virsh: Fix typos in man page
by Jiri Denemark 29 Nov '11

29 Nov '11

--- tools/virsh.pod | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index f5183b4..d94e599 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -977,7 +977,7 @@ Change the maximum memory allocation limit for a guest domain. If I<--live> is specified, affect a running guest. If I<--config> is specified, affect the next boot of a persistent guest. If I<--current> is specified, affect the current guest state. -Both I<--live> and I<--current> flags may be given, but I<--current> is +Both I<--live> and I<--config> flags may be given, but I<--current> is exclusive. If no flag is specified, behavior is different depending on hypervisor. @@ -1003,7 +1003,7 @@ I<--min-guarantee> is supported only by ESX hypervisor. If I<--live> is specified, affect a running guest. If I<--config> is specified, affect the next boot of a persistent guest. If I<--current> is specified, affect the current guest state. -Both I<--live> and I<--current> flags may be given, but I<--current> is +Both I<--live> and I<--config> flags may be given, but I<--current> is exclusive. If no flag is specified, behavior is different depending on hypervisor. @@ -1048,7 +1048,7 @@ I<--weight> is in range [100, 1000]. If I<--live> is specified, affect a running guest. If I<--config> is specified, affect the next boot of a persistent guest. If I<--current> is specified, affect the current guest state. -Both I<--live> and I<--current> flags may be given, but I<--current> is +Both I<--live> and I<--config> flags may be given, but I<--current> is exclusive. If no flag is specified, behavior is different depending on hypervisor. -- 1.7.8.rc4

2 2

[libvirt] [PATCH] lxc: Fix suspend/resume with freezer cgroup
by Jiri Denemark 29 Nov '11

29 Nov '11

--- src/util/cgroup.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/cgroup.c b/src/util/cgroup.c index c8d1f33..71dedeb 100644 --- a/src/util/cgroup.c +++ b/src/util/cgroup.c @@ -1474,14 +1474,14 @@ int virCgroupGetCpuacctUsage(virCgroupPtr group, unsigned long long *usage) int virCgroupSetFreezerState(virCgroupPtr group, const char *state) { return virCgroupSetValueStr(group, - VIR_CGROUP_CONTROLLER_CPU, + VIR_CGROUP_CONTROLLER_FREEZER, "freezer.state", state); } int virCgroupGetFreezerState(virCgroupPtr group, char **state) { return virCgroupGetValueStr(group, - VIR_CGROUP_CONTROLLER_CPU, + VIR_CGROUP_CONTROLLER_FREEZER, "freezer.state", state); } -- 1.7.8.rc4

2 2