Re: [PATCH 2 of 5 V2] libxl: rename libxl_sched_params to libxl_domain_sched_params

[George Dunlap <george.dunlap@eu.citrix.com>]

On 29/05/12 14:57, Ian Campbell wrote:
> # HG changeset patch
> # User Ian Campbell<ian.campbell@citrix.com>
> # Date 1338299709 -3600
> # Node ID 73d8274c0b6859b4528af75a7405e546d659f130
> # Parent  980a25d6ad12ba0f10fa616255b9382cc14ce69e
> libxl: rename libxl_sched_params to libxl_domain_sched_params
>
> Remove credit scheduler global options from the struct, they were never used
> anyway.
>
> Signed-off-by: Ian Campbell<ian.campbell@citrix.com>
Acked-by: George Dunlap <george.dunlap@eu.citrix.com>
> ---
> v2: use libxl_domain_sched_params which fits in better with future changes.
>
> diff -r 980a25d6ad12 -r 73d8274c0b68 tools/libxl/libxl_dom.c
> --- a/tools/libxl/libxl_dom.c	Tue May 29 14:53:39 2012 +0100
> +++ b/tools/libxl/libxl_dom.c	Tue May 29 14:55:09 2012 +0100
> @@ -42,7 +42,8 @@ libxl_domain_type libxl__domain_type(lib
>           return LIBXL_DOMAIN_TYPE_PV;
>   }
>
> -int libxl__sched_set_params(libxl__gc *gc, uint32_t domid, libxl_sched_params *scparams)
> +int libxl__sched_set_params(libxl__gc *gc, uint32_t domid,
> +                            libxl_domain_sched_params *scparams)
>   {
>       libxl_ctx *ctx = libxl__gc_owner(gc);
>       libxl_scheduler sched;
> diff -r 980a25d6ad12 -r 73d8274c0b68 tools/libxl/libxl_internal.h
> --- a/tools/libxl/libxl_internal.h	Tue May 29 14:53:39 2012 +0100
> +++ b/tools/libxl/libxl_internal.h	Tue May 29 14:55:09 2012 +0100
> @@ -740,7 +740,8 @@ _hidden libxl_domain_type libxl__domain_
>   _hidden int libxl__domain_shutdown_reason(libxl__gc *gc, uint32_t domid);
>   _hidden int libxl__domain_cpupool(libxl__gc *gc, uint32_t domid);
>   _hidden libxl_scheduler libxl__domain_scheduler(libxl__gc *gc, uint32_t domid);
> -_hidden int libxl__sched_set_params(libxl__gc *gc, uint32_t domid, libxl_sched_params *scparams);
> +_hidden int libxl__sched_set_params(libxl__gc *gc, uint32_t domid,
> +                                    libxl_domain_sched_params *scparams);
>   #define LIBXL__DOMAIN_IS_TYPE(gc, domid, type) \
>       libxl__domain_type((gc), (domid)) == LIBXL_DOMAIN_TYPE_##type
>   typedef struct {
> diff -r 980a25d6ad12 -r 73d8274c0b68 tools/libxl/libxl_types.idl
> --- a/tools/libxl/libxl_types.idl	Tue May 29 14:53:39 2012 +0100
> +++ b/tools/libxl/libxl_types.idl	Tue May 29 14:55:09 2012 +0100
> @@ -224,11 +224,9 @@ libxl_domain_create_info = Struct("domai
>
>   MemKB = UInt(64, init_val = "LIBXL_MEMKB_DEFAULT")
>
> -libxl_sched_params = Struct("sched_params",[
> +libxl_domain_sched_params = Struct("domain_sched_params",[
>       ("weight",       integer),
>       ("cap",          integer),
> -    ("tslice_ms",    integer),
> -    ("ratelimit_us", integer),
>       ("period",       integer),
>       ("slice",        integer),
>       ("latency",      integer),
> @@ -262,7 +260,7 @@ libxl_domain_build_info = Struct("domain
>       # extra parameters pass directly to qemu for HVM guest, NULL terminated
>       ("extra_hvm",        libxl_string_list),
>       #  parameters for all type of scheduler
> -    ("sched_params",     libxl_sched_params),
> +    ("sched_params",     libxl_domain_sched_params),
>
>       ("u", KeyedUnion(None, libxl_domain_type, "type",
>                   [("hvm", Struct(None, [("firmware",         string),
> diff -r 980a25d6ad12 -r 73d8274c0b68 tools/libxl/xl_cmdimpl.c
> --- a/tools/libxl/xl_cmdimpl.c	Tue May 29 14:53:39 2012 +0100
> +++ b/tools/libxl/xl_cmdimpl.c	Tue May 29 14:55:09 2012 +0100
> @@ -633,10 +633,6 @@ static void parse_config_data(const char
>           b_info->sched_params.weight = l;
>       if (!xlu_cfg_get_long (config, "cap",&l, 0))
>           b_info->sched_params.cap = l;
> -    if (!xlu_cfg_get_long (config, "tslice_ms",&l, 0))
> -        b_info->sched_params.tslice_ms = l;
> -    if (!xlu_cfg_get_long (config, "ratelimit_us",&l, 0))
> -        b_info->sched_params.ratelimit_us = l;
>       if (!xlu_cfg_get_long (config, "period",&l, 0))
>           b_info->sched_params.period = l;
>       if (!xlu_cfg_get_long (config, "slice",&l, 0))