[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [PATCHv2 04/21] fix fallout in src/lxc



On 06.03.2013 16:37, Peter Krempa wrote:
> ---
>  src/Makefile.am          |  2 ++
>  src/lxc/lxc_conf.c       |  8 ++++++++
>  src/lxc/lxc_conf.h       |  2 ++
>  src/lxc/lxc_controller.c |  7 ++++++-
>  src/lxc/lxc_domain.c     | 13 ++++++-------
>  src/lxc/lxc_domain.h     |  2 +-
>  src/lxc/lxc_driver.c     | 43 ++++++++++++++++++++++++-------------------
>  src/lxc/lxc_process.c    |  9 +++++----
>  8 files changed, 54 insertions(+), 32 deletions(-)
> 
> diff --git a/src/Makefile.am b/src/Makefile.am
> index c1659a4..b615902 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -493,6 +493,8 @@ LXC_CONTROLLER_SOURCES =					\
>  		lxc/lxc_conf.c lxc/lxc_conf.h			\
>  		lxc/lxc_container.c lxc/lxc_container.h		\
>  		lxc/lxc_cgroup.c lxc/lxc_cgroup.h		\
> +		lxc/lxc_domain.c lxc/lxc_domain.h		\
> +		lxc/lxc_hostdev.c lxc/lxc_hostdev.h		\
>  		lxc/lxc_fuse.c lxc/lxc_fuse.h			\
>  		lxc/lxc_controller.c

This one looks spurious. At least lxc_hostdev.h

> 
> diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c
> index 7b808e7..c723e77 100644
> --- a/src/lxc/lxc_conf.c
> +++ b/src/lxc/lxc_conf.c
> @@ -27,6 +27,7 @@
>  #include <config.h>
> 
>  #include "lxc_conf.h"
> +#include "lxc_domain.h"
>  #include "nodeinfo.h"
>  #include "virerror.h"
>  #include "virconf.h"
> @@ -154,6 +155,13 @@ error:
>      return NULL;
>  }
> 
> +
> +virDomainXMLConfPtr
> +lxcDomainXMLConfInit(void)
> +{
> +    return virDomainXMLConfNew(&virLXCDriverPrivateDataCallbacks, NULL);
> +}
> +

Is this wrapper function really needed?

>  int lxcLoadDriverConfig(virLXCDriverPtr driver)
>  {
>      char *filename;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]