[libvirt] [PATCHv3 02/27] fix fallout in src/conf/
Daniel P. Berrange
berrange at redhat.com
Tue Mar 12 12:09:16 UTC 2013
On Mon, Mar 11, 2013 at 04:06:13PM +0100, Peter Krempa wrote:
> ---
> src/conf/domain_conf.c | 104 +++++++++++++++++++++++++++++------------------
> src/conf/domain_conf.h | 20 ++++++---
> src/conf/snapshot_conf.c | 3 +-
> src/conf/snapshot_conf.h | 1 +
> src/libvirt_private.syms | 2 +
> 5 files changed, 83 insertions(+), 47 deletions(-)
>
> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
> index 5bec673..127629f 100644
> --- a/src/conf/domain_conf.c
> +++ b/src/conf/domain_conf.c
> @@ -800,7 +800,7 @@ virDomainXMLConfNew(virDomainXMLPrivateDataCallbacksPtr priv,
> * Returns a pointer to the stored namespace structure.
> * The lifetime of the pointer is equal to @xmlconf;
> */
> -virDomainXMLNamespacePtr
> +virDomainXMLNamespacePtr ATTRIBUTE_NONNULL(1)
Any ATTRIBUTE_XXXX statement should be against the function *declaration*
in the header, not the implementation, unless it is a static function.
> virDomainXMLConfGetNamespace(virDomainXMLConfPtr xmlconf)
> {
> return &xmlconf->ns;
> @@ -1915,8 +1915,8 @@ static void virDomainObjDispose(void *obj)
> virDomainSnapshotObjListFree(dom->snapshots);
> }
>
> -
> -virDomainObjPtr virDomainObjNew(virCapsPtr caps)
> +virDomainObjPtr ATTRIBUTE_NONNULL(1)
Likewise
> diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
> index 599b71e..c9995d7 100644
> --- a/src/libvirt_private.syms
> +++ b/src/libvirt_private.syms
> @@ -342,6 +342,8 @@ virDomainWatchdogActionTypeFromString;
> virDomainWatchdogActionTypeToString;
> virDomainWatchdogModelTypeFromString;
> virDomainWatchdogModelTypeToString;
> +virDomainXMLConfGetNamespace;
> +virDomainXMLConfNew;
These functions were added in the previous patch
Daniel
--
|: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
More information about the libvir-list
mailing list