diff options
author | Ian Campbell <ian.campbell@citrix.com> | 2012-06-01 12:06:19 +0100 |
---|---|---|
committer | Ian Campbell <ian.campbell@citrix.com> | 2012-06-01 12:06:19 +0100 |
commit | 33a1df8e769b9a23126e3a02e6e8078f0b85bbf8 (patch) | |
tree | 158d96c7a813cb49180b6b2c281cf1189c95fc19 /tools/libxl | |
parent | 1b0c3e785e30de60bd93de53218907b2a3771839 (diff) | |
download | xen-33a1df8e769b9a23126e3a02e6e8078f0b85bbf8.tar.gz xen-33a1df8e769b9a23126e3a02e6e8078f0b85bbf8.tar.bz2 xen-33a1df8e769b9a23126e3a02e6e8078f0b85bbf8.zip |
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>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
Diffstat (limited to 'tools/libxl')
-rw-r--r-- | tools/libxl/libxl_dom.c | 3 | ||||
-rw-r--r-- | tools/libxl/libxl_internal.h | 3 | ||||
-rw-r--r-- | tools/libxl/libxl_types.idl | 6 | ||||
-rw-r--r-- | tools/libxl/xl_cmdimpl.c | 4 |
4 files changed, 6 insertions, 10 deletions
diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 167c96a83f..bbf1af833a 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -42,7 +42,8 @@ libxl_domain_type libxl__domain_type(libxl__gc *gc, uint32_t domid) 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 --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 7e32f51d34..f647e88d38 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -742,7 +742,8 @@ _hidden libxl_domain_type libxl__domain_type(libxl__gc *gc, uint32_t domid); _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 --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 3d5b4bb310..053ddc6651 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -224,11 +224,9 @@ libxl_domain_create_info = Struct("domain_create_info",[ 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), @@ -263,7 +261,7 @@ libxl_domain_build_info = Struct("domain_build_info",[ # 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 --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index dde63fa463..be3661f64d 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -635,10 +635,6 @@ static void parse_config_data(const char *config_source, 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)) |