[libvirt] [PATCH libvirt-glib v2 0/8] More APIs in libvirt-gconfig
An update to: https://www.redhat.com/archives/libvir-list/2011-November/msg01812.html New in v2: - All Christophe's comments included - Cleanup include headers - Fix file descriptions
From: "Daniel P. Berrange" <berrange@redhat.com> Create a new GVirConfigDomainFilesys object for dealing with the <filesystem> element. * libvirt-gconfig-domain-filesys.c, libvirt-gconfig-domain-filesys.h, Makefile.am, libvirt-gconfig.sym, libvirt-gconfig.h: New GVirConfigDomainFilesys object * libvirt-gconfig-object.c, libvirt-gconfig-object-private.h: Add gvir_config_object_delete_node for removing an XML node --- libvirt-gconfig/Makefile.am | 2 + libvirt-gconfig/libvirt-gconfig-domain-filesys.c | 172 ++++++++++++++++++++++ libvirt-gconfig/libvirt-gconfig-domain-filesys.h | 98 ++++++++++++ libvirt-gconfig/libvirt-gconfig-object-private.h | 2 + libvirt-gconfig/libvirt-gconfig-object.c | 25 +++ libvirt-gconfig/libvirt-gconfig.h | 1 + libvirt-gconfig/libvirt-gconfig.sym | 13 ++ 7 files changed, 313 insertions(+), 0 deletions(-) create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-filesys.c create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-filesys.h diff --git a/libvirt-gconfig/Makefile.am b/libvirt-gconfig/Makefile.am index 1879186..2c8c2a5 100644 --- a/libvirt-gconfig/Makefile.am +++ b/libvirt-gconfig/Makefile.am @@ -16,6 +16,7 @@ GCONFIG_HEADER_FILES = \ libvirt-gconfig-domain-clock.h \ libvirt-gconfig-domain-device.h \ libvirt-gconfig-domain-disk.h \ + libvirt-gconfig-domain-filesys.h \ libvirt-gconfig-domain-graphics.h \ libvirt-gconfig-domain-graphics-spice.h \ libvirt-gconfig-domain-input.h \ @@ -45,6 +46,7 @@ GCONFIG_SOURCE_FILES = \ libvirt-gconfig-domain-clock.c \ libvirt-gconfig-domain-device.c \ libvirt-gconfig-domain-disk.c \ + libvirt-gconfig-domain-filesys.c \ libvirt-gconfig-domain-graphics.c \ libvirt-gconfig-domain-graphics-spice.c \ libvirt-gconfig-domain-input.c \ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-filesys.c b/libvirt-gconfig/libvirt-gconfig-domain-filesys.c new file mode 100644 index 0000000..32a1636 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-filesys.c @@ -0,0 +1,172 @@ +/* + * libvirt-gobject-config-domain-filesys.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: Daniel P. Berrange <berrange@redhat.com> + */ + +#include <config.h> + +#include <string.h> + +#include "libvirt-gconfig/libvirt-gconfig.h" +#include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" +#include "libvirt-gconfig/libvirt-gconfig-object-private.h" + +#define GVIR_CONFIG_DOMAIN_FILESYS_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN_FILESYS, GVirConfigDomainFilesysPrivate)) + +struct _GVirConfigDomainFilesysPrivate +{ + GVirConfigDomainFilesysType type; +}; + +G_DEFINE_TYPE(GVirConfigDomainFilesys, gvir_config_domain_filesys, GVIR_TYPE_CONFIG_DOMAIN_DEVICE); + + +static void gvir_config_domain_filesys_class_init(GVirConfigDomainFilesysClass *klass) +{ + g_type_class_add_private(klass, sizeof(GVirConfigDomainFilesysPrivate)); +} + + +static void gvir_config_domain_filesys_init(GVirConfigDomainFilesys *filesys) +{ + g_debug("Init GVirConfigDomainFilesys=%p", filesys); + + filesys->priv = GVIR_CONFIG_DOMAIN_FILESYS_GET_PRIVATE(filesys); +} + + +GVirConfigDomainFilesys *gvir_config_domain_filesys_new(void) +{ + GVirConfigObject *object; + + object = gvir_config_object_new(GVIR_TYPE_CONFIG_DOMAIN_FILESYS, + "filesystem", NULL); + return GVIR_CONFIG_DOMAIN_FILESYS(object); +} + +GVirConfigDomainFilesys *gvir_config_domain_filesys_new_from_xml(const gchar *xml, + GError **error) +{ + GVirConfigObject *object; + + object = gvir_config_object_new_from_xml(GVIR_TYPE_CONFIG_DOMAIN_FILESYS, + "filesystem", NULL, xml, error); + return GVIR_CONFIG_DOMAIN_FILESYS(object); +} + +void gvir_config_domain_filesys_set_type(GVirConfigDomainFilesys *filesys, + GVirConfigDomainFilesysType type) +{ + g_return_if_fail(GVIR_IS_CONFIG_DOMAIN_FILESYS(filesys)); + + gvir_config_object_set_attribute_with_type(GVIR_CONFIG_OBJECT(filesys), + "type", + GVIR_TYPE_CONFIG_DOMAIN_FILESYS_TYPE, + type, + NULL); +} + +void gvir_config_domain_filesys_set_access_type(GVirConfigDomainFilesys *filesys, + GVirConfigDomainFilesysAccessType type) +{ + g_return_if_fail(GVIR_IS_CONFIG_DOMAIN_FILESYS(filesys)); + + gvir_config_object_set_attribute_with_type(GVIR_CONFIG_OBJECT(filesys), + "accessmode", + GVIR_TYPE_CONFIG_DOMAIN_FILESYS_ACCESS_TYPE, + type, + NULL); +} + +void gvir_config_domain_filesys_set_driver_type(GVirConfigDomainFilesys *filesys, + GVirConfigDomainFilesysDriverType type) +{ + GVirConfigObject *node; + + g_return_if_fail(GVIR_IS_CONFIG_DOMAIN_FILESYS(filesys)); + node = gvir_config_object_add_child(GVIR_CONFIG_OBJECT(filesys), "driver"); + g_return_if_fail(GVIR_IS_CONFIG_OBJECT(node)); + if (type != GVIR_CONFIG_DOMAIN_FILESYS_DRIVER_DEFAULT) + gvir_config_object_set_attribute_with_type( + node, "type", + GVIR_TYPE_CONFIG_DOMAIN_FILESYS_DRIVER_TYPE, + type, NULL); + /* else XXX delete existing attribute ? */ + g_object_unref(G_OBJECT(node)); +} + +void gvir_config_domain_filesys_set_source(GVirConfigDomainFilesys *filesys, + const char *source) +{ + GVirConfigObject *source_node; + const char *attribute_name; + + g_return_if_fail(GVIR_IS_CONFIG_DOMAIN_FILESYS(filesys)); + source_node = gvir_config_object_replace_child(GVIR_CONFIG_OBJECT(filesys), + "source"); + g_return_if_fail(source_node != NULL); + + switch (filesys->priv->type) { + case GVIR_CONFIG_DOMAIN_FILESYS_MOUNT: + attribute_name = "dir"; + break; + case GVIR_CONFIG_DOMAIN_FILESYS_FILE: + attribute_name = "file"; + break; + case GVIR_CONFIG_DOMAIN_FILESYS_BLOCK: + attribute_name = "dev"; + break; + case GVIR_CONFIG_DOMAIN_FILESYS_TEMPLATE: + attribute_name = "name"; + break; + default: + g_return_if_reached(); + } + + gvir_config_object_set_attribute(source_node, + attribute_name, source, + NULL); + g_object_unref(G_OBJECT(source_node)); +} + + +void gvir_config_domain_filesys_set_target(GVirConfigDomainFilesys *filesys, + const char *path) +{ + GVirConfigObject *node; + + g_return_if_fail(GVIR_IS_CONFIG_DOMAIN_FILESYS(filesys)); + node = gvir_config_object_add_child(GVIR_CONFIG_OBJECT(filesys), "target"); + g_return_if_fail(GVIR_IS_CONFIG_OBJECT(node)); + gvir_config_object_set_attribute(node, "dir", path, NULL); + g_object_unref(G_OBJECT(node)); +} + +void gvir_config_domain_filesys_set_readonly(GVirConfigDomainFilesys *filesys, + gboolean readonly) +{ + if (readonly) { + GVirConfigObject *node = gvir_config_object_replace_child(GVIR_CONFIG_OBJECT(filesys), "readonly"); + g_object_unref(node); + } else { + gvir_config_object_delete_child(GVIR_CONFIG_OBJECT(filesys), "readonly"); + } +} diff --git a/libvirt-gconfig/libvirt-gconfig-domain-filesys.h b/libvirt-gconfig/libvirt-gconfig-domain-filesys.h new file mode 100644 index 0000000..a80d3c5 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-filesys.h @@ -0,0 +1,98 @@ +/* + * libvirt-gobject-domain-filesys.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: Daniel P. Berrange <berrange@redhat.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_DOMAIN_FILESYS_H__ +#define __LIBVIRT_GCONFIG_DOMAIN_FILESYS_H__ + +G_BEGIN_DECLS + +#define GVIR_TYPE_CONFIG_DOMAIN_FILESYS (gvir_config_domain_filesys_get_type ()) +#define GVIR_CONFIG_DOMAIN_FILESYS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_TYPE_CONFIG_DOMAIN_FILESYS, GVirConfigDomainFilesys)) +#define GVIR_CONFIG_DOMAIN_FILESYS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_TYPE_CONFIG_DOMAIN_FILESYS, GVirConfigDomainFilesysClass)) +#define GVIR_IS_CONFIG_DOMAIN_FILESYS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_TYPE_CONFIG_DOMAIN_FILESYS)) +#define GVIR_IS_CONFIG_DOMAIN_FILESYS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_TYPE_CONFIG_DOMAIN_FILESYS)) +#define GVIR_CONFIG_DOMAIN_FILESYS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_TYPE_CONFIG_DOMAIN_FILESYS, GVirConfigDomainFilesysClass)) + +typedef struct _GVirConfigDomainFilesys GVirConfigDomainFilesys; +typedef struct _GVirConfigDomainFilesysPrivate GVirConfigDomainFilesysPrivate; +typedef struct _GVirConfigDomainFilesysClass GVirConfigDomainFilesysClass; + +struct _GVirConfigDomainFilesys +{ + GVirConfigDomainDevice parent; + + GVirConfigDomainFilesysPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirConfigDomainFilesysClass +{ + GVirConfigDomainDeviceClass parent_class; + + gpointer padding[20]; +}; + +typedef enum { + GVIR_CONFIG_DOMAIN_FILESYS_MOUNT, + GVIR_CONFIG_DOMAIN_FILESYS_BLOCK, + GVIR_CONFIG_DOMAIN_FILESYS_FILE, + GVIR_CONFIG_DOMAIN_FILESYS_TEMPLATE, +} GVirConfigDomainFilesysType; + +typedef enum { + GVIR_CONFIG_DOMAIN_FILESYS_ACCESS_PASSTHROUGH, + GVIR_CONFIG_DOMAIN_FILESYS_ACCESS_MAPPED, + GVIR_CONFIG_DOMAIN_FILESYS_ACCESS_SQUASHED, +} GVirConfigDomainFilesysAccessType; + +typedef enum { + GVIR_CONFIG_DOMAIN_FILESYS_DRIVER_DEFAULT, + GVIR_CONFIG_DOMAIN_FILESYS_DRIVER_PATH, + GVIR_CONFIG_DOMAIN_FILESYS_DRIVER_HANDLE, +} GVirConfigDomainFilesysDriverType; + +GType gvir_config_domain_filesys_get_type(void); + +GVirConfigDomainFilesys *gvir_config_domain_filesys_new(void); +GVirConfigDomainFilesys *gvir_config_domain_filesys_new_from_xml(const gchar *xml, + GError **error); + +void gvir_config_domain_filesys_set_type(GVirConfigDomainFilesys *filesys, + GVirConfigDomainFilesysType type); +void gvir_config_domain_filesys_set_access_type(GVirConfigDomainFilesys *filesys, + GVirConfigDomainFilesysAccessType type); +void gvir_config_domain_filesys_set_driver_type(GVirConfigDomainFilesys *filesys, + GVirConfigDomainFilesysDriverType type); +void gvir_config_domain_filesys_set_source(GVirConfigDomainFilesys *filesys, + const char *source); +void gvir_config_domain_filesys_set_target(GVirConfigDomainFilesys *filesys, + const char *target); +void gvir_config_domain_filesys_set_readonly(GVirConfigDomainFilesys *filesys, + gboolean readonly); +G_END_DECLS + +#endif /* __LIBVIRT_GCONFIG_DOMAIN_FILESYS_H__ */ diff --git a/libvirt-gconfig/libvirt-gconfig-object-private.h b/libvirt-gconfig/libvirt-gconfig-object-private.h index f196be6..c564ac5 100644 --- a/libvirt-gconfig/libvirt-gconfig-object-private.h +++ b/libvirt-gconfig/libvirt-gconfig-object-private.h @@ -39,6 +39,8 @@ GVirConfigObject *gvir_config_object_add_child(GVirConfigObject *object, const char *child_name); GVirConfigObject *gvir_config_object_replace_child(GVirConfigObject *object, const char *child_name); +void gvir_config_object_delete_child(GVirConfigObject *object, + const char *child_name); void gvir_config_object_set_child(GVirConfigObject *object, xmlNodePtr child); diff --git a/libvirt-gconfig/libvirt-gconfig-object.c b/libvirt-gconfig/libvirt-gconfig-object.c index 902e014..f642059 100644 --- a/libvirt-gconfig/libvirt-gconfig-object.c +++ b/libvirt-gconfig/libvirt-gconfig-object.c @@ -380,6 +380,31 @@ gvir_config_object_replace_child(GVirConfigObject *object, NULL)); } + +G_GNUC_INTERNAL void +gvir_config_object_delete_child(GVirConfigObject *object, + const char *child_name) +{ + xmlNodePtr parent_node; + xmlNodePtr old_node; + + g_return_if_fail(GVIR_IS_CONFIG_OBJECT(object)); + g_return_if_fail(child_name != NULL); + + parent_node = gvir_config_object_get_xml_node(GVIR_CONFIG_OBJECT(object)); + g_return_if_fail(parent_node != NULL); + + if (!(old_node = gvir_config_xml_get_element(parent_node, child_name, NULL))) + return; + + /* FIXME: should we make sure there are no multiple occurrences + * of this node? + */ + xmlUnlinkNode(old_node); + xmlFreeNode(old_node); +} + + G_GNUC_INTERNAL void gvir_config_object_set_node_content(GVirConfigObject *object, const char *node_name, diff --git a/libvirt-gconfig/libvirt-gconfig.h b/libvirt-gconfig/libvirt-gconfig.h index ad9f59a..ed7623c 100644 --- a/libvirt-gconfig/libvirt-gconfig.h +++ b/libvirt-gconfig/libvirt-gconfig.h @@ -33,6 +33,7 @@ #include <libvirt-gconfig/libvirt-gconfig-domain-clock.h> #include <libvirt-gconfig/libvirt-gconfig-domain-device.h> #include <libvirt-gconfig/libvirt-gconfig-domain-disk.h> +#include <libvirt-gconfig/libvirt-gconfig-domain-filesys.h> #include <libvirt-gconfig/libvirt-gconfig-domain-graphics.h> #include <libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.h> #include <libvirt-gconfig/libvirt-gconfig-domain-input.h> diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index 2f7f9d6..e895cb0 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -47,6 +47,19 @@ LIBVIRT_GCONFIG_0.0.1 { gvir_config_domain_disk_set_target_dev; gvir_config_domain_disk_set_type; + gvir_config_domain_filesys_get_type; + gvir_config_domain_filesys_type_get_type; + gvir_config_domain_filesys_access_type_get_type; + gvir_config_domain_filesys_driver_type_get_type; + gvir_config_domain_filesys_new; + gvir_config_domain_filesys_new_from_xml; + gvir_config_domain_filesys_set_access_type; + gvir_config_domain_filesys_set_driver_type; + gvir_config_domain_filesys_set_readonly; + gvir_config_domain_filesys_set_source; + gvir_config_domain_filesys_set_target; + gvir_config_domain_filesys_set_type; + gvir_config_domain_graphics_get_type; gvir_config_domain_graphics_spice_get_type; -- 1.7.6.4
From: "Daniel P. Berrange" <berrange@redhat.com> It is permissible to pass in NULL for a URI to libvirt, which causes it to probe for a supported driver. In such a case we should populate priv->uri with the resulting probed URI after opening the connection * libvirt-gobject/libvirt-gobject-connection.c: Populate URI after opening connection, if NULL --- libvirt-gobject/libvirt-gobject-connection.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index 786a026..ffdc62f 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -420,6 +420,22 @@ gboolean gvir_connection_open(GVirConnection *conn, return FALSE; } + if (!priv->uri) { + char *uri = virConnectGetURI(priv->conn); + if (!uri) { + if (err) + *err = gvir_error_new(GVIR_CONNECTION_ERROR, + 0, + "%s", "Unable to get connection URI"); + virConnectClose(priv->conn); + priv->conn = NULL; + g_mutex_unlock(priv->lock); + return FALSE; + } + priv->uri = g_strdup(uri); + free(uri); + } + if (virConnectDomainEventRegister(priv->conn, domain_event_cb, conn, NULL) != -1) priv->domain_event = TRUE; else -- 1.7.6.4
From: "Daniel P. Berrange" <berrange@redhat.com> Add gvir_config_domain_set_virt_type and gvir_config_domain_virt_type_get_type * libvirt-gconfig-domain.c, libvirt-gconfig-domain.h, libvirt-gconfig.h, libvirt-gconfig.sym: Add new APIs --- libvirt-gconfig/libvirt-gconfig-domain.c | 11 +++++++++++ libvirt-gconfig/libvirt-gconfig-domain.h | 8 ++++++++ libvirt-gconfig/libvirt-gconfig.sym | 2 ++ 3 files changed, 21 insertions(+), 0 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain.c b/libvirt-gconfig/libvirt-gconfig-domain.c index b54d12c..0ceb5d5 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-domain.c @@ -175,6 +175,17 @@ GVirConfigDomain *gvir_config_domain_new(void) return GVIR_CONFIG_DOMAIN(object); } + +void gvir_config_domain_set_virt_type(GVirConfigDomain *domain, GVirConfigDomainVirtType type) +{ + g_return_if_fail(GVIR_IS_CONFIG_DOMAIN(domain)); + gvir_config_object_set_attribute_with_type(GVIR_CONFIG_OBJECT(domain), + "type", + GVIR_TYPE_CONFIG_DOMAIN_VIRT_TYPE, + type, NULL); +} + + char *gvir_config_domain_get_name(GVirConfigDomain *domain) { return gvir_config_object_get_node_content(GVIR_CONFIG_OBJECT(domain), diff --git a/libvirt-gconfig/libvirt-gconfig-domain.h b/libvirt-gconfig/libvirt-gconfig-domain.h index 08682aa..459c308 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.h +++ b/libvirt-gconfig/libvirt-gconfig-domain.h @@ -59,12 +59,20 @@ struct _GVirConfigDomainClass gpointer padding[20]; }; +typedef enum { + GVIR_CONFIG_DOMAIN_VIRT_XEN, + GVIR_CONFIG_DOMAIN_VIRT_QEMU, + GVIR_CONFIG_DOMAIN_VIRT_KVM, + GVIR_CONFIG_DOMAIN_VIRT_KQEMU, + GVIR_CONFIG_DOMAIN_VIRT_LXC, +} GVirConfigDomainVirtType; GType gvir_config_domain_get_type(void); GVirConfigDomain *gvir_config_domain_new_from_xml(const gchar *xml, GError **error); GVirConfigDomain *gvir_config_domain_new(void); +void gvir_config_domain_set_virt_type(GVirConfigDomain *domain, GVirConfigDomainVirtType type); char *gvir_config_domain_get_name(GVirConfigDomain *domain); void gvir_config_domain_set_name(GVirConfigDomain *domain, const char *name); guint64 gvir_config_domain_get_memory(GVirConfigDomain *domain); diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index e895cb0..c637a9e 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -21,6 +21,8 @@ LIBVIRT_GCONFIG_0.0.1 { gvir_config_domain_set_os; gvir_config_domain_get_vcpus; gvir_config_domain_set_vcpus; + gvir_config_domain_set_virt_type; + gvir_config_domain_virt_type_get_type; gvir_config_domain_clock_get_type; gvir_config_domain_clock_offset_get_type; -- 1.7.6.4
From: "Daniel P. Berrange" <berrange@redhat.com> The gvir_config_domain_set_devices API replaces the entire list of devices, but when building up a config incrementally it is useful to append device one at a time. Thus we need a gvir_config_domain_add_device method * libvirt-gconfig/libvirt-gconfig-domain.c, libvirt-gconfig/libvirt-gconfig-domain.h, libvirt-gconfig/libvirt-gconfig.syms: gvir_config_domain_add_device --- libvirt-gconfig/libvirt-gconfig-domain.c | 14 ++++++++++++++ libvirt-gconfig/libvirt-gconfig-domain.h | 3 +++ libvirt-gconfig/libvirt-gconfig.sym | 1 + 3 files changed, 18 insertions(+), 0 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain.c b/libvirt-gconfig/libvirt-gconfig-domain.c index 0ceb5d5..ab40cb3 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-domain.c @@ -317,3 +317,17 @@ void gvir_config_domain_set_devices(GVirConfigDomain *domain, gvir_config_object_attach(GVIR_CONFIG_OBJECT(domain), devices_node); g_object_unref(G_OBJECT(devices_node)); } + +void gvir_config_domain_add_device(GVirConfigDomain *domain, + GVirConfigDomainDevice *device) +{ + GVirConfigObject *devices_node; + + g_return_if_fail(GVIR_IS_CONFIG_DOMAIN(domain)); + + devices_node = gvir_config_object_add_child(GVIR_CONFIG_OBJECT(domain), + "devices"); + + gvir_config_object_attach(devices_node, GVIR_CONFIG_OBJECT(device)); + g_object_unref(G_OBJECT(devices_node)); +} diff --git a/libvirt-gconfig/libvirt-gconfig-domain.h b/libvirt-gconfig/libvirt-gconfig-domain.h index 459c308..4cbc1f0 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.h +++ b/libvirt-gconfig/libvirt-gconfig-domain.h @@ -29,6 +29,7 @@ #include <libvirt-gconfig/libvirt-gconfig-domain-clock.h> #include <libvirt-gconfig/libvirt-gconfig-domain-os.h> +#include <libvirt-gconfig/libvirt-gconfig-domain-device.h> G_BEGIN_DECLS @@ -89,6 +90,8 @@ void gvir_config_domain_set_os(GVirConfigDomain *domain, GVirConfigDomainOs *os); void gvir_config_domain_set_devices(GVirConfigDomain *domain, GList *devices); +void gvir_config_domain_add_device(GVirConfigDomain *domain, + GVirConfigDomainDevice *device); G_END_DECLS diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index c637a9e..738f625 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -7,6 +7,7 @@ LIBVIRT_GCONFIG_0.0.1 { gvir_config_capabilities_new; gvir_config_capabilities_new_from_xml; + gvir_config_domain_add_device; gvir_config_domain_get_type; gvir_config_domain_new; gvir_config_domain_new_from_xml; -- 1.7.6.4
On Thu, Dec 01, 2011 at 11:01:01AM +0000, Daniel P. Berrange wrote:
From: "Daniel P. Berrange" <berrange@redhat.com>
The gvir_config_domain_set_devices API replaces the entire list of devices, but when building up a config incrementally it is useful to append device one at a time. Thus we need a gvir_config_domain_add_device method
* libvirt-gconfig/libvirt-gconfig-domain.c, libvirt-gconfig/libvirt-gconfig-domain.h, libvirt-gconfig/libvirt-gconfig.syms: gvir_config_domain_add_device --- libvirt-gconfig/libvirt-gconfig-domain.c | 14 ++++++++++++++ libvirt-gconfig/libvirt-gconfig-domain.h | 3 +++ libvirt-gconfig/libvirt-gconfig.sym | 1 + 3 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/libvirt-gconfig/libvirt-gconfig-domain.c b/libvirt-gconfig/libvirt-gconfig-domain.c index 0ceb5d5..ab40cb3 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-domain.c @@ -317,3 +317,17 @@ void gvir_config_domain_set_devices(GVirConfigDomain *domain, gvir_config_object_attach(GVIR_CONFIG_OBJECT(domain), devices_node); g_object_unref(G_OBJECT(devices_node)); } + +void gvir_config_domain_add_device(GVirConfigDomain *domain, + GVirConfigDomainDevice *device) +{ + GVirConfigObject *devices_node; + + g_return_if_fail(GVIR_IS_CONFIG_DOMAIN(domain));
Can you sneak in a g_return_if_fail(GVIR_IS_CONFIG_DOMAIN_DEVICE(device)); ? ACK with this added
+ + devices_node = gvir_config_object_add_child(GVIR_CONFIG_OBJECT(domain), + "devices"); + + gvir_config_object_attach(devices_node, GVIR_CONFIG_OBJECT(device)); + g_object_unref(G_OBJECT(devices_node)); +} diff --git a/libvirt-gconfig/libvirt-gconfig-domain.h b/libvirt-gconfig/libvirt-gconfig-domain.h index 459c308..4cbc1f0 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.h +++ b/libvirt-gconfig/libvirt-gconfig-domain.h @@ -29,6 +29,7 @@
#include <libvirt-gconfig/libvirt-gconfig-domain-clock.h> #include <libvirt-gconfig/libvirt-gconfig-domain-os.h> +#include <libvirt-gconfig/libvirt-gconfig-domain-device.h>
G_BEGIN_DECLS
@@ -89,6 +90,8 @@ void gvir_config_domain_set_os(GVirConfigDomain *domain, GVirConfigDomainOs *os); void gvir_config_domain_set_devices(GVirConfigDomain *domain, GList *devices); +void gvir_config_domain_add_device(GVirConfigDomain *domain, + GVirConfigDomainDevice *device);
G_END_DECLS
diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index c637a9e..738f625 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -7,6 +7,7 @@ LIBVIRT_GCONFIG_0.0.1 { gvir_config_capabilities_new; gvir_config_capabilities_new_from_xml;
+ gvir_config_domain_add_device; gvir_config_domain_get_type; gvir_config_domain_new; gvir_config_domain_new_from_xml; -- 1.7.6.4
-- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
From: "Daniel P. Berrange" <berrange@redhat.com> Add GVirConfigDomainGraphicsSdl and GVirConfigDomainGraphicsVnc Also change SPICE to use a signed int for port number and add ability to set autoport & tls port attributes * libvirt-gconfig/Makefile.am, libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c, libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.h, libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c, libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.h, libvirt-gconfig/libvirt-gconfig.h, libvirt-gconfig/libvirt-gconfig.sym: Add new objects * libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c, libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.h: Add autoport & tls port setter, change port setter to use a signed int --- libvirt-gconfig/Makefile.am | 4 + .../libvirt-gconfig-domain-graphics-sdl.c | 100 +++++++++++++++++++ .../libvirt-gconfig-domain-graphics-sdl.h | 71 ++++++++++++++ .../libvirt-gconfig-domain-graphics-spice.c | 24 ++++- .../libvirt-gconfig-domain-graphics-spice.h | 9 ++- .../libvirt-gconfig-domain-graphics-vnc.c | 101 ++++++++++++++++++++ .../libvirt-gconfig-domain-graphics-vnc.h | 73 ++++++++++++++ libvirt-gconfig/libvirt-gconfig.h | 2 + libvirt-gconfig/libvirt-gconfig.sym | 14 +++ 9 files changed, 395 insertions(+), 3 deletions(-) create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.h create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.h diff --git a/libvirt-gconfig/Makefile.am b/libvirt-gconfig/Makefile.am index 2c8c2a5..7c9e8c0 100644 --- a/libvirt-gconfig/Makefile.am +++ b/libvirt-gconfig/Makefile.am @@ -18,7 +18,9 @@ GCONFIG_HEADER_FILES = \ libvirt-gconfig-domain-disk.h \ libvirt-gconfig-domain-filesys.h \ libvirt-gconfig-domain-graphics.h \ + libvirt-gconfig-domain-graphics-sdl.h \ libvirt-gconfig-domain-graphics-spice.h \ + libvirt-gconfig-domain-graphics-vnc.h \ libvirt-gconfig-domain-input.h \ libvirt-gconfig-domain-interface.h \ libvirt-gconfig-domain-interface-network.h \ @@ -48,7 +50,9 @@ GCONFIG_SOURCE_FILES = \ libvirt-gconfig-domain-disk.c \ libvirt-gconfig-domain-filesys.c \ libvirt-gconfig-domain-graphics.c \ + libvirt-gconfig-domain-graphics-sdl.c \ libvirt-gconfig-domain-graphics-spice.c \ + libvirt-gconfig-domain-graphics-vnc.c \ libvirt-gconfig-domain-input.c \ libvirt-gconfig-domain-interface.c \ libvirt-gconfig-domain-interface-network.c \ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c new file mode 100644 index 0000000..728c320 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c @@ -0,0 +1,100 @@ +/* + * libvirt-gobject-config-domain-graphics-sdl.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: Daniel P. Berrange <berrange@redhat.com> + */ + +#include <config.h> + +#include <string.h> + +#include <libxml/tree.h> + +#include "libvirt-gconfig/libvirt-gconfig.h" +#include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" +#include "libvirt-gconfig/libvirt-gconfig-object-private.h" + +#define GVIR_CONFIG_DOMAIN_GRAPHICS_SDL_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN_GRAPHICS_SDL, GVirConfigDomainGraphicsSdlPrivate)) + +struct _GVirConfigDomainGraphicsSdlPrivate +{ + gboolean unused; +}; + +G_DEFINE_TYPE(GVirConfigDomainGraphicsSdl, gvir_config_domain_graphics_sdl, GVIR_TYPE_CONFIG_DOMAIN_GRAPHICS); + + +static void gvir_config_domain_graphics_sdl_class_init(GVirConfigDomainGraphicsSdlClass *klass) +{ + g_type_class_add_private(klass, sizeof(GVirConfigDomainGraphicsSdlPrivate)); +} + + +static void gvir_config_domain_graphics_sdl_init(GVirConfigDomainGraphicsSdl *graphics_sdl) +{ + g_debug("Init GVirConfigDomainGraphicsSdl=%p", graphics_sdl); + + graphics_sdl->priv = GVIR_CONFIG_DOMAIN_GRAPHICS_SDL_GET_PRIVATE(graphics_sdl); +} + + +GVirConfigDomainGraphicsSdl *gvir_config_domain_graphics_sdl_new(void) +{ + GVirConfigObject *object; + + object = gvir_config_object_new(GVIR_TYPE_CONFIG_DOMAIN_GRAPHICS_SDL, + "graphics", NULL); + gvir_config_object_set_attribute(object, "type", "sdl", NULL); + return GVIR_CONFIG_DOMAIN_GRAPHICS_SDL(object); +} + +GVirConfigDomainGraphicsSdl * +gvir_config_domain_graphics_sdl_new_from_xml(const gchar *xml, + GError **error) +{ + GVirConfigObject *object; + + object = gvir_config_object_new_from_xml(GVIR_TYPE_CONFIG_DOMAIN_GRAPHICS_SDL, + "graphics", NULL, xml, error); + if (object == NULL) + return NULL; + gvir_config_object_set_attribute(object, "type", "sdl", NULL); + return GVIR_CONFIG_DOMAIN_GRAPHICS_SDL(object); +} + +void gvir_config_domain_graphics_sdl_set_xauthority(GVirConfigDomainGraphicsSdl *graphics, + const gchar *path) +{ + g_return_if_fail(GVIR_IS_CONFIG_DOMAIN_GRAPHICS_SDL(graphics)); + + gvir_config_object_set_attribute(GVIR_CONFIG_OBJECT(graphics), + "xauth", path, + NULL); +} + +void gvir_config_domain_graphics_sdl_set_display(GVirConfigDomainGraphicsSdl *graphics, + const gchar *disp) +{ + g_return_if_fail(GVIR_IS_CONFIG_DOMAIN_GRAPHICS_SDL(graphics)); + + gvir_config_object_set_attribute(GVIR_CONFIG_OBJECT(graphics), + "display", disp, + NULL); +} diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.h b/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.h new file mode 100644 index 0000000..03d1296 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.h @@ -0,0 +1,71 @@ +/* + * libvirt-gconfig-domain-graphics-sdl.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: Daniel P. Berrange <berrange@redhat.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_DOMAIN_GRAPHICS_SDL_H__ +#define __LIBVIRT_GCONFIG_DOMAIN_GRAPHICS_SDL_H__ + +G_BEGIN_DECLS + +#define GVIR_TYPE_CONFIG_DOMAIN_GRAPHICS_SDL (gvir_config_domain_graphics_sdl_get_type ()) +#define GVIR_CONFIG_DOMAIN_GRAPHICS_SDL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_TYPE_CONFIG_DOMAIN_GRAPHICS_SDL, GVirConfigDomainGraphicsSdl)) +#define GVIR_CONFIG_DOMAIN_GRAPHICS_SDL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_TYPE_CONFIG_DOMAIN_GRAPHICS_SDL, GVirConfigDomainGraphicsSdlClass)) +#define GVIR_IS_CONFIG_DOMAIN_GRAPHICS_SDL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_TYPE_CONFIG_DOMAIN_GRAPHICS_SDL)) +#define GVIR_IS_CONFIG_DOMAIN_GRAPHICS_SDL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_TYPE_CONFIG_DOMAIN_GRAPHICS_SDL)) +#define GVIR_CONFIG_DOMAIN_GRAPHICS_SDL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_TYPE_CONFIG_DOMAIN_GRAPHICS_SDL, GVirConfigDomainGraphicsSdlClass)) + +typedef struct _GVirConfigDomainGraphicsSdl GVirConfigDomainGraphicsSdl; +typedef struct _GVirConfigDomainGraphicsSdlPrivate GVirConfigDomainGraphicsSdlPrivate; +typedef struct _GVirConfigDomainGraphicsSdlClass GVirConfigDomainGraphicsSdlClass; + +struct _GVirConfigDomainGraphicsSdl +{ + GVirConfigDomainGraphics parent; + + GVirConfigDomainGraphicsSdlPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirConfigDomainGraphicsSdlClass +{ + GVirConfigDomainGraphicsClass parent_class; + + gpointer padding[20]; +}; + +GType gvir_config_domain_graphics_sdl_get_type(void); + +GVirConfigDomainGraphicsSdl *gvir_config_domain_graphics_sdl_new(void); +GVirConfigDomainGraphicsSdl *gvir_config_domain_graphics_sdl_new_from_xml(const gchar *xml, + GError **error); +void gvir_config_domain_graphics_sdl_set_xauthority(GVirConfigDomainGraphicsSdl *graphics, + const gchar *path); +void gvir_config_domain_graphics_sdl_set_display(GVirConfigDomainGraphicsSdl *graphics, + const gchar *disp); + +G_END_DECLS + +#endif /* __LIBVIRT_GCONFIG_DOMAIN_GRAPHICS_SDL_H__ */ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c index 1bac19e..e570586 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c @@ -79,12 +79,32 @@ gvir_config_domain_graphics_spice_new_from_xml(const gchar *xml, return GVIR_CONFIG_DOMAIN_GRAPHICS_SPICE(object); } +void gvir_config_domain_graphics_spice_set_autoport(GVirConfigDomainGraphicsSpice *graphics, + gboolean autoport) +{ + g_return_if_fail(GVIR_IS_CONFIG_DOMAIN_GRAPHICS_SPICE(graphics)); + + gvir_config_object_set_attribute_with_type(GVIR_CONFIG_OBJECT(graphics), + "autoport", G_TYPE_BOOLEAN, autoport, + NULL); +} + void gvir_config_domain_graphics_spice_set_port(GVirConfigDomainGraphicsSpice *graphics, - unsigned int port) + int port) +{ + g_return_if_fail(GVIR_IS_CONFIG_DOMAIN_GRAPHICS_SPICE(graphics)); + + gvir_config_object_set_attribute_with_type(GVIR_CONFIG_OBJECT(graphics), + "port", G_TYPE_INT, port, + NULL); +} + +void gvir_config_domain_graphics_spice_set_tls_port(GVirConfigDomainGraphicsSpice *graphics, + int port) { g_return_if_fail(GVIR_IS_CONFIG_DOMAIN_GRAPHICS_SPICE(graphics)); gvir_config_object_set_attribute_with_type(GVIR_CONFIG_OBJECT(graphics), - "port", G_TYPE_UINT, port, + "tlsPort", G_TYPE_INT, port, NULL); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.h b/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.h index 11d32a1..ea24d9a 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.h @@ -61,8 +61,15 @@ GType gvir_config_domain_graphics_spice_get_type(void); GVirConfigDomainGraphicsSpice *gvir_config_domain_graphics_spice_new(void); GVirConfigDomainGraphicsSpice *gvir_config_domain_graphics_spice_new_from_xml(const gchar *xml, GError **error); + +void gvir_config_domain_graphics_spice_set_autoport(GVirConfigDomainGraphicsSpice *graphics, + gboolean autoport); + void gvir_config_domain_graphics_spice_set_port(GVirConfigDomainGraphicsSpice *graphics, - unsigned int port); + int port); + +void gvir_config_domain_graphics_spice_set_tls_port(GVirConfigDomainGraphicsSpice *graphics, + int port); G_END_DECLS diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c new file mode 100644 index 0000000..cda5500 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c @@ -0,0 +1,101 @@ +/* + * libvirt-gobject-config-domain-graphics-vnc.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: Daniel P. Berrange <berrange@redhat.com> + */ + +#include <config.h> + +#include <string.h> + +#include <libxml/tree.h> + +#include "libvirt-gconfig/libvirt-gconfig.h" +#include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" +#include "libvirt-gconfig/libvirt-gconfig-object-private.h" + +#define GVIR_CONFIG_DOMAIN_GRAPHICS_VNC_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN_GRAPHICS_VNC, GVirConfigDomainGraphicsVncPrivate)) + +struct _GVirConfigDomainGraphicsVncPrivate +{ + gboolean unused; +}; + +G_DEFINE_TYPE(GVirConfigDomainGraphicsVnc, gvir_config_domain_graphics_vnc, GVIR_TYPE_CONFIG_DOMAIN_GRAPHICS); + + +static void gvir_config_domain_graphics_vnc_class_init(GVirConfigDomainGraphicsVncClass *klass) +{ + g_type_class_add_private(klass, sizeof(GVirConfigDomainGraphicsVncPrivate)); +} + + +static void gvir_config_domain_graphics_vnc_init(GVirConfigDomainGraphicsVnc *graphics_vnc) +{ + g_debug("Init GVirConfigDomainGraphicsVnc=%p", graphics_vnc); + + graphics_vnc->priv = GVIR_CONFIG_DOMAIN_GRAPHICS_VNC_GET_PRIVATE(graphics_vnc); +} + + +GVirConfigDomainGraphicsVnc *gvir_config_domain_graphics_vnc_new(void) +{ + GVirConfigObject *object; + + object = gvir_config_object_new(GVIR_TYPE_CONFIG_DOMAIN_GRAPHICS_VNC, + "graphics", NULL); + gvir_config_object_set_attribute(object, "type", "vnc", NULL); + return GVIR_CONFIG_DOMAIN_GRAPHICS_VNC(object); +} + +GVirConfigDomainGraphicsVnc * +gvir_config_domain_graphics_vnc_new_from_xml(const gchar *xml, + GError **error) +{ + GVirConfigObject *object; + + object = gvir_config_object_new_from_xml(GVIR_TYPE_CONFIG_DOMAIN_GRAPHICS_VNC, + "graphics", NULL, xml, error); + if (object == NULL) + return NULL; + gvir_config_object_set_attribute(object, "type", "vnc", NULL); + return GVIR_CONFIG_DOMAIN_GRAPHICS_VNC(object); +} + + +void gvir_config_domain_graphics_vnc_set_autoport(GVirConfigDomainGraphicsVnc *graphics, + gboolean autoport) +{ + g_return_if_fail(GVIR_IS_CONFIG_DOMAIN_GRAPHICS_VNC(graphics)); + + gvir_config_object_set_attribute_with_type(GVIR_CONFIG_OBJECT(graphics), + "autoport", G_TYPE_BOOLEAN, autoport, + NULL); +} + +void gvir_config_domain_graphics_vnc_set_port(GVirConfigDomainGraphicsVnc *graphics, + int port) +{ + g_return_if_fail(GVIR_IS_CONFIG_DOMAIN_GRAPHICS_VNC(graphics)); + + gvir_config_object_set_attribute_with_type(GVIR_CONFIG_OBJECT(graphics), + "port", G_TYPE_INT, port, + NULL); +} diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.h b/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.h new file mode 100644 index 0000000..8819d79 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.h @@ -0,0 +1,73 @@ +/* + * libvirt-gconfig-domain-graphics-vnc.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: Daniel P. Berrange <berrange@redhat.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_DOMAIN_GRAPHICS_VNC_H__ +#define __LIBVIRT_GCONFIG_DOMAIN_GRAPHICS_VNC_H__ + +G_BEGIN_DECLS + +#define GVIR_TYPE_CONFIG_DOMAIN_GRAPHICS_VNC (gvir_config_domain_graphics_vnc_get_type ()) +#define GVIR_CONFIG_DOMAIN_GRAPHICS_VNC(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_TYPE_CONFIG_DOMAIN_GRAPHICS_VNC, GVirConfigDomainGraphicsVnc)) +#define GVIR_CONFIG_DOMAIN_GRAPHICS_VNC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_TYPE_CONFIG_DOMAIN_GRAPHICS_VNC, GVirConfigDomainGraphicsVncClass)) +#define GVIR_IS_CONFIG_DOMAIN_GRAPHICS_VNC(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_TYPE_CONFIG_DOMAIN_GRAPHICS_VNC)) +#define GVIR_IS_CONFIG_DOMAIN_GRAPHICS_VNC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_TYPE_CONFIG_DOMAIN_GRAPHICS_VNC)) +#define GVIR_CONFIG_DOMAIN_GRAPHICS_VNC_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_TYPE_CONFIG_DOMAIN_GRAPHICS_VNC, GVirConfigDomainGraphicsVncClass)) + +typedef struct _GVirConfigDomainGraphicsVnc GVirConfigDomainGraphicsVnc; +typedef struct _GVirConfigDomainGraphicsVncPrivate GVirConfigDomainGraphicsVncPrivate; +typedef struct _GVirConfigDomainGraphicsVncClass GVirConfigDomainGraphicsVncClass; + +struct _GVirConfigDomainGraphicsVnc +{ + GVirConfigDomainGraphics parent; + + GVirConfigDomainGraphicsVncPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirConfigDomainGraphicsVncClass +{ + GVirConfigDomainGraphicsClass parent_class; + + gpointer padding[20]; +}; + +GType gvir_config_domain_graphics_vnc_get_type(void); + +GVirConfigDomainGraphicsVnc *gvir_config_domain_graphics_vnc_new(void); +GVirConfigDomainGraphicsVnc *gvir_config_domain_graphics_vnc_new_from_xml(const gchar *xml, + GError **error); + +void gvir_config_domain_graphics_vnc_set_autoport(GVirConfigDomainGraphicsVnc *graphics, + gboolean autoport); + +void gvir_config_domain_graphics_vnc_set_port(GVirConfigDomainGraphicsVnc *graphics, + int port); + +G_END_DECLS + +#endif /* __LIBVIRT_GCONFIG_DOMAIN_GRAPHICS_VNC_H__ */ diff --git a/libvirt-gconfig/libvirt-gconfig.h b/libvirt-gconfig/libvirt-gconfig.h index ed7623c..74c26ba 100644 --- a/libvirt-gconfig/libvirt-gconfig.h +++ b/libvirt-gconfig/libvirt-gconfig.h @@ -35,7 +35,9 @@ #include <libvirt-gconfig/libvirt-gconfig-domain-disk.h> #include <libvirt-gconfig/libvirt-gconfig-domain-filesys.h> #include <libvirt-gconfig/libvirt-gconfig-domain-graphics.h> +#include <libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.h> #include <libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.h> +#include <libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.h> #include <libvirt-gconfig/libvirt-gconfig-domain-input.h> #include <libvirt-gconfig/libvirt-gconfig-domain-interface.h> #include <libvirt-gconfig/libvirt-gconfig-domain-interface-network.h> diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index 738f625..da31f68 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -65,10 +65,24 @@ LIBVIRT_GCONFIG_0.0.1 { gvir_config_domain_graphics_get_type; + gvir_config_domain_graphics_sdl_get_type; + gvir_config_domain_graphics_sdl_new; + gvir_config_domain_graphics_sdl_new_from_xml; + gvir_config_domain_graphics_sdl_set_display; + gvir_config_domain_graphics_sdl_set_xauthority; + gvir_config_domain_graphics_spice_get_type; gvir_config_domain_graphics_spice_new; gvir_config_domain_graphics_spice_new_from_xml; + gvir_config_domain_graphics_spice_set_autoport; gvir_config_domain_graphics_spice_set_port; + gvir_config_domain_graphics_spice_set_tls_port; + + gvir_config_domain_graphics_vnc_get_type; + gvir_config_domain_graphics_vnc_new; + gvir_config_domain_graphics_vnc_new_from_xml; + gvir_config_domain_graphics_vnc_set_autoport; + gvir_config_domain_graphics_vnc_set_port; gvir_config_domain_input_bus_get_type; gvir_config_domain_input_get_type; -- 1.7.6.4
From: "Daniel P. Berrange" <berrange@redhat.com> Add support for the <seclabel> element via a new object GVirConfigDomainSeclabel. * libvirt-gconfig-domain-seclabel.c, libvirt-gconfig-domain-seclabel.h, Makefile.am, libvirt-gconfig.h, libvirt-gconfig.sym: New objects * libvirt-gconfig-domain.c, libvirt-gconfig-domain.h: API to associate seclabel with an domain --- libvirt-gconfig/Makefile.am | 2 + libvirt-gconfig/libvirt-gconfig-domain-seclabel.c | 111 +++++++++++++++++++++ libvirt-gconfig/libvirt-gconfig-domain-seclabel.h | 76 ++++++++++++++ libvirt-gconfig/libvirt-gconfig-domain.c | 10 ++ libvirt-gconfig/libvirt-gconfig-domain.h | 3 + libvirt-gconfig/libvirt-gconfig.h | 1 + libvirt-gconfig/libvirt-gconfig.sym | 10 ++ 7 files changed, 213 insertions(+), 0 deletions(-) create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-seclabel.c create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-seclabel.h diff --git a/libvirt-gconfig/Makefile.am b/libvirt-gconfig/Makefile.am index 7c9e8c0..ddae5fa 100644 --- a/libvirt-gconfig/Makefile.am +++ b/libvirt-gconfig/Makefile.am @@ -25,6 +25,7 @@ GCONFIG_HEADER_FILES = \ libvirt-gconfig-domain-interface.h \ libvirt-gconfig-domain-interface-network.h \ libvirt-gconfig-domain-os.h \ + libvirt-gconfig-domain-seclabel.h \ libvirt-gconfig-domain-snapshot.h \ libvirt-gconfig-domain-timer.h \ libvirt-gconfig-domain-video.h \ @@ -57,6 +58,7 @@ GCONFIG_SOURCE_FILES = \ libvirt-gconfig-domain-interface.c \ libvirt-gconfig-domain-interface-network.c \ libvirt-gconfig-domain-os.c \ + libvirt-gconfig-domain-seclabel.c \ libvirt-gconfig-domain-snapshot.c \ libvirt-gconfig-domain-timer.c \ libvirt-gconfig-domain-video.c \ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-seclabel.c b/libvirt-gconfig/libvirt-gconfig-domain-seclabel.c new file mode 100644 index 0000000..22508e9 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-seclabel.c @@ -0,0 +1,111 @@ +/* + * libvirt-gconfig-domain-seclabel.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 PURPSECLABELE. 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, Bseclabelton, MA 02111-1307 USA + * + * Author: Daniel P. Berrange <berrange@redhat.com> + */ + +#include <config.h> + +#include <string.h> + +#include "libvirt-gconfig/libvirt-gconfig.h" +#include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" +#include "libvirt-gconfig/libvirt-gconfig-object-private.h" + +#define GVIR_CONFIG_DOMAIN_SECLABEL_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN_SECLABEL, GVirConfigDomainSeclabelPrivate)) + +struct _GVirConfigDomainSeclabelPrivate +{ + gboolean unused; +}; + +G_DEFINE_TYPE(GVirConfigDomainSeclabel, gvir_config_domain_seclabel, GVIR_TYPE_CONFIG_OBJECT); + + +static void gvir_config_domain_seclabel_class_init(GVirConfigDomainSeclabelClass *klass) +{ + g_type_class_add_private(klass, sizeof(GVirConfigDomainSeclabelPrivate)); +} + + +static void gvir_config_domain_seclabel_init(GVirConfigDomainSeclabel *seclabel) +{ + g_debug("Init GVirConfigDomainSeclabel=%p", seclabel); + + seclabel->priv = GVIR_CONFIG_DOMAIN_SECLABEL_GET_PRIVATE(seclabel); +} + + +GVirConfigDomainSeclabel *gvir_config_domain_seclabel_new(void) +{ + GVirConfigObject *object; + + object = gvir_config_object_new(GVIR_TYPE_CONFIG_DOMAIN_SECLABEL, "seclabel", NULL); + return GVIR_CONFIG_DOMAIN_SECLABEL(object); +} + +GVirConfigDomainSeclabel *gvir_config_domain_seclabel_new_from_xml(const gchar *xml, GError **error) +{ + GVirConfigObject *object; + + object = gvir_config_object_new_from_xml(GVIR_TYPE_CONFIG_DOMAIN_SECLABEL, "seclabel", + NULL, xml, error); + return GVIR_CONFIG_DOMAIN_SECLABEL(object); +} + +void gvir_config_domain_seclabel_set_type(GVirConfigDomainSeclabel *seclabel, + GVirConfigDomainSeclabelType type) +{ + g_return_if_fail(GVIR_IS_CONFIG_DOMAIN_SECLABEL(seclabel)); + + gvir_config_object_set_attribute_with_type(GVIR_CONFIG_OBJECT(seclabel), + "type", + GVIR_TYPE_CONFIG_DOMAIN_SECLABEL_TYPE, + type, NULL); +} + +void gvir_config_domain_seclabel_set_model(GVirConfigDomainSeclabel *seclabel, + const gchar *model) +{ + g_return_if_fail(GVIR_IS_CONFIG_DOMAIN_SECLABEL(seclabel)); + + gvir_config_object_set_attribute(GVIR_CONFIG_OBJECT(seclabel), + "model", model, + NULL); + +} + +void gvir_config_domain_seclabel_set_baselabel(GVirConfigDomainSeclabel *seclabel, + const char *label) +{ + g_return_if_fail(GVIR_IS_CONFIG_DOMAIN_SECLABEL(seclabel)); + + gvir_config_object_set_node_content(GVIR_CONFIG_OBJECT(seclabel), + "baselabel", label); +} + +void gvir_config_domain_seclabel_set_label(GVirConfigDomainSeclabel *seclabel, + const char *label) +{ + g_return_if_fail(GVIR_IS_CONFIG_DOMAIN_SECLABEL(seclabel)); + + gvir_config_object_set_node_content(GVIR_CONFIG_OBJECT(seclabel), + "label", label); +} diff --git a/libvirt-gconfig/libvirt-gconfig-domain-seclabel.h b/libvirt-gconfig/libvirt-gconfig-domain-seclabel.h new file mode 100644 index 0000000..3aa446c --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-seclabel.h @@ -0,0 +1,76 @@ +/* + * libvirt-gconfig-domain-seclabel.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: Daniel P. Berrange <berrange@redhat.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_DOMAIN_SECLABEL_H__ +#define __LIBVIRT_GCONFIG_DOMAIN_SECLABEL_H__ + +G_BEGIN_DECLS + +#define GVIR_TYPE_CONFIG_DOMAIN_SECLABEL (gvir_config_domain_seclabel_get_type ()) +#define GVIR_CONFIG_DOMAIN_SECLABEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_TYPE_CONFIG_DOMAIN_SECLABEL, GVirConfigDomainSeclabel)) +#define GVIR_CONFIG_DOMAIN_SECLABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_TYPE_CONFIG_DOMAIN_SECLABEL, GVirConfigDomainSeclabelClass)) +#define GVIR_IS_CONFIG_DOMAIN_SECLABEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_TYPE_CONFIG_DOMAIN_SECLABEL)) +#define GVIR_IS_CONFIG_DOMAIN_SECLABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_TYPE_CONFIG_DOMAIN_SECLABEL)) +#define GVIR_CONFIG_DOMAIN_SECLABEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_TYPE_CONFIG_DOMAIN_SECLABEL, GVirConfigDomainSeclabelClass)) + +typedef struct _GVirConfigDomainSeclabel GVirConfigDomainSeclabel; +typedef struct _GVirConfigDomainSeclabelPrivate GVirConfigDomainSeclabelPrivate; +typedef struct _GVirConfigDomainSeclabelClass GVirConfigDomainSeclabelClass; + +struct _GVirConfigDomainSeclabel +{ + GVirConfigObject parent; + + GVirConfigDomainSeclabelPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirConfigDomainSeclabelClass +{ + GVirConfigObjectClass parent_class; + + gpointer padding[20]; +}; + +typedef enum { + GVIR_CONFIG_DOMAIN_SECLABEL_TYPE_DYNAMIC, + GVIR_CONFIG_DOMAIN_SECLABEL_TYPE_STATIC +} GVirConfigDomainSeclabelType; + +GType gvir_config_domain_seclabel_get_type(void); + +GVirConfigDomainSeclabel *gvir_config_domain_seclabel_new(void); +GVirConfigDomainSeclabel *gvir_config_domain_seclabel_new_from_xml(const gchar *xml, GError **error); + +void gvir_config_domain_seclabel_set_type(GVirConfigDomainSeclabel *seclabel, GVirConfigDomainSeclabelType type); +void gvir_config_domain_seclabel_set_model(GVirConfigDomainSeclabel *seclabel, const gchar *model); +void gvir_config_domain_seclabel_set_baselabel(GVirConfigDomainSeclabel *seclabel, const gchar *label); +void gvir_config_domain_seclabel_set_label(GVirConfigDomainSeclabel *seclabel, const gchar *label); + +G_END_DECLS + +#endif /* __LIBVIRT_GCONFIG_DOMAIN_SECLABEL_H__ */ diff --git a/libvirt-gconfig/libvirt-gconfig-domain.c b/libvirt-gconfig/libvirt-gconfig-domain.c index ab40cb3..062be3b 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-domain.c @@ -292,6 +292,16 @@ void gvir_config_domain_set_os(GVirConfigDomain *domain, GVIR_CONFIG_OBJECT(os)); } +void gvir_config_domain_set_seclabel(GVirConfigDomain *domain, + GVirConfigDomainSeclabel *seclabel) +{ + g_return_if_fail(GVIR_IS_CONFIG_DOMAIN(domain)); + g_return_if_fail(GVIR_IS_CONFIG_DOMAIN_SECLABEL(seclabel)); + + gvir_config_object_attach(GVIR_CONFIG_OBJECT(domain), + GVIR_CONFIG_OBJECT(seclabel)); +} + /** * gvir_config_domain_set_devices: * @devices: (in) (element-type LibvirtGConfig.DomainDevice): diff --git a/libvirt-gconfig/libvirt-gconfig-domain.h b/libvirt-gconfig/libvirt-gconfig-domain.h index 4cbc1f0..a531a54 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.h +++ b/libvirt-gconfig/libvirt-gconfig-domain.h @@ -30,6 +30,7 @@ #include <libvirt-gconfig/libvirt-gconfig-domain-clock.h> #include <libvirt-gconfig/libvirt-gconfig-domain-os.h> #include <libvirt-gconfig/libvirt-gconfig-domain-device.h> +#include <libvirt-gconfig/libvirt-gconfig-domain-seclabel.h> G_BEGIN_DECLS @@ -88,6 +89,8 @@ void gvir_config_domain_set_clock(GVirConfigDomain *domain, GVirConfigDomainClock *klock); void gvir_config_domain_set_os(GVirConfigDomain *domain, GVirConfigDomainOs *os); +void gvir_config_domain_set_seclabel(GVirConfigDomain *domain, + GVirConfigDomainSeclabel *seclabel); void gvir_config_domain_set_devices(GVirConfigDomain *domain, GList *devices); void gvir_config_domain_add_device(GVirConfigDomain *domain, diff --git a/libvirt-gconfig/libvirt-gconfig.h b/libvirt-gconfig/libvirt-gconfig.h index 74c26ba..be4b4dd 100644 --- a/libvirt-gconfig/libvirt-gconfig.h +++ b/libvirt-gconfig/libvirt-gconfig.h @@ -42,6 +42,7 @@ #include <libvirt-gconfig/libvirt-gconfig-domain-interface.h> #include <libvirt-gconfig/libvirt-gconfig-domain-interface-network.h> #include <libvirt-gconfig/libvirt-gconfig-domain-os.h> +#include <libvirt-gconfig/libvirt-gconfig-domain-seclabel.h> #include <libvirt-gconfig/libvirt-gconfig-domain-snapshot.h> #include <libvirt-gconfig/libvirt-gconfig-domain-timer.h> #include <libvirt-gconfig/libvirt-gconfig-domain-video.h> diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index da31f68..6f3593d 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -20,6 +20,7 @@ LIBVIRT_GCONFIG_0.0.1 { gvir_config_domain_get_name; gvir_config_domain_set_name; gvir_config_domain_set_os; + gvir_config_domain_set_seclabel; gvir_config_domain_get_vcpus; gvir_config_domain_set_vcpus; gvir_config_domain_set_virt_type; @@ -122,6 +123,15 @@ LIBVIRT_GCONFIG_0.0.1 { gvir_config_domain_snapshot_new; gvir_config_domain_snapshot_new_from_xml; + gvir_config_domain_seclabel_get_type; + gvir_config_domain_seclabel_type_get_type; + gvir_config_domain_seclabel_new; + gvir_config_domain_seclabel_new_from_xml; + gvir_config_domain_seclabel_set_type; + gvir_config_domain_seclabel_set_model; + gvir_config_domain_seclabel_set_baselabel; + gvir_config_domain_seclabel_set_label; + gvir_config_domain_timer_get_type; gvir_config_domain_timer_new; gvir_config_domain_timer_new_from_xml; -- 1.7.6.4
From: "Daniel P. Berrange" <berrange@redhat.com> The #include <string.h> and #include <libxml/tree.h> is not required in the vast majority of files --- libvirt-gconfig/libvirt-gconfig-capabilities.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-clock.c | 4 ---- libvirt-gconfig/libvirt-gconfig-domain-device.c | 4 ---- libvirt-gconfig/libvirt-gconfig-domain-disk.c | 4 ---- libvirt-gconfig/libvirt-gconfig-domain-filesys.c | 2 -- .../libvirt-gconfig-domain-graphics-sdl.c | 4 ---- .../libvirt-gconfig-domain-graphics-spice.c | 4 ---- .../libvirt-gconfig-domain-graphics-vnc.c | 4 ---- libvirt-gconfig/libvirt-gconfig-domain-graphics.c | 4 ---- libvirt-gconfig/libvirt-gconfig-domain-input.c | 4 ---- .../libvirt-gconfig-domain-interface-network.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-interface.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-os.c | 4 ---- libvirt-gconfig/libvirt-gconfig-domain-seclabel.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-snapshot.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-timer.c | 4 ---- libvirt-gconfig/libvirt-gconfig-domain-video.c | 4 ---- libvirt-gconfig/libvirt-gconfig-domain.c | 2 -- libvirt-gconfig/libvirt-gconfig-interface.c | 2 -- libvirt-gconfig/libvirt-gconfig-network-filter.c | 2 -- libvirt-gconfig/libvirt-gconfig-network.c | 2 -- libvirt-gconfig/libvirt-gconfig-node-device.c | 2 -- libvirt-gconfig/libvirt-gconfig-secret.c | 2 -- libvirt-gconfig/libvirt-gconfig-storage-pool.c | 2 -- libvirt-gconfig/libvirt-gconfig-storage-vol.c | 2 -- libvirt-gconfig/libvirt-gconfig-xml-doc.c | 2 -- 26 files changed, 0 insertions(+), 74 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities.c b/libvirt-gconfig/libvirt-gconfig-capabilities.c index b517944..5d6e311 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities.c @@ -23,8 +23,6 @@ #include <config.h> -#include <string.h> - #include "libvirt-gconfig/libvirt-gconfig.h" #define GVIR_CONFIG_CAPABILITIES_GET_PRIVATE(obj) \ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-clock.c b/libvirt-gconfig/libvirt-gconfig-domain-clock.c index 9f72c7b..3516ddf 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-clock.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-clock.c @@ -22,10 +22,6 @@ #include <config.h> -#include <string.h> - -#include <libxml/tree.h> - #include "libvirt-gconfig/libvirt-gconfig.h" #include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" #include "libvirt-gconfig/libvirt-gconfig-object-private.h" diff --git a/libvirt-gconfig/libvirt-gconfig-domain-device.c b/libvirt-gconfig/libvirt-gconfig-domain-device.c index 1c4e465..278ba38 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-device.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-device.c @@ -22,10 +22,6 @@ #include <config.h> -#include <string.h> - -#include <libxml/tree.h> - #include "libvirt-gconfig/libvirt-gconfig.h" #define GVIR_CONFIG_DOMAIN_DEVICE_GET_PRIVATE(obj) \ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-disk.c b/libvirt-gconfig/libvirt-gconfig-domain-disk.c index d22e223..0519131 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-disk.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-disk.c @@ -22,10 +22,6 @@ #include <config.h> -#include <string.h> - -#include <libxml/tree.h> - #include "libvirt-gconfig/libvirt-gconfig.h" #include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" #include "libvirt-gconfig/libvirt-gconfig-object-private.h" diff --git a/libvirt-gconfig/libvirt-gconfig-domain-filesys.c b/libvirt-gconfig/libvirt-gconfig-domain-filesys.c index 32a1636..71ee852 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-filesys.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-filesys.c @@ -22,8 +22,6 @@ #include <config.h> -#include <string.h> - #include "libvirt-gconfig/libvirt-gconfig.h" #include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" #include "libvirt-gconfig/libvirt-gconfig-object-private.h" diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c index 728c320..ef3398f 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c @@ -22,10 +22,6 @@ #include <config.h> -#include <string.h> - -#include <libxml/tree.h> - #include "libvirt-gconfig/libvirt-gconfig.h" #include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" #include "libvirt-gconfig/libvirt-gconfig-object-private.h" diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c index e570586..cd66113 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c @@ -22,10 +22,6 @@ #include <config.h> -#include <string.h> - -#include <libxml/tree.h> - #include "libvirt-gconfig/libvirt-gconfig.h" #include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" #include "libvirt-gconfig/libvirt-gconfig-object-private.h" diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c index cda5500..be8aecb 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c @@ -22,10 +22,6 @@ #include <config.h> -#include <string.h> - -#include <libxml/tree.h> - #include "libvirt-gconfig/libvirt-gconfig.h" #include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" #include "libvirt-gconfig/libvirt-gconfig-object-private.h" diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics.c index 833f693..b99e992 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics.c @@ -22,10 +22,6 @@ #include <config.h> -#include <string.h> - -#include <libxml/tree.h> - #include "libvirt-gconfig/libvirt-gconfig.h" #define GVIR_CONFIG_DOMAIN_GRAPHICS_GET_PRIVATE(obj) \ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-input.c b/libvirt-gconfig/libvirt-gconfig-domain-input.c index db4d274..f114b86 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-input.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-input.c @@ -22,10 +22,6 @@ #include <config.h> -#include <string.h> - -#include <libxml/tree.h> - #include "libvirt-gconfig/libvirt-gconfig.h" #include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" #include "libvirt-gconfig/libvirt-gconfig-object-private.h" diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c index 071aaaa..9a68097 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c @@ -24,8 +24,6 @@ #include <config.h> -#include <string.h> - #include "libvirt-gconfig/libvirt-gconfig.h" #include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" #include "libvirt-gconfig/libvirt-gconfig-object-private.h" diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface.c b/libvirt-gconfig/libvirt-gconfig-domain-interface.c index c825fee..924379f 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface.c @@ -23,8 +23,6 @@ #include <config.h> -#include <string.h> - #include "libvirt-gconfig/libvirt-gconfig.h" #define GVIR_CONFIG_DOMAIN_INTERFACE_GET_PRIVATE(obj) \ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-os.c b/libvirt-gconfig/libvirt-gconfig-domain-os.c index f114494..9040ca2 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-os.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-os.c @@ -22,10 +22,6 @@ #include <config.h> -#include <string.h> - -#include <libxml/tree.h> - #include "libvirt-gconfig/libvirt-gconfig.h" #include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" #include "libvirt-gconfig/libvirt-gconfig-object-private.h" diff --git a/libvirt-gconfig/libvirt-gconfig-domain-seclabel.c b/libvirt-gconfig/libvirt-gconfig-domain-seclabel.c index 22508e9..9dbae0b 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-seclabel.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-seclabel.c @@ -22,8 +22,6 @@ #include <config.h> -#include <string.h> - #include "libvirt-gconfig/libvirt-gconfig.h" #include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" #include "libvirt-gconfig/libvirt-gconfig-object-private.h" diff --git a/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c b/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c index 421269d..a067ff8 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c @@ -23,8 +23,6 @@ #include <config.h> -#include <string.h> - #include "libvirt-gconfig/libvirt-gconfig.h" #define GVIR_CONFIG_DOMAIN_SNAPSHOT_GET_PRIVATE(obj) \ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-timer.c b/libvirt-gconfig/libvirt-gconfig-domain-timer.c index c1610fa..6917a7e 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-timer.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-timer.c @@ -22,10 +22,6 @@ #include <config.h> -#include <string.h> - -#include <libxml/tree.h> - #include "libvirt-gconfig/libvirt-gconfig.h" #define GVIR_CONFIG_DOMAIN_TIMER_GET_PRIVATE(obj) \ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-video.c b/libvirt-gconfig/libvirt-gconfig-domain-video.c index 40f9368..54436ee 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-video.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-video.c @@ -22,10 +22,6 @@ #include <config.h> -#include <string.h> - -#include <libxml/tree.h> - #include "libvirt-gconfig/libvirt-gconfig.h" #include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" #include "libvirt-gconfig/libvirt-gconfig-object-private.h" diff --git a/libvirt-gconfig/libvirt-gconfig-domain.c b/libvirt-gconfig/libvirt-gconfig-domain.c index 062be3b..d922ff8 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-domain.c @@ -23,8 +23,6 @@ #include <config.h> -#include <string.h> - #include "libvirt-gconfig/libvirt-gconfig.h" #include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" #include "libvirt-gconfig/libvirt-gconfig-object-private.h" diff --git a/libvirt-gconfig/libvirt-gconfig-interface.c b/libvirt-gconfig/libvirt-gconfig-interface.c index 6152c35..cc57e37 100644 --- a/libvirt-gconfig/libvirt-gconfig-interface.c +++ b/libvirt-gconfig/libvirt-gconfig-interface.c @@ -23,8 +23,6 @@ #include <config.h> -#include <string.h> - #include "libvirt-gconfig/libvirt-gconfig.h" #define GVIR_CONFIG_INTERFACE_GET_PRIVATE(obj) \ diff --git a/libvirt-gconfig/libvirt-gconfig-network-filter.c b/libvirt-gconfig/libvirt-gconfig-network-filter.c index 47469ed..c18347c 100644 --- a/libvirt-gconfig/libvirt-gconfig-network-filter.c +++ b/libvirt-gconfig/libvirt-gconfig-network-filter.c @@ -23,8 +23,6 @@ #include <config.h> -#include <string.h> - #include "libvirt-gconfig/libvirt-gconfig.h" #define GVIR_CONFIG_NETWORK_FILTER_GET_PRIVATE(obj) \ diff --git a/libvirt-gconfig/libvirt-gconfig-network.c b/libvirt-gconfig/libvirt-gconfig-network.c index 9fe4181..e947ab1 100644 --- a/libvirt-gconfig/libvirt-gconfig-network.c +++ b/libvirt-gconfig/libvirt-gconfig-network.c @@ -23,8 +23,6 @@ #include <config.h> -#include <string.h> - #include "libvirt-gconfig/libvirt-gconfig.h" #define GVIR_CONFIG_NETWORK_GET_PRIVATE(obj) \ diff --git a/libvirt-gconfig/libvirt-gconfig-node-device.c b/libvirt-gconfig/libvirt-gconfig-node-device.c index f89aeb1..df992c1 100644 --- a/libvirt-gconfig/libvirt-gconfig-node-device.c +++ b/libvirt-gconfig/libvirt-gconfig-node-device.c @@ -23,8 +23,6 @@ #include <config.h> -#include <string.h> - #include "libvirt-gconfig/libvirt-gconfig.h" #define GVIR_CONFIG_NODE_DEVICE_GET_PRIVATE(obj) \ diff --git a/libvirt-gconfig/libvirt-gconfig-secret.c b/libvirt-gconfig/libvirt-gconfig-secret.c index 6f57aaa..15aca6b 100644 --- a/libvirt-gconfig/libvirt-gconfig-secret.c +++ b/libvirt-gconfig/libvirt-gconfig-secret.c @@ -23,8 +23,6 @@ #include <config.h> -#include <string.h> - #include "libvirt-gconfig/libvirt-gconfig.h" #define GVIR_CONFIG_SECRET_GET_PRIVATE(obj) \ diff --git a/libvirt-gconfig/libvirt-gconfig-storage-pool.c b/libvirt-gconfig/libvirt-gconfig-storage-pool.c index c95cf59..3c7e141 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-pool.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-pool.c @@ -23,8 +23,6 @@ #include <config.h> -#include <string.h> - #include "libvirt-gconfig/libvirt-gconfig.h" #define GVIR_CONFIG_STORAGE_POOL_GET_PRIVATE(obj) \ diff --git a/libvirt-gconfig/libvirt-gconfig-storage-vol.c b/libvirt-gconfig/libvirt-gconfig-storage-vol.c index 5a31c80..64cdc7a 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-vol.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-vol.c @@ -23,8 +23,6 @@ #include <config.h> -#include <string.h> - #include "libvirt-gconfig/libvirt-gconfig.h" #define GVIR_CONFIG_STORAGE_VOL_GET_PRIVATE(obj) \ diff --git a/libvirt-gconfig/libvirt-gconfig-xml-doc.c b/libvirt-gconfig/libvirt-gconfig-xml-doc.c index 292f28d..f513784 100644 --- a/libvirt-gconfig/libvirt-gconfig-xml-doc.c +++ b/libvirt-gconfig/libvirt-gconfig-xml-doc.c @@ -24,8 +24,6 @@ #include <string.h> -#include <libxml/tree.h> - #include "libvirt-gconfig/libvirt-gconfig.h" #include "libvirt-gconfig/libvirt-gconfig-xml-doc.h" -- 1.7.6.4
From: "Daniel P. Berrange" <berrange@redhat.com> --- libvirt-gconfig/libvirt-gconfig-capabilities.c | 2 +- libvirt-gconfig/libvirt-gconfig-capabilities.h | 2 +- libvirt-gconfig/libvirt-gconfig-domain-clock.c | 2 +- libvirt-gconfig/libvirt-gconfig-domain-clock.h | 2 +- libvirt-gconfig/libvirt-gconfig-domain-device.c | 2 +- libvirt-gconfig/libvirt-gconfig-domain-device.h | 2 +- libvirt-gconfig/libvirt-gconfig-domain-disk.c | 2 +- libvirt-gconfig/libvirt-gconfig-domain-disk.h | 2 +- libvirt-gconfig/libvirt-gconfig-domain-filesys.c | 2 +- libvirt-gconfig/libvirt-gconfig-domain-filesys.h | 2 +- .../libvirt-gconfig-domain-graphics-sdl.c | 2 +- .../libvirt-gconfig-domain-graphics-sdl.h | 2 +- .../libvirt-gconfig-domain-graphics-spice.c | 2 +- .../libvirt-gconfig-domain-graphics-spice.h | 2 +- .../libvirt-gconfig-domain-graphics-vnc.c | 2 +- .../libvirt-gconfig-domain-graphics-vnc.h | 2 +- libvirt-gconfig/libvirt-gconfig-domain-graphics.c | 2 +- libvirt-gconfig/libvirt-gconfig-domain-graphics.h | 2 +- libvirt-gconfig/libvirt-gconfig-domain-input.c | 2 +- libvirt-gconfig/libvirt-gconfig-domain-input.h | 2 +- .../libvirt-gconfig-domain-interface-network.c | 2 +- .../libvirt-gconfig-domain-interface-network.h | 2 +- libvirt-gconfig/libvirt-gconfig-domain-interface.c | 2 +- libvirt-gconfig/libvirt-gconfig-domain-interface.h | 2 +- libvirt-gconfig/libvirt-gconfig-domain-os.c | 2 +- libvirt-gconfig/libvirt-gconfig-domain-os.h | 2 +- libvirt-gconfig/libvirt-gconfig-domain-seclabel.c | 2 +- libvirt-gconfig/libvirt-gconfig-domain-seclabel.h | 2 +- libvirt-gconfig/libvirt-gconfig-domain-snapshot.c | 2 +- libvirt-gconfig/libvirt-gconfig-domain-snapshot.h | 2 +- libvirt-gconfig/libvirt-gconfig-domain-timer.c | 2 +- libvirt-gconfig/libvirt-gconfig-domain-timer.h | 2 +- libvirt-gconfig/libvirt-gconfig-domain-video.c | 2 +- libvirt-gconfig/libvirt-gconfig-domain-video.h | 2 +- libvirt-gconfig/libvirt-gconfig-domain.c | 2 +- libvirt-gconfig/libvirt-gconfig-domain.h | 2 +- libvirt-gconfig/libvirt-gconfig-helpers-private.h | 2 +- libvirt-gconfig/libvirt-gconfig-helpers.c | 2 +- libvirt-gconfig/libvirt-gconfig-helpers.h | 2 +- libvirt-gconfig/libvirt-gconfig-interface.c | 2 +- libvirt-gconfig/libvirt-gconfig-interface.h | 2 +- libvirt-gconfig/libvirt-gconfig-main.h | 2 +- libvirt-gconfig/libvirt-gconfig-network-filter.c | 2 +- libvirt-gconfig/libvirt-gconfig-network-filter.h | 2 +- libvirt-gconfig/libvirt-gconfig-network.c | 2 +- libvirt-gconfig/libvirt-gconfig-network.h | 2 +- libvirt-gconfig/libvirt-gconfig-node-device.c | 2 +- libvirt-gconfig/libvirt-gconfig-node-device.h | 2 +- libvirt-gconfig/libvirt-gconfig-object-private.h | 2 +- libvirt-gconfig/libvirt-gconfig-object.c | 2 +- libvirt-gconfig/libvirt-gconfig-object.h | 2 +- libvirt-gconfig/libvirt-gconfig-secret.c | 2 +- libvirt-gconfig/libvirt-gconfig-secret.h | 2 +- libvirt-gconfig/libvirt-gconfig-storage-pool.c | 2 +- libvirt-gconfig/libvirt-gconfig-storage-pool.h | 2 +- libvirt-gconfig/libvirt-gconfig-storage-vol.c | 2 +- libvirt-gconfig/libvirt-gconfig-storage-vol.h | 2 +- libvirt-gconfig/libvirt-gconfig-xml-doc.c | 2 +- libvirt-gconfig/libvirt-gconfig-xml-doc.h | 2 +- 59 files changed, 59 insertions(+), 59 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities.c b/libvirt-gconfig/libvirt-gconfig-capabilities.c index 5d6e311..9d4a95d 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities.c @@ -1,5 +1,5 @@ /* - * libvirt-gobject-config_capabilities.c: libvirt glib integration + * libvirt-gconfig-capabilities.c: libvirt capabilities configuration * * Copyright (C) 2008 Daniel P. Berrange * Copyright (C) 2010 Red Hat diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities.h b/libvirt-gconfig/libvirt-gconfig-capabilities.h index 7170683..1b8bbe3 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities.h +++ b/libvirt-gconfig/libvirt-gconfig-capabilities.h @@ -1,5 +1,5 @@ /* - * libvirt-gobject-capabilities-config.c: libvirt gobject integration + * libvirt-gconfig-capabilities.c: libvirt capabilities configuration * * Copyright (C) 2010 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-domain-clock.c b/libvirt-gconfig/libvirt-gconfig-domain-clock.c index 3516ddf..7441a76 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-clock.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-clock.c @@ -1,5 +1,5 @@ /* - * libvirt-gobject-config-domain-clock.c: libvirt glib integration + * libvirt-gconfig-domain-clock.c: libvirt domain clock configuration * * Copyright (C) 2011 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-domain-clock.h b/libvirt-gconfig/libvirt-gconfig-domain-clock.h index 6a68c24..0c8e839 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-clock.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-clock.h @@ -1,5 +1,5 @@ /* - * libvirt-gobject-domain-clock.h: libvirt gobject integration + * libvirt-gconfig-domain-clock.h: libvirt domain clock configuration * * Copyright (C) 2011 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-domain-device.c b/libvirt-gconfig/libvirt-gconfig-domain-device.c index 278ba38..3a2d991 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-device.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-device.c @@ -1,5 +1,5 @@ /* - * libvirt-gobject-config-domain-device.c: libvirt glib integration + * libvirt-gconfig-domain-device.c: libvirt domain device configuration * * Copyright (C) 2011 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-domain-device.h b/libvirt-gconfig/libvirt-gconfig-domain-device.h index ba15cbb..c67ac7b 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-device.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-device.h @@ -1,5 +1,5 @@ /* - * libvirt-gobject-domain-device.c: libvirt gobject integration + * libvirt-gconfig-domain-device.h: libvirt domain device configuration * * Copyright (C) 2011 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-domain-disk.c b/libvirt-gconfig/libvirt-gconfig-domain-disk.c index 0519131..ef1b069 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-disk.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-disk.c @@ -1,5 +1,5 @@ /* - * libvirt-gobject-config-domain-disk.c: libvirt glib integration + * libvirt-gconfig-domain-disk.c: libvirt domain disk configuration * * Copyright (C) 2011 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-domain-disk.h b/libvirt-gconfig/libvirt-gconfig-domain-disk.h index a02c817..67b00b8 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-disk.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-disk.h @@ -1,5 +1,5 @@ /* - * libvirt-gobject-domain-disk.c: libvirt gobject integration + * libvirt-gconfig-domain-disk.h: libvirt domain disk configuration * * Copyright (C) 2011 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-domain-filesys.c b/libvirt-gconfig/libvirt-gconfig-domain-filesys.c index 71ee852..e54e50c 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-filesys.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-filesys.c @@ -1,5 +1,5 @@ /* - * libvirt-gobject-config-domain-filesys.c: libvirt glib integration + * libvirt-gconfig-domain-filesys.c: libvirt domain filesystem configuration * * Copyright (C) 2011 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-domain-filesys.h b/libvirt-gconfig/libvirt-gconfig-domain-filesys.h index a80d3c5..4c31459 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-filesys.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-filesys.h @@ -1,5 +1,5 @@ /* - * libvirt-gobject-domain-filesys.h: libvirt gobject integration + * libvirt-gconfig-domain-filesys.h: libvirt domain filesystem configuration * * Copyright (C) 2011 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c index ef3398f..2dde518 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c @@ -1,5 +1,5 @@ /* - * libvirt-gobject-config-domain-graphics-sdl.c: libvirt glib integration + * libvirt-gconfig-domain-graphics-sdl.c: libvirt domain SDL configuration * * Copyright (C) 2011 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.h b/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.h index 03d1296..3ae3c7d 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.h @@ -1,5 +1,5 @@ /* - * libvirt-gconfig-domain-graphics-sdl.h: libvirt gobject integration + * libvirt-gconfig-domain-graphics-sdl.h: libvirt domain SDL configuration * * Copyright (C) 2011 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c index cd66113..67c2267 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c @@ -1,5 +1,5 @@ /* - * libvirt-gobject-config-domain-graphics-spice.c: libvirt glib integration + * libvirt-gconfig-domain-graphics-spice.c: libvirt domain SPICE configuration * * Copyright (C) 2011 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.h b/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.h index ea24d9a..a96fd59 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.h @@ -1,5 +1,5 @@ /* - * libvirt-gconfig-domain-graphics-spice.h: libvirt gobject integration + * libvirt-gconfig-domain-graphics-spice.h: libvirt domain SPICE confiiguration * * Copyright (C) 2011 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c index be8aecb..593c9f1 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c @@ -1,5 +1,5 @@ /* - * libvirt-gobject-config-domain-graphics-vnc.c: libvirt glib integration + * libvirt-gconfig-domain-graphics-vnc.c: libvirt domain VNC configuration * * Copyright (C) 2011 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.h b/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.h index 8819d79..ad41e08 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.h @@ -1,5 +1,5 @@ /* - * libvirt-gconfig-domain-graphics-vnc.h: libvirt gobject integration + * libvirt-gconfig-domain-graphics-vnc.h: libvirt domain VNC graphics configuration * * Copyright (C) 2011 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics.c index b99e992..b8a4063 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics.c @@ -1,5 +1,5 @@ /* - * libvirt-gobject-config-domain-graphics.c: libvirt glib integration + * libvirt-gconfig-domain-graphics.c: libvirt domain graphics configuration * * Copyright (C) 2011 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics.h b/libvirt-gconfig/libvirt-gconfig-domain-graphics.h index 572d4d9..93a0eb0 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics.h @@ -1,5 +1,5 @@ /* - * libvirt-gobject-domain-graphics.c: libvirt gobject integration + * libvirt-gconfig-domain-graphics.h: libvirt domain graphics configuration * * Copyright (C) 2011 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-domain-input.c b/libvirt-gconfig/libvirt-gconfig-domain-input.c index f114b86..77cccbe 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-input.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-input.c @@ -1,5 +1,5 @@ /* - * libvirt-gobject-config-device_input.c: libvirt glib integration + * libvirt-gconfig-device-input.c: libvirt domain input configuration * * Copyright (C) 2011 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-domain-input.h b/libvirt-gconfig/libvirt-gconfig-domain-input.h index e3f22b1..2afc263 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-input.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-input.h @@ -1,5 +1,5 @@ /* - * libvirt-gobject-domain-input.c: libvirt gobject integration + * libvirt-gconfig-domain-input.c: libvirt domain input configuration * * Copyright (C) 2011 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c index 9a68097..6a390fe 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c @@ -1,5 +1,5 @@ /* - * libvirt-gobject-config-interface-network.c: libvirt glib integration + * libvirt-gconfig-domain-interface-network.c: libvirt domain interface configuration * * Copyright (C) 2008 Daniel P. Berrange * Copyright (C) 2011 Red Hat diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-network.h b/libvirt-gconfig/libvirt-gconfig-domain-interface-network.h index 3891bf9..a5ea3e2 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface-network.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-network.h @@ -1,5 +1,5 @@ /* - * libvirt-gobject-config-interface-network.c: libvirt gobject integration + * libvirt-gconfig-domain-interface-network.c: libvirt domain interface configuration * * Copyright (C) 2011 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface.c b/libvirt-gconfig/libvirt-gconfig-domain-interface.c index 924379f..541f44c 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface.c @@ -1,5 +1,5 @@ /* - * libvirt-gobject-config-domain-interface.c: libvirt glib integration + * libvirt-gconfig-domain-interface.c: libvirt domain interface configuration * * Copyright (C) 2008 Daniel P. Berrange * Copyright (C) 2010 Red Hat diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface.h b/libvirt-gconfig/libvirt-gconfig-domain-interface.h index cf60936..2a6bc6a 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface.h @@ -1,5 +1,5 @@ /* - * libvirt-gconfig-domain-interface.h: libvirt gobject integration + * libvirt-gconfig-domain-interface.h: libvirt domain interface configuration * * Copyright (C) 2010 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-domain-os.c b/libvirt-gconfig/libvirt-gconfig-domain-os.c index 9040ca2..28c8894 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-os.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-os.c @@ -1,5 +1,5 @@ /* - * libvirt-gobject-config-domain-os.c: libvirt glib integration + * libvirt-gconfig-domain-os.c: libvirt domain OS configuration * * Copyright (C) 2011 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-domain-os.h b/libvirt-gconfig/libvirt-gconfig-domain-os.h index b978dbc..2b85866 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-os.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-os.h @@ -1,5 +1,5 @@ /* - * libvirt-gobject-domain-os.c: libvirt gobject integration + * libvirt-gconfig-domain-os.c: libvirt domain OS configuration * * Copyright (C) 2011 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-domain-seclabel.c b/libvirt-gconfig/libvirt-gconfig-domain-seclabel.c index 9dbae0b..56916b7 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-seclabel.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-seclabel.c @@ -1,5 +1,5 @@ /* - * libvirt-gconfig-domain-seclabel.c: libvirt glib integration + * libvirt-gconfig-domain-seclabel.c: libvirt domain security label configuration * * Copyright (C) 2011 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-domain-seclabel.h b/libvirt-gconfig/libvirt-gconfig-domain-seclabel.h index 3aa446c..50dc7c9 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-seclabel.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-seclabel.h @@ -1,5 +1,5 @@ /* - * libvirt-gconfig-domain-seclabel.h: libvirt gobject integration + * libvirt-gconfig-domain-seclabel.h: libvirt domain security label configuration * * Copyright (C) 2011 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c b/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c index a067ff8..20ec499 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c @@ -1,5 +1,5 @@ /* - * libvirt-gobject-config_domain_snapshot.c: libvirt glib integration + * libvirt-gconfig-domain-snapshot.c: libvirt domain snapshot configuration * * Copyright (C) 2008 Daniel P. Berrange * Copyright (C) 2010 Red Hat diff --git a/libvirt-gconfig/libvirt-gconfig-domain-snapshot.h b/libvirt-gconfig/libvirt-gconfig-domain-snapshot.h index d086c1e..0df3210 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-snapshot.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-snapshot.h @@ -1,5 +1,5 @@ /* - * libvirt-gobject-domain_snapshot-config.c: libvirt gobject integration + * libvirt-gconfig-domain-snapshot.h: libvirt domain snapshot configuration * * Copyright (C) 2010 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-domain-timer.c b/libvirt-gconfig/libvirt-gconfig-domain-timer.c index 6917a7e..d278dd7 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-timer.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-timer.c @@ -1,5 +1,5 @@ /* - * libvirt-gobject-config-domain-timer.c: libvirt glib integration + * libvirt-gconfig-domain-timer.c: libvirt domain timer configuration * * Copyright (C) 2011 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-domain-timer.h b/libvirt-gconfig/libvirt-gconfig-domain-timer.h index 147913f..d63a3f4 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-timer.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-timer.h @@ -1,5 +1,5 @@ /* - * libvirt-gobject-domain-timer.c: libvirt gobject integration + * libvirt-gconfig-domain-timer.h: libvirt domain timer configuration * * Copyright (C) 2011 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-domain-video.c b/libvirt-gconfig/libvirt-gconfig-domain-video.c index 54436ee..68b739f 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-video.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-video.c @@ -1,5 +1,5 @@ /* - * libvirt-gobject-config-domain-video.c: libvirt glib integration + * libvirt-gconfig-domain-video.c: libvirt domain video configuration * * Copyright (C) 2011 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-domain-video.h b/libvirt-gconfig/libvirt-gconfig-domain-video.h index 4790e56..d9cbcc6 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-video.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-video.h @@ -1,5 +1,5 @@ /* - * libvirt-gobject-domain-video.c: libvirt gobject integration + * libvirt-gconfig-domain-video.h: libvirt domain video configuration * * Copyright (C) 2011 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-domain.c b/libvirt-gconfig/libvirt-gconfig-domain.c index d922ff8..7225ee4 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-domain.c @@ -1,5 +1,5 @@ /* - * libvirt-gobject-config_domain.c: libvirt glib integration + * libvirt-gconfig-domain.c: libvirt domain configuration * * Copyright (C) 2008 Daniel P. Berrange * Copyright (C) 2010 Red Hat diff --git a/libvirt-gconfig/libvirt-gconfig-domain.h b/libvirt-gconfig/libvirt-gconfig-domain.h index a531a54..7b40f99 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.h +++ b/libvirt-gconfig/libvirt-gconfig-domain.h @@ -1,5 +1,5 @@ /* - * libvirt-gobject-domain-config.c: libvirt gobject integration + * libvirt-gconfig-domain.h: libvirt domain configuration * * Copyright (C) 2010 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-helpers-private.h b/libvirt-gconfig/libvirt-gconfig-helpers-private.h index 59efd24..0a35595 100644 --- a/libvirt-gconfig/libvirt-gconfig-helpers-private.h +++ b/libvirt-gconfig/libvirt-gconfig-helpers-private.h @@ -1,5 +1,5 @@ /* - * libvirt-gconfig-helpers.h: various GVirConfig helpers + * libvirt-gconfig-helpers-private.h: libvirt configuration helpers * * Copyright (C) 2010, 2011 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-helpers.c b/libvirt-gconfig/libvirt-gconfig-helpers.c index d7e1140..722fe3d 100644 --- a/libvirt-gconfig/libvirt-gconfig-helpers.c +++ b/libvirt-gconfig/libvirt-gconfig-helpers.c @@ -1,5 +1,5 @@ /* - * libvirt-gconfig-helpers.c: various GVirConfig helpers + * libvirt-gconfig-helpers.c: libvirt configuration helpers * * Copyright (C) 2010, 2011 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-helpers.h b/libvirt-gconfig/libvirt-gconfig-helpers.h index d8026d3..dd5477a 100644 --- a/libvirt-gconfig/libvirt-gconfig-helpers.h +++ b/libvirt-gconfig/libvirt-gconfig-helpers.h @@ -1,5 +1,5 @@ /* - * libvirt-gconfig-helpers.h: various GVirConfig helpers + * libvirt-gconfig-helpers.h: libvirt configuration helpers * * Copyright (C) 2010, 2011 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-interface.c b/libvirt-gconfig/libvirt-gconfig-interface.c index cc57e37..9e5b667 100644 --- a/libvirt-gconfig/libvirt-gconfig-interface.c +++ b/libvirt-gconfig/libvirt-gconfig-interface.c @@ -1,5 +1,5 @@ /* - * libvirt-gobject-config_interface.c: libvirt glib integration + * libvirt-gconfig-interface.c: libvirt interface configuration * * Copyright (C) 2008 Daniel P. Berrange * Copyright (C) 2010 Red Hat diff --git a/libvirt-gconfig/libvirt-gconfig-interface.h b/libvirt-gconfig/libvirt-gconfig-interface.h index 0728c29..5dc0516 100644 --- a/libvirt-gconfig/libvirt-gconfig-interface.h +++ b/libvirt-gconfig/libvirt-gconfig-interface.h @@ -1,5 +1,5 @@ /* - * libvirt-gobject-interface-config.c: libvirt gobject integration + * libvirt-gconfig-interface.c: libvirt interface configuration * * Copyright (C) 2010 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-main.h b/libvirt-gconfig/libvirt-gconfig-main.h index bcd1ded..411a53a 100644 --- a/libvirt-gconfig/libvirt-gconfig-main.h +++ b/libvirt-gconfig/libvirt-gconfig-main.h @@ -1,5 +1,5 @@ /* - * libvirt-gconfig-main.c: libvirt gconfig integration + * libvirt-gconfig-main.h: libvirt gconfig integration * * Copyright (C) 2008 Daniel P. Berrange * Copyright (C) 2010 Red Hat diff --git a/libvirt-gconfig/libvirt-gconfig-network-filter.c b/libvirt-gconfig/libvirt-gconfig-network-filter.c index c18347c..576c014 100644 --- a/libvirt-gconfig/libvirt-gconfig-network-filter.c +++ b/libvirt-gconfig/libvirt-gconfig-network-filter.c @@ -1,5 +1,5 @@ /* - * libvirt-gobject-config_network_filter.c: libvirt glib integration + * libvirt-gconfig-network-filter.c: libvirt network filter configuration * * Copyright (C) 2008 Daniel P. Berrange * Copyright (C) 2010 Red Hat diff --git a/libvirt-gconfig/libvirt-gconfig-network-filter.h b/libvirt-gconfig/libvirt-gconfig-network-filter.h index 3032608..edc6fe9 100644 --- a/libvirt-gconfig/libvirt-gconfig-network-filter.h +++ b/libvirt-gconfig/libvirt-gconfig-network-filter.h @@ -1,5 +1,5 @@ /* - * libvirt-gobject-nwfilter-config.c: libvirt gobject integration + * libvirt-gconfig-network-filter.h: libvirt network filter configuration * * Copyright (C) 2010 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-network.c b/libvirt-gconfig/libvirt-gconfig-network.c index e947ab1..47e998c 100644 --- a/libvirt-gconfig/libvirt-gconfig-network.c +++ b/libvirt-gconfig/libvirt-gconfig-network.c @@ -1,5 +1,5 @@ /* - * libvirt-gobject-config_network.c: libvirt glib integration + * libvirt-gconfig-network.c: libvirt network configuration * * Copyright (C) 2008 Daniel P. Berrange * Copyright (C) 2010 Red Hat diff --git a/libvirt-gconfig/libvirt-gconfig-network.h b/libvirt-gconfig/libvirt-gconfig-network.h index 3810589..60a56a5 100644 --- a/libvirt-gconfig/libvirt-gconfig-network.h +++ b/libvirt-gconfig/libvirt-gconfig-network.h @@ -1,5 +1,5 @@ /* - * libvirt-gobject-network-config.c: libvirt gobject integration + * libvirt-gconfig-network.c: libvirt network configuration * * Copyright (C) 2010 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-node-device.c b/libvirt-gconfig/libvirt-gconfig-node-device.c index df992c1..a42f7cc 100644 --- a/libvirt-gconfig/libvirt-gconfig-node-device.c +++ b/libvirt-gconfig/libvirt-gconfig-node-device.c @@ -1,5 +1,5 @@ /* - * libvirt-gobject-config_node_device.c: libvirt glib integration + * libvirt-gconfig-node-device.c: libvirt node device configuration * * Copyright (C) 2008 Daniel P. Berrange * Copyright (C) 2010 Red Hat diff --git a/libvirt-gconfig/libvirt-gconfig-node-device.h b/libvirt-gconfig/libvirt-gconfig-node-device.h index 293820d..fc1e7ce 100644 --- a/libvirt-gconfig/libvirt-gconfig-node-device.h +++ b/libvirt-gconfig/libvirt-gconfig-node-device.h @@ -1,5 +1,5 @@ /* - * libvirt-gobject-nodedevice-config.c: libvirt gobject integration + * libvirt-gconfig-node-device.h: libvirt node device configuration * * Copyright (C) 2010 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-object-private.h b/libvirt-gconfig/libvirt-gconfig-object-private.h index c564ac5..9b75d2d 100644 --- a/libvirt-gconfig/libvirt-gconfig-object-private.h +++ b/libvirt-gconfig/libvirt-gconfig-object-private.h @@ -1,5 +1,5 @@ /* - * libvirt-gconfig-config-object-private.h: base object for XML configuration + * libvirt-gconfig-object-private.h: base object for XML configuration * * Copyright (C) 2011 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-object.c b/libvirt-gconfig/libvirt-gconfig-object.c index f642059..03c7d5a 100644 --- a/libvirt-gconfig/libvirt-gconfig-object.c +++ b/libvirt-gconfig/libvirt-gconfig-object.c @@ -1,5 +1,5 @@ /* - * libvirt-gconfig-config-object.c: base object for XML configuration + * libvirt-gconfig-object.c: base object for XML configuration * * Copyright (C) 2008 Daniel P. Berrange * Copyright (C) 2010 Red Hat diff --git a/libvirt-gconfig/libvirt-gconfig-object.h b/libvirt-gconfig/libvirt-gconfig-object.h index ef87668..ce91fa6 100644 --- a/libvirt-gconfig/libvirt-gconfig-object.h +++ b/libvirt-gconfig/libvirt-gconfig-object.h @@ -1,5 +1,5 @@ /* - * libvirt-gconfig-config-object.c: base object for XML configuration + * libvirt-gconfig-object.h: base object for XML configuration * * Copyright (C) 2010 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-secret.c b/libvirt-gconfig/libvirt-gconfig-secret.c index 15aca6b..801c7a6 100644 --- a/libvirt-gconfig/libvirt-gconfig-secret.c +++ b/libvirt-gconfig/libvirt-gconfig-secret.c @@ -1,5 +1,5 @@ /* - * libvirt-gobject-config_secret.c: libvirt glib integration + * libvirt-gconfig-secret.c: libvirt secret configuration * * Copyright (C) 2008 Daniel P. Berrange * Copyright (C) 2010 Red Hat diff --git a/libvirt-gconfig/libvirt-gconfig-secret.h b/libvirt-gconfig/libvirt-gconfig-secret.h index 72d67af..2661717 100644 --- a/libvirt-gconfig/libvirt-gconfig-secret.h +++ b/libvirt-gconfig/libvirt-gconfig-secret.h @@ -1,5 +1,5 @@ /* - * libvirt-gobject-secret-config.c: libvirt gobject integration + * libvirt-gconfig-secret.h: libvirt secret configuration * * Copyright (C) 2010 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-storage-pool.c b/libvirt-gconfig/libvirt-gconfig-storage-pool.c index 3c7e141..c3abb3c 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-pool.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-pool.c @@ -1,5 +1,5 @@ /* - * libvirt-gconfig-storage-pool.c: libvirt glib integration + * libvirt-gconfig-storage-pool.c: libvirt storage pool configuration * * Copyright (C) 2008 Daniel P. Berrange * Copyright (C) 2010 Red Hat diff --git a/libvirt-gconfig/libvirt-gconfig-storage-pool.h b/libvirt-gconfig/libvirt-gconfig-storage-pool.h index ab7aa4d..f91260b 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-pool.h +++ b/libvirt-gconfig/libvirt-gconfig-storage-pool.h @@ -1,5 +1,5 @@ /* - * libvirt-gobject-storage-pool-config.c: libvirt gobject integration + * libvirt-gconfig-storage-pool.h: libvirt storage pool configuration * * Copyright (C) 2010 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-storage-vol.c b/libvirt-gconfig/libvirt-gconfig-storage-vol.c index 64cdc7a..6e6f8d2 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-vol.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-vol.c @@ -1,5 +1,5 @@ /* - * libvirt-gobject-config_storage_vol.c: libvirt glib integration + * libvirt-gconfig-storage-vol.c: libvirt storage vol configuration * * Copyright (C) 2008 Daniel P. Berrange * Copyright (C) 2010 Red Hat diff --git a/libvirt-gconfig/libvirt-gconfig-storage-vol.h b/libvirt-gconfig/libvirt-gconfig-storage-vol.h index 8728a22..5c99c9a 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-vol.h +++ b/libvirt-gconfig/libvirt-gconfig-storage-vol.h @@ -1,5 +1,5 @@ /* - * libvirt-gobject-storage_vol-config.c: libvirt gobject integration + * libvirt-gconfig-storage-vol.c: libvirt storage volume configuration * * Copyright (C) 2010 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-xml-doc.c b/libvirt-gconfig/libvirt-gconfig-xml-doc.c index f513784..24d681b 100644 --- a/libvirt-gconfig/libvirt-gconfig-xml-doc.c +++ b/libvirt-gconfig/libvirt-gconfig-xml-doc.c @@ -1,5 +1,5 @@ /* - * libvirt-gobject-config-xml-node.c: libvirt glib integration + * libvirt-gconfig-xml-doc.c: libvirt XML document management * * Copyright (C) 2011 Red Hat * diff --git a/libvirt-gconfig/libvirt-gconfig-xml-doc.h b/libvirt-gconfig/libvirt-gconfig-xml-doc.h index 079de1e..b347da6 100644 --- a/libvirt-gconfig/libvirt-gconfig-xml-doc.h +++ b/libvirt-gconfig/libvirt-gconfig-xml-doc.h @@ -1,5 +1,5 @@ /* - * libvirt-gobject-xml-doc.h: libvirt gobject integration + * libvirt-gobject-xml-doc.h: libvirt XML document management * * Copyright (C) 2011 Red Hat * -- 1.7.6.4
ACK series with the minor addition mentioned in gvir_config_domain_add_device Christophe On Thu, Dec 01, 2011 at 11:00:57AM +0000, Daniel P. Berrange wrote:
An update to:
https://www.redhat.com/archives/libvir-list/2011-November/msg01812.html
New in v2:
- All Christophe's comments included - Cleanup include headers - Fix file descriptions
-- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
participants (2)
-
Christophe Fergeau -
Daniel P. Berrange