Hi, I was a bit too hasty in sending this, while the series is fine as is, I have made a few improvements to it, so I'll send a v2. Changes that will be in it: - handle 'sound' nodes - ignore blank xml nodes in get_devices to avoid not so useful warnings
Christophe On Tue, Jan 03, 2012 at 02:11:20PM +0400, Christophe Fergeau wrote: > This header groups all libvirt-gconfig private headers. > --- > libvirt-gconfig/Makefile.am | 1 + > .../libvirt-gconfig-domain-chardev-source-pty.c | 2 +- > libvirt-gconfig/libvirt-gconfig-domain-chardev.c | 2 +- > libvirt-gconfig/libvirt-gconfig-domain-clock.c | 3 +- > libvirt-gconfig/libvirt-gconfig-domain-device.c | 1 + > libvirt-gconfig/libvirt-gconfig-domain-disk.c | 3 +- > libvirt-gconfig/libvirt-gconfig-domain-filesys.c | 3 +- > .../libvirt-gconfig-domain-graphics-sdl.c | 3 +- > .../libvirt-gconfig-domain-graphics-spice.c | 3 +- > .../libvirt-gconfig-domain-graphics-vnc.c | 3 +- > libvirt-gconfig/libvirt-gconfig-domain-input.c | 3 +- > .../libvirt-gconfig-domain-interface-network.c | 3 +- > .../libvirt-gconfig-domain-interface-user.c | 3 +- > libvirt-gconfig/libvirt-gconfig-domain-interface.c | 2 +- > .../libvirt-gconfig-domain-memballoon.c | 3 +- > libvirt-gconfig/libvirt-gconfig-domain-os.c | 3 +- > libvirt-gconfig/libvirt-gconfig-domain-seclabel.c | 3 +- > libvirt-gconfig/libvirt-gconfig-domain-sound.c | 2 +- > libvirt-gconfig/libvirt-gconfig-domain-video.c | 3 +- > libvirt-gconfig/libvirt-gconfig-domain.c | 3 +- > libvirt-gconfig/libvirt-gconfig-object.c | 4 +-- > libvirt-gconfig/libvirt-gconfig-private.h | 30 > ++++++++++++++++++++ > .../libvirt-gconfig-storage-permissions.c | 2 +- > .../libvirt-gconfig-storage-pool-source.c | 2 +- > .../libvirt-gconfig-storage-pool-target.c | 2 +- > libvirt-gconfig/libvirt-gconfig-storage-pool.c | 2 +- > .../libvirt-gconfig-storage-vol-backing-store.c | 2 +- > .../libvirt-gconfig-storage-vol-target.c | 2 +- > libvirt-gconfig/libvirt-gconfig-storage-vol.c | 2 +- > 29 files changed, 58 insertions(+), 42 deletions(-) > create mode 100644 libvirt-gconfig/libvirt-gconfig-private.h > > diff --git a/libvirt-gconfig/Makefile.am b/libvirt-gconfig/Makefile.am > index 6342431..d9eb25a 100644 > --- a/libvirt-gconfig/Makefile.am > +++ b/libvirt-gconfig/Makefile.am > @@ -51,6 +51,7 @@ GCONFIG_HEADER_FILES = \ > libvirt-gconfig-storage-vol-backing-store.h \ > libvirt-gconfig-storage-vol-target.h > noinst_HEADERS = \ > + libvirt-gconfig-private.h \ > libvirt-gconfig-helpers-private.h \ > libvirt-gconfig-object-private.h \ > libvirt-gconfig-xml-doc.h > diff --git a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-pty.c > b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-pty.c > index 1965444..e3c4c25 100644 > --- a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-pty.c > +++ b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-pty.c > @@ -23,7 +23,7 @@ > #include <config.h> > > #include "libvirt-gconfig/libvirt-gconfig.h" > -#include "libvirt-gconfig/libvirt-gconfig-object-private.h" > +#include "libvirt-gconfig/libvirt-gconfig-private.h" > > #define GVIR_CONFIG_DOMAIN_CHARDEV_SOURCE_PTY_GET_PRIVATE(obj) > \ > (G_TYPE_INSTANCE_GET_PRIVATE((obj), > GVIR_TYPE_CONFIG_DOMAIN_CHARDEV_SOURCE_PTY, > GVirConfigDomainChardevSourcePtyPrivate)) > diff --git a/libvirt-gconfig/libvirt-gconfig-domain-chardev.c > b/libvirt-gconfig/libvirt-gconfig-domain-chardev.c > index 1359f8f..620773c 100644 > --- a/libvirt-gconfig/libvirt-gconfig-domain-chardev.c > +++ b/libvirt-gconfig/libvirt-gconfig-domain-chardev.c > @@ -23,7 +23,7 @@ > #include <config.h> > > #include "libvirt-gconfig/libvirt-gconfig.h" > -#include "libvirt-gconfig/libvirt-gconfig-object-private.h" > +#include "libvirt-gconfig/libvirt-gconfig-private.h" > > #define GVIR_CONFIG_DOMAIN_CHARDEV_GET_PRIVATE(obj) \ > (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN_CHARDEV, > GVirConfigDomainChardevPrivate)) > diff --git a/libvirt-gconfig/libvirt-gconfig-domain-clock.c > b/libvirt-gconfig/libvirt-gconfig-domain-clock.c > index 16d75d5..3cb8ffb 100644 > --- a/libvirt-gconfig/libvirt-gconfig-domain-clock.c > +++ b/libvirt-gconfig/libvirt-gconfig-domain-clock.c > @@ -23,8 +23,7 @@ > #include <config.h> > > #include "libvirt-gconfig/libvirt-gconfig.h" > -#include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" > -#include "libvirt-gconfig/libvirt-gconfig-object-private.h" > +#include "libvirt-gconfig/libvirt-gconfig-private.h" > > #define GVIR_CONFIG_DOMAIN_CLOCK_GET_PRIVATE(obj) \ > (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN_CLOCK, > GVirConfigDomainClockPrivate)) > diff --git a/libvirt-gconfig/libvirt-gconfig-domain-device.c > b/libvirt-gconfig/libvirt-gconfig-domain-device.c > index 980ae70..8fcf60f 100644 > --- a/libvirt-gconfig/libvirt-gconfig-domain-device.c > +++ b/libvirt-gconfig/libvirt-gconfig-domain-device.c > @@ -23,6 +23,7 @@ > #include <config.h> > > #include "libvirt-gconfig/libvirt-gconfig.h" > +#include "libvirt-gconfig/libvirt-gconfig-private.h" > > #define GVIR_CONFIG_DOMAIN_DEVICE_GET_PRIVATE(obj) \ > (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN_DEVICE, > GVirConfigDomainDevicePrivate)) > diff --git a/libvirt-gconfig/libvirt-gconfig-domain-disk.c > b/libvirt-gconfig/libvirt-gconfig-domain-disk.c > index 18cdb1c..1f60213 100644 > --- a/libvirt-gconfig/libvirt-gconfig-domain-disk.c > +++ b/libvirt-gconfig/libvirt-gconfig-domain-disk.c > @@ -23,8 +23,7 @@ > #include <config.h> > > #include "libvirt-gconfig/libvirt-gconfig.h" > -#include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" > -#include "libvirt-gconfig/libvirt-gconfig-object-private.h" > +#include "libvirt-gconfig/libvirt-gconfig-private.h" > > #define GVIR_CONFIG_DOMAIN_DISK_GET_PRIVATE(obj) \ > (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN_DISK, > GVirConfigDomainDiskPrivate)) > diff --git a/libvirt-gconfig/libvirt-gconfig-domain-filesys.c > b/libvirt-gconfig/libvirt-gconfig-domain-filesys.c > index 6c3aa9d..ef942f8 100644 > --- a/libvirt-gconfig/libvirt-gconfig-domain-filesys.c > +++ b/libvirt-gconfig/libvirt-gconfig-domain-filesys.c > @@ -23,8 +23,7 @@ > #include <config.h> > > #include "libvirt-gconfig/libvirt-gconfig.h" > -#include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" > -#include "libvirt-gconfig/libvirt-gconfig-object-private.h" > +#include "libvirt-gconfig/libvirt-gconfig-private.h" > > #define GVIR_CONFIG_DOMAIN_FILESYS_GET_PRIVATE(obj) \ > (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN_FILESYS, > GVirConfigDomainFilesysPrivate)) > diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c > b/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c > index c60e72b..1e33a1b 100644 > --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c > +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c > @@ -23,8 +23,7 @@ > #include <config.h> > > #include "libvirt-gconfig/libvirt-gconfig.h" > -#include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" > -#include "libvirt-gconfig/libvirt-gconfig-object-private.h" > +#include "libvirt-gconfig/libvirt-gconfig-private.h" > > #define GVIR_CONFIG_DOMAIN_GRAPHICS_SDL_GET_PRIVATE(obj) > \ > (G_TYPE_INSTANCE_GET_PRIVATE((obj), > GVIR_TYPE_CONFIG_DOMAIN_GRAPHICS_SDL, GVirConfigDomainGraphicsSdlPrivate)) > diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c > b/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c > index 321b914..7aa3e2c 100644 > --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c > +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c > @@ -23,8 +23,7 @@ > #include <config.h> > > #include "libvirt-gconfig/libvirt-gconfig.h" > -#include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" > -#include "libvirt-gconfig/libvirt-gconfig-object-private.h" > +#include "libvirt-gconfig/libvirt-gconfig-private.h" > > #define GVIR_CONFIG_DOMAIN_GRAPHICS_SPICE_GET_PRIVATE(obj) > \ > (G_TYPE_INSTANCE_GET_PRIVATE((obj), > GVIR_TYPE_CONFIG_DOMAIN_GRAPHICS_SPICE, GVirConfigDomainGraphicsSpicePrivate)) > diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c > b/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c > index f7fd6db..b00a155 100644 > --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c > +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c > @@ -23,8 +23,7 @@ > #include <config.h> > > #include "libvirt-gconfig/libvirt-gconfig.h" > -#include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" > -#include "libvirt-gconfig/libvirt-gconfig-object-private.h" > +#include "libvirt-gconfig/libvirt-gconfig-private.h" > > #define GVIR_CONFIG_DOMAIN_GRAPHICS_VNC_GET_PRIVATE(obj) > \ > (G_TYPE_INSTANCE_GET_PRIVATE((obj), > GVIR_TYPE_CONFIG_DOMAIN_GRAPHICS_VNC, GVirConfigDomainGraphicsVncPrivate)) > diff --git a/libvirt-gconfig/libvirt-gconfig-domain-input.c > b/libvirt-gconfig/libvirt-gconfig-domain-input.c > index 5bc70c8..bacc693 100644 > --- a/libvirt-gconfig/libvirt-gconfig-domain-input.c > +++ b/libvirt-gconfig/libvirt-gconfig-domain-input.c > @@ -23,8 +23,7 @@ > #include <config.h> > > #include "libvirt-gconfig/libvirt-gconfig.h" > -#include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" > -#include "libvirt-gconfig/libvirt-gconfig-object-private.h" > +#include "libvirt-gconfig/libvirt-gconfig-private.h" > > #define GVIR_CONFIG_DOMAIN_INPUT_GET_PRIVATE(obj) \ > (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN_INPUT, > GVirConfigDomainInputPrivate)) > diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c > b/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c > index becddc8..6f24708 100644 > --- a/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c > +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c > @@ -25,8 +25,7 @@ > #include <config.h> > > #include "libvirt-gconfig/libvirt-gconfig.h" > -#include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" > -#include "libvirt-gconfig/libvirt-gconfig-object-private.h" > +#include "libvirt-gconfig/libvirt-gconfig-private.h" > > #define GVIR_CONFIG_DOMAIN_INTERFACE_NETWORK_GET_PRIVATE(obj) > \ > (G_TYPE_INSTANCE_GET_PRIVATE((obj), > GVIR_TYPE_CONFIG_DOMAIN_INTERFACE_NETWORK, > GVirConfigDomainInterfaceNetworkPrivate)) > diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-user.c > b/libvirt-gconfig/libvirt-gconfig-domain-interface-user.c > index 2c03af2..25770e0 100644 > --- a/libvirt-gconfig/libvirt-gconfig-domain-interface-user.c > +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-user.c > @@ -25,8 +25,7 @@ > #include <config.h> > > #include "libvirt-gconfig/libvirt-gconfig.h" > -#include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" > -#include "libvirt-gconfig/libvirt-gconfig-object-private.h" > +#include "libvirt-gconfig/libvirt-gconfig-private.h" > > #define GVIR_CONFIG_DOMAIN_INTERFACE_USER_GET_PRIVATE(obj) > \ > (G_TYPE_INSTANCE_GET_PRIVATE((obj), > GVIR_TYPE_CONFIG_DOMAIN_INTERFACE_USER, GVirConfigDomainInterfaceUserPrivate)) > diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface.c > b/libvirt-gconfig/libvirt-gconfig-domain-interface.c > index 834ce5d..2d87040 100644 > --- a/libvirt-gconfig/libvirt-gconfig-domain-interface.c > +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface.c > @@ -25,7 +25,7 @@ > #include <config.h> > > #include "libvirt-gconfig/libvirt-gconfig.h" > -#include "libvirt-gconfig/libvirt-gconfig-object-private.h" > +#include "libvirt-gconfig/libvirt-gconfig-private.h" > > #define GVIR_CONFIG_DOMAIN_INTERFACE_GET_PRIVATE(obj) > \ > (G_TYPE_INSTANCE_GET_PRIVATE((obj), > GVIR_TYPE_CONFIG_DOMAIN_INTERFACE, GVirConfigDomainInterfacePrivate)) > diff --git a/libvirt-gconfig/libvirt-gconfig-domain-memballoon.c > b/libvirt-gconfig/libvirt-gconfig-domain-memballoon.c > index ca74a72..9df7e52 100644 > --- a/libvirt-gconfig/libvirt-gconfig-domain-memballoon.c > +++ b/libvirt-gconfig/libvirt-gconfig-domain-memballoon.c > @@ -23,8 +23,7 @@ > #include <config.h> > > #include "libvirt-gconfig/libvirt-gconfig.h" > -#include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" > -#include "libvirt-gconfig/libvirt-gconfig-object-private.h" > +#include "libvirt-gconfig/libvirt-gconfig-private.h" > > #define GVIR_CONFIG_DOMAIN_MEMBALLOON_GET_PRIVATE(obj) > \ > (G_TYPE_INSTANCE_GET_PRIVATE((obj), > GVIR_TYPE_CONFIG_DOMAIN_MEMBALLOON, GVirConfigDomainMemballoonPrivate)) > diff --git a/libvirt-gconfig/libvirt-gconfig-domain-os.c > b/libvirt-gconfig/libvirt-gconfig-domain-os.c > index 2b0cdff..6818abf 100644 > --- a/libvirt-gconfig/libvirt-gconfig-domain-os.c > +++ b/libvirt-gconfig/libvirt-gconfig-domain-os.c > @@ -23,8 +23,7 @@ > #include <config.h> > > #include "libvirt-gconfig/libvirt-gconfig.h" > -#include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" > -#include "libvirt-gconfig/libvirt-gconfig-object-private.h" > +#include "libvirt-gconfig/libvirt-gconfig-private.h" > > #define GVIR_CONFIG_DOMAIN_OS_GET_PRIVATE(obj) \ > (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN_OS, > GVirConfigDomainOsPrivate)) > diff --git a/libvirt-gconfig/libvirt-gconfig-domain-seclabel.c > b/libvirt-gconfig/libvirt-gconfig-domain-seclabel.c > index 7537a78..2d69c6f 100644 > --- a/libvirt-gconfig/libvirt-gconfig-domain-seclabel.c > +++ b/libvirt-gconfig/libvirt-gconfig-domain-seclabel.c > @@ -23,8 +23,7 @@ > #include <config.h> > > #include "libvirt-gconfig/libvirt-gconfig.h" > -#include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" > -#include "libvirt-gconfig/libvirt-gconfig-object-private.h" > +#include "libvirt-gconfig/libvirt-gconfig-private.h" > > #define GVIR_CONFIG_DOMAIN_SECLABEL_GET_PRIVATE(obj) > \ > (G_TYPE_INSTANCE_GET_PRIVATE((obj), > GVIR_TYPE_CONFIG_DOMAIN_SECLABEL, GVirConfigDomainSeclabelPrivate)) > diff --git a/libvirt-gconfig/libvirt-gconfig-domain-sound.c > b/libvirt-gconfig/libvirt-gconfig-domain-sound.c > index 56149ca..abf9a14 100644 > --- a/libvirt-gconfig/libvirt-gconfig-domain-sound.c > +++ b/libvirt-gconfig/libvirt-gconfig-domain-sound.c > @@ -23,7 +23,7 @@ > #include <config.h> > > #include "libvirt-gconfig/libvirt-gconfig.h" > -#include "libvirt-gconfig/libvirt-gconfig-object-private.h" > +#include "libvirt-gconfig/libvirt-gconfig-private.h" > > #define GVIR_CONFIG_DOMAIN_SOUND_GET_PRIVATE(obj) \ > (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN_SOUND, > GVirConfigDomainSoundPrivate)) > diff --git a/libvirt-gconfig/libvirt-gconfig-domain-video.c > b/libvirt-gconfig/libvirt-gconfig-domain-video.c > index bba8073..90c71da 100644 > --- a/libvirt-gconfig/libvirt-gconfig-domain-video.c > +++ b/libvirt-gconfig/libvirt-gconfig-domain-video.c > @@ -23,8 +23,7 @@ > #include <config.h> > > #include "libvirt-gconfig/libvirt-gconfig.h" > -#include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" > -#include "libvirt-gconfig/libvirt-gconfig-object-private.h" > +#include "libvirt-gconfig/libvirt-gconfig-private.h" > > #define GVIR_CONFIG_DOMAIN_VIDEO_GET_PRIVATE(obj) \ > (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN_VIDEO, > GVirConfigDomainVideoPrivate)) > diff --git a/libvirt-gconfig/libvirt-gconfig-domain.c > b/libvirt-gconfig/libvirt-gconfig-domain.c > index c5df963..ed48d57 100644 > --- a/libvirt-gconfig/libvirt-gconfig-domain.c > +++ b/libvirt-gconfig/libvirt-gconfig-domain.c > @@ -24,8 +24,7 @@ > #include <config.h> > > #include "libvirt-gconfig/libvirt-gconfig.h" > -#include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" > -#include "libvirt-gconfig/libvirt-gconfig-object-private.h" > +#include "libvirt-gconfig/libvirt-gconfig-private.h" > > #define GVIR_CONFIG_DOMAIN_GET_PRIVATE(obj) \ > (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN, > GVirConfigDomainPrivate)) > diff --git a/libvirt-gconfig/libvirt-gconfig-object.c > b/libvirt-gconfig/libvirt-gconfig-object.c > index cf71264..ce6cd21 100644 > --- a/libvirt-gconfig/libvirt-gconfig-object.c > +++ b/libvirt-gconfig/libvirt-gconfig-object.c > @@ -28,9 +28,7 @@ > #include <libxml/relaxng.h> > > #include "libvirt-gconfig/libvirt-gconfig.h" > -#include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" > -#include "libvirt-gconfig/libvirt-gconfig-object-private.h" > -#include "libvirt-gconfig/libvirt-gconfig-xml-doc.h" > +#include "libvirt-gconfig/libvirt-gconfig-private.h" > > #define GVIR_CONFIG_OBJECT_GET_PRIVATE(obj) \ > (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_OBJECT, > GVirConfigObjectPrivate)) > diff --git a/libvirt-gconfig/libvirt-gconfig-private.h > b/libvirt-gconfig/libvirt-gconfig-private.h > new file mode 100644 > index 0000000..e985ebd > --- /dev/null > +++ b/libvirt-gconfig/libvirt-gconfig-private.h > @@ -0,0 +1,30 @@ > +/* > + * libvirt-gconfig-private.h: libvirt domain device configuration > + * > + * Copyright (C) 2011 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, write to the Free Software > + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > + * > + * Author: Christophe Fergeau <cferg...@gmail.com> > + */ > + > +#ifndef __LIBVIRT_GCONFIG_PRIVATE_H__ > +#define __LIBVIRT_GCONFIG_PRIVATE_H__ > + > +#include <libvirt-gconfig/libvirt-gconfig-helpers-private.h> > +#include <libvirt-gconfig/libvirt-gconfig-object-private.h> > +#include <libvirt-gconfig/libvirt-gconfig-xml-doc.h> > + > +#endif /* __LIBVIRT_GCONFIG_PRIVATE_H__ */ > diff --git a/libvirt-gconfig/libvirt-gconfig-storage-permissions.c > b/libvirt-gconfig/libvirt-gconfig-storage-permissions.c > index c5f9f49..49e28ac 100644 > --- a/libvirt-gconfig/libvirt-gconfig-storage-permissions.c > +++ b/libvirt-gconfig/libvirt-gconfig-storage-permissions.c > @@ -23,7 +23,7 @@ > #include <config.h> > > #include "libvirt-gconfig/libvirt-gconfig.h" > -#include "libvirt-gconfig/libvirt-gconfig-object-private.h" > +#include "libvirt-gconfig/libvirt-gconfig-private.h" > > #define GVIR_CONFIG_STORAGE_PERMISSIONS_GET_PRIVATE(obj) > \ > (G_TYPE_INSTANCE_GET_PRIVATE((obj), > GVIR_TYPE_CONFIG_STORAGE_PERMISSIONS, GVirConfigStoragePermissionsPrivate)) > diff --git a/libvirt-gconfig/libvirt-gconfig-storage-pool-source.c > b/libvirt-gconfig/libvirt-gconfig-storage-pool-source.c > index b2223a2..fafb755 100644 > --- a/libvirt-gconfig/libvirt-gconfig-storage-pool-source.c > +++ b/libvirt-gconfig/libvirt-gconfig-storage-pool-source.c > @@ -23,7 +23,7 @@ > #include <config.h> > > #include "libvirt-gconfig/libvirt-gconfig.h" > -#include "libvirt-gconfig/libvirt-gconfig-object-private.h" > +#include "libvirt-gconfig/libvirt-gconfig-private.h" > > > #define GVIR_CONFIG_STORAGE_POOL_SOURCE_GET_PRIVATE(obj) > \ > diff --git a/libvirt-gconfig/libvirt-gconfig-storage-pool-target.c > b/libvirt-gconfig/libvirt-gconfig-storage-pool-target.c > index a5af381..4ce5a12 100644 > --- a/libvirt-gconfig/libvirt-gconfig-storage-pool-target.c > +++ b/libvirt-gconfig/libvirt-gconfig-storage-pool-target.c > @@ -23,7 +23,7 @@ > #include <config.h> > > #include "libvirt-gconfig/libvirt-gconfig.h" > -#include "libvirt-gconfig/libvirt-gconfig-object-private.h" > +#include "libvirt-gconfig/libvirt-gconfig-private.h" > > > #define GVIR_CONFIG_STORAGE_POOL_TARGET_GET_PRIVATE(obj) > \ > diff --git a/libvirt-gconfig/libvirt-gconfig-storage-pool.c > b/libvirt-gconfig/libvirt-gconfig-storage-pool.c > index 95609bb..c22e160 100644 > --- a/libvirt-gconfig/libvirt-gconfig-storage-pool.c > +++ b/libvirt-gconfig/libvirt-gconfig-storage-pool.c > @@ -25,7 +25,7 @@ > #include <config.h> > > #include "libvirt-gconfig/libvirt-gconfig.h" > -#include "libvirt-gconfig/libvirt-gconfig-object-private.h" > +#include "libvirt-gconfig/libvirt-gconfig-private.h" > > #define GVIR_CONFIG_STORAGE_POOL_GET_PRIVATE(obj) \ > (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_STORAGE_POOL, > GVirConfigStoragePoolPrivate)) > diff --git a/libvirt-gconfig/libvirt-gconfig-storage-vol-backing-store.c > b/libvirt-gconfig/libvirt-gconfig-storage-vol-backing-store.c > index 2530ed3..1791ba0 100644 > --- a/libvirt-gconfig/libvirt-gconfig-storage-vol-backing-store.c > +++ b/libvirt-gconfig/libvirt-gconfig-storage-vol-backing-store.c > @@ -23,7 +23,7 @@ > #include <config.h> > > #include "libvirt-gconfig/libvirt-gconfig.h" > -#include "libvirt-gconfig/libvirt-gconfig-object-private.h" > +#include "libvirt-gconfig/libvirt-gconfig-private.h" > > > #define GVIR_CONFIG_STORAGE_VOL_BACKING_STORE_GET_PRIVATE(obj) > \ > diff --git a/libvirt-gconfig/libvirt-gconfig-storage-vol-target.c > b/libvirt-gconfig/libvirt-gconfig-storage-vol-target.c > index 6a3bb0c..373f684 100644 > --- a/libvirt-gconfig/libvirt-gconfig-storage-vol-target.c > +++ b/libvirt-gconfig/libvirt-gconfig-storage-vol-target.c > @@ -23,7 +23,7 @@ > #include <config.h> > > #include "libvirt-gconfig/libvirt-gconfig.h" > -#include "libvirt-gconfig/libvirt-gconfig-object-private.h" > +#include "libvirt-gconfig/libvirt-gconfig-private.h" > > > #define GVIR_CONFIG_STORAGE_VOL_TARGET_GET_PRIVATE(obj) > \ > diff --git a/libvirt-gconfig/libvirt-gconfig-storage-vol.c > b/libvirt-gconfig/libvirt-gconfig-storage-vol.c > index 079a5fd..1864447 100644 > --- a/libvirt-gconfig/libvirt-gconfig-storage-vol.c > +++ b/libvirt-gconfig/libvirt-gconfig-storage-vol.c > @@ -24,7 +24,7 @@ > #include <config.h> > > #include "libvirt-gconfig/libvirt-gconfig.h" > -#include "libvirt-gconfig/libvirt-gconfig-object-private.h" > +#include "libvirt-gconfig/libvirt-gconfig-private.h" > > > #define GVIR_CONFIG_STORAGE_VOL_GET_PRIVATE(obj) \ > -- > 1.7.7.5 > > -- > libvir-list mailing list > libvir-list@redhat.com > https://www.redhat.com/mailman/listinfo/libvir-list
pgpAroDgyLZuu.pgp
Description: PGP signature
-- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
