On 04/02/2010 09:22 AM, Matthias Bolte wrote:
2010/4/2 Chris Lalancette <clalance(a)redhat.com>:
> Signed-off-by: Chris Lalancette <clalance(a)redhat.com>
> ---
> src/conf/domain_conf.c | 14 +++++++-------
> src/conf/domain_conf.h | 8 --------
> 2 files changed, 7 insertions(+), 15 deletions(-)
>
> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
> index 0ad2e4a..e260dce 100644
> --- a/src/conf/domain_conf.c
> +++ b/src/conf/domain_conf.c
> @@ -6080,13 +6080,13 @@ cleanup:
> }
>
>
> -virDomainObjPtr virDomainLoadConfig(virCapsPtr caps,
> - virDomainObjListPtr doms,
> - const char *configDir,
> - const char *autostartDir,
> - const char *name,
> - virDomainLoadConfigNotify notify,
> - void *opaque)
> +static virDomainObjPtr virDomainLoadConfig(virCapsPtr caps,
> + virDomainObjListPtr doms,
> + const char *configDir,
> + const char *autostartDir,
> + const char *name,
> + virDomainLoadConfigNotify notify,
> + void *opaque)
> {
> char *configFile = NULL, *autostartLink = NULL;
> virDomainDefPtr def = NULL;
> diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
> index fdc6d44..023196f 100644
> --- a/src/conf/domain_conf.h
> +++ b/src/conf/domain_conf.h
> @@ -950,14 +950,6 @@ typedef void (*virDomainLoadConfigNotify)(virDomainObjPtr dom,
> int newDomain,
> void *opaque);
>
> -virDomainObjPtr virDomainLoadConfig(virCapsPtr caps,
> - virDomainObjListPtr doms,
> - const char *configDir,
> - const char *autostartDir,
> - const char *name,
> - virDomainLoadConfigNotify notify,
> - void *opaque);
> -
> int virDomainLoadAllConfigs(virCapsPtr caps,
> virDomainObjListPtr doms,
> const char *configDir,
> --
> 1.6.6.1
>
ACK.
Thanks. Since this is just an unrelated bugfix, I pushed it.
--
Chris Lalancette