On Mon, Aug 01, 2016 at 11:52:38PM +0300, Visarion Alexandru wrote: > From: Visarion Alexandru <viorel.visarion@xxxxxxxxx> > > This is needed to be able to change the address a graphics > device is listening on. > --- > libvirt-gconfig/Makefile.am | 2 + > ...ibvirt-gconfig-domain-graphics-listen-address.c | 79 ++++++++++++++++++++++ > ...ibvirt-gconfig-domain-graphics-listen-address.h | 67 ++++++++++++++++++ > libvirt-gconfig/libvirt-gconfig.h | 1 + > libvirt-gconfig/libvirt-gconfig.sym | 3 + > 5 files changed, 152 insertions(+) > create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-graphics-listen-address.c > create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-graphics-listen-address.h > > diff --git a/libvirt-gconfig/Makefile.am b/libvirt-gconfig/Makefile.am > index 27c6df1..6be860b 100644 > --- a/libvirt-gconfig/Makefile.am > +++ b/libvirt-gconfig/Makefile.am > @@ -46,6 +46,7 @@ GCONFIG_HEADER_FILES = \ > libvirt-gconfig-domain-filesys.h \ > libvirt-gconfig-domain-graphics.h \ > libvirt-gconfig-domain-graphics-listen.h\ > + libvirt-gconfig-domain-graphics-listen-address.h\ > libvirt-gconfig-domain-graphics-desktop.h \ > libvirt-gconfig-domain-graphics-rdp.h \ > libvirt-gconfig-domain-graphics-sdl.h \ > @@ -140,6 +141,7 @@ GCONFIG_SOURCE_FILES = \ > libvirt-gconfig-domain-filesys.c \ > libvirt-gconfig-domain-graphics.c \ > libvirt-gconfig-domain-graphics-listen.c\ > + libvirt-gconfig-domain-graphics-listen-address.c\ > libvirt-gconfig-domain-graphics-desktop.c \ > libvirt-gconfig-domain-graphics-rdp.c \ > libvirt-gconfig-domain-graphics-sdl.c \ > diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-listen-address.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics-listen-address.c > new file mode 100644 > index 0000000..460ca23 > --- /dev/null > +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-listen-address.c > @@ -0,0 +1,79 @@ > +/* > + * libvirt-gconfig-domain-graphics-listen-address.c: libvirt domain graphics listen address configuration > + * > + * Copyright (C) 2016 Red Hat, Inc. Same comment about the copyright, this should contain your name. > + * > + * 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, see > + * <http://www.gnu.org/licenses/>. > + * > + * Author: Visarion Alexandru <viorel.visarion@xxxxxxxxx> > + */ > + > +#include <config.h> > + > +#include "libvirt-gconfig/libvirt-gconfig.h" > +#include "libvirt-gconfig/libvirt-gconfig-private.h" > + > +#define GVIR_CONFIG_DOMAIN_GRAPHICS_LISTEN_ADDRESS_GET_PRIVATE(obj) \ > + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS_LISTEN_ADDRESS, GVirConfigDomainGraphicsListenAddressPrivate)) > + > +struct _GVirConfigDomainGraphicsListenAddressPrivate > +{ > + gboolean unused; > +}; > + > +G_DEFINE_TYPE(GVirConfigDomainGraphicsListenAddress, gvir_config_domain_graphics_listen_address, GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS_LISTEN); > + > + > +static void gvir_config_domain_graphics_listen_address_class_init(GVirConfigDomainGraphicsListenAddressClass *klass) > +{ > + g_type_class_add_private(klass, sizeof(GVirConfigDomainGraphicsListenAddressPrivate)); > +} > + > + > +static void gvir_config_domain_graphics_listen_address_init(GVirConfigDomainGraphicsListenAddress *address) > +{ > + address->priv = GVIR_CONFIG_DOMAIN_GRAPHICS_LISTEN_ADDRESS_GET_PRIVATE(address); > +} > + > + > +GVirConfigDomainGraphicsListenAddress *gvir_config_domain_graphics_listen_address_new(const char *address) > +{ > + GVirConfigObject *object; > + > + object = gvir_config_object_new(GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS_LISTEN_ADDRESS, "listen", NULL); > + gvir_config_object_set_attribute(object, > + "type", "address", > + NULL); > + gvir_config_object_set_attribute(object, > + "address", address, > + NULL); > + > + return GVIR_CONFIG_DOMAIN_GRAPHICS_LISTEN_ADDRESS(object); > +} Couple of comments here: all other libvirt-gconfig _new() functions don't take arguments, ie gvir_config_domain_graphics_listen_address_new(void); Here it might be good to be consistent. I'd add gvir_config_domain_graphics_listen_address_set_address() regardless of whether you change the prototype or not. Imo we should also accept a GInetAddress (maybe it should be the main way of setting this, with the _string version being a convenience helper). > + > + > +GVirConfigDomainGraphicsListenAddress *gvir_config_domain_graphics_listen_address_new_from_xml(const gchar *xml, > + GError **error) > +{ > + GVirConfigObject *object; > + > + object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS_LISTEN_ADDRESS, > + "listen", NULL, xml, error); > + if (g_strcmp0(gvir_config_object_get_attribute(object, NULL, "type"), "address") != 0) { > + g_object_unref(G_OBJECT(object)); > + g_return_val_if_reached(NULL); > + } > + return GVIR_CONFIG_DOMAIN_GRAPHICS_LISTEN_ADDRESS(object); > +} > diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-listen-address.h b/libvirt-gconfig/libvirt-gconfig-domain-graphics-listen-address.h > new file mode 100644 > index 0000000..a11beb2 > --- /dev/null > +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-listen-address.h > @@ -0,0 +1,67 @@ > +/* > + * libvirt-gconfig-domain-graphics-listen-address.h: libvirt domain graphics listen address configuration > + * > + * Copyright (C) 2016 Red Hat, Inc. > + * > + * 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, see > + * <http://www.gnu.org/licenses/>. > + * > + * Author: Visarion Alexandru <viorel.visarion@xxxxxxxxx> > + */ > + > +#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_LISTEN_ADDRESS_H__ > +#define __LIBVIRT_GCONFIG_DOMAIN_GRAPHICS_LISTEN_ADDRESS_H__ > + > +G_BEGIN_DECLS > + > +#define GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS_LISTEN_ADDRESS (gvir_config_domain_graphics_listen_address_get_type ()) > +#define GVIR_CONFIG_DOMAIN_GRAPHICS_LISTEN_ADDRESS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS_LISTEN_ADDRESS, GVirConfigDomainGraphicsListenAddress)) > +#define GVIR_CONFIG_DOMAIN_GRAPHICS_LISTEN_ADDRESS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS_LISTEN_ADDRESS, GVirConfigDomainGraphicsListenAddressClass)) > +#define GVIR_CONFIG_IS_DOMAIN_GRAPHICS_LISTEN_ADDRESS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS_LISTEN_ADDRESS)) > +#define GVIR_CONFIG_IS_DOMAIN_GRAPHICS_LISTEN_ADDRESS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS_LISTEN_ADDRESS)) > +#define GVIR_CONFIG_DOMAIN_GRAPHICS_LISTEN_ADDRESS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS_LISTEN_ADDRESS, GVirConfigDomainGraphicsListenAddressClass)) > + > +typedef struct _GVirConfigDomainGraphicsListenAddress GVirConfigDomainGraphicsListenAddress; > +typedef struct _GVirConfigDomainGraphicsListenAddressPrivate GVirConfigDomainGraphicsListenAddressPrivate; > +typedef struct _GVirConfigDomainGraphicsListenAddressClass GVirConfigDomainGraphicsListenAddressClass; > + > +struct _GVirConfigDomainGraphicsListenAddress > +{ > + GVirConfigDomainGraphicsListen parent; > + > + GVirConfigDomainGraphicsListenAddressPrivate *priv; > + > + /* Do not add fields to this struct */ > +}; > + > +struct _GVirConfigDomainGraphicsListenAddressClass > +{ > + GVirConfigDomainGraphicsListenClass parent_class; > + > + gpointer padding[20]; > +}; > + > + > +GType gvir_config_domain_graphics_listen_address_get_type(void); > + > +GVirConfigDomainGraphicsListenAddress *gvir_config_domain_graphics_listen_address_new(const char *address); > +GVirConfigDomainGraphicsListenAddress *gvir_config_domain_graphics_listen_address_new_from_xml(const gchar *xml, > + GError **error); > +G_END_DECLS > + > +#endif /* __LIBVIRT_GCONFIG_DOMAIN_GRAPHICS_LISTEN_ADDRESS_H__ */ > diff --git a/libvirt-gconfig/libvirt-gconfig.h b/libvirt-gconfig/libvirt-gconfig.h > index ecf1322..a25c44b 100644 > --- a/libvirt-gconfig/libvirt-gconfig.h > +++ b/libvirt-gconfig/libvirt-gconfig.h > @@ -63,6 +63,7 @@ > #include <libvirt-gconfig/libvirt-gconfig-domain-filesys.h> > #include <libvirt-gconfig/libvirt-gconfig-domain-graphics.h> > #include <libvirt-gconfig/libvirt-gconfig-domain-graphics-listen.h> > +#include <libvirt-gconfig/libvirt-gconfig-domain-graphics-listen-address.h> > #include <libvirt-gconfig/libvirt-gconfig-domain-graphics-desktop.h> > #include <libvirt-gconfig/libvirt-gconfig-domain-graphics-rdp.h> > #include <libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.h> > diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym > index b112399..fab6059 100644 > --- a/libvirt-gconfig/libvirt-gconfig.sym > +++ b/libvirt-gconfig/libvirt-gconfig.sym > @@ -765,6 +765,9 @@ global: > gvir_config_domain_video_get_model; > gvir_config_domain_video_set_accel3d; > gvir_config_domain_graphics_listen_get_type; > + gvir_config_domain_graphics_listen_address_get_type; > + gvir_config_domain_graphics_listen_address_new; > + gvir_config_domain_graphics_listen_address_new_from_xml; This also needs to be alphabetically ordered. Christophe
Attachment:
signature.asc
Description: PGP signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list