From: George Dunlap Date: Thu, 23 Feb 2012 10:19:57 +0000 (+0000) Subject: libxl: Rename libxl_sched_* to include _domain X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=db645f55286cc76e77832dbba0b452bb2487b1b5;p=people%2Fvhanquez%2Fxen.git libxl: Rename libxl_sched_* to include _domain In preparation for introducing a schedule parameter-based structure, rename libxl_sched_{credit,credit2,sedf} to libxl_sched_{}_domain. No functional changes. v2: Wrap long lines while I'm at it Signed-off-by: George Dunlap Acked-by: Ian Jackson Committed-by: Keir Fraser --- diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index a1f63fba3..327b0402d 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -2975,7 +2975,8 @@ int libxl_get_sched_id(libxl_ctx *ctx) return sched; } -int libxl_sched_credit_domain_get(libxl_ctx *ctx, uint32_t domid, libxl_sched_credit *scinfo) +int libxl_sched_credit_domain_get(libxl_ctx *ctx, uint32_t domid, + libxl_sched_credit_domain *scinfo) { struct xen_domctl_sched_credit sdom; int rc; @@ -2992,7 +2993,8 @@ int libxl_sched_credit_domain_get(libxl_ctx *ctx, uint32_t domid, libxl_sched_cr return 0; } -int libxl_sched_credit_domain_set(libxl_ctx *ctx, uint32_t domid, libxl_sched_credit *scinfo) +int libxl_sched_credit_domain_set(libxl_ctx *ctx, uint32_t domid, + libxl_sched_credit_domain *scinfo) { struct xen_domctl_sched_credit sdom; xc_domaininfo_t domaininfo; @@ -3033,7 +3035,7 @@ int libxl_sched_credit_domain_set(libxl_ctx *ctx, uint32_t domid, libxl_sched_cr } int libxl_sched_credit2_domain_get(libxl_ctx *ctx, uint32_t domid, - libxl_sched_credit2 *scinfo) + libxl_sched_credit2_domain *scinfo) { struct xen_domctl_sched_credit2 sdom; int rc; @@ -3051,7 +3053,7 @@ int libxl_sched_credit2_domain_get(libxl_ctx *ctx, uint32_t domid, } int libxl_sched_credit2_domain_set(libxl_ctx *ctx, uint32_t domid, - libxl_sched_credit2 *scinfo) + libxl_sched_credit2_domain *scinfo) { struct xen_domctl_sched_credit2 sdom; xc_domaininfo_t domaininfo; @@ -3086,7 +3088,7 @@ int libxl_sched_credit2_domain_set(libxl_ctx *ctx, uint32_t domid, } int libxl_sched_sedf_domain_get(libxl_ctx *ctx, uint32_t domid, - libxl_sched_sedf *scinfo) + libxl_sched_sedf_domain *scinfo) { uint64_t period; uint64_t slice; @@ -3112,7 +3114,7 @@ int libxl_sched_sedf_domain_get(libxl_ctx *ctx, uint32_t domid, } int libxl_sched_sedf_domain_set(libxl_ctx *ctx, uint32_t domid, - libxl_sched_sedf *scinfo) + libxl_sched_sedf_domain *scinfo) { xc_domaininfo_t domaininfo; int rc; diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 1bffa039c..5d904eeca 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -588,17 +588,17 @@ int libxl_get_sched_id(libxl_ctx *ctx); int libxl_sched_credit_domain_get(libxl_ctx *ctx, uint32_t domid, - libxl_sched_credit *scinfo); + libxl_sched_credit_domain *scinfo); int libxl_sched_credit_domain_set(libxl_ctx *ctx, uint32_t domid, - libxl_sched_credit *scinfo); + libxl_sched_credit_domain *scinfo); int libxl_sched_credit2_domain_get(libxl_ctx *ctx, uint32_t domid, - libxl_sched_credit2 *scinfo); + libxl_sched_credit2_domain *scinfo); int libxl_sched_credit2_domain_set(libxl_ctx *ctx, uint32_t domid, - libxl_sched_credit2 *scinfo); + libxl_sched_credit2_domain *scinfo); int libxl_sched_sedf_domain_get(libxl_ctx *ctx, uint32_t domid, - libxl_sched_sedf *scinfo); + libxl_sched_sedf_domain *scinfo); int libxl_sched_sedf_domain_set(libxl_ctx *ctx, uint32_t domid, - libxl_sched_sedf *scinfo); + libxl_sched_sedf_domain *scinfo); int libxl_send_trigger(libxl_ctx *ctx, uint32_t domid, libxl_trigger trigger, uint32_t vcpuid); int libxl_send_sysrq(libxl_ctx *ctx, uint32_t domid, char sysrq); diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index b77bc651d..4f894cd39 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -390,16 +390,16 @@ libxl_cputopology = Struct("cputopology", [ ("node", uint32), ]) -libxl_sched_credit = Struct("sched_credit", [ +libxl_sched_credit_domain = Struct("sched_credit_domain", [ ("weight", integer), ("cap", integer), ], dispose_fn=None) -libxl_sched_credit2 = Struct("sched_credit2", [ +libxl_sched_credit2_domain = Struct("sched_credit2_domain", [ ("weight", integer), ], dispose_fn=None) -libxl_sched_sedf = Struct("sched_sedf", [ +libxl_sched_sedf_domain = Struct("sched_sedf_domain", [ ("period", integer), ("slice", integer), ("latency", integer), diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index c58e9f3f2..1b2e72798 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -3913,7 +3913,7 @@ int main_sharing(int argc, char **argv) } static int sched_credit_domain_get( - int domid, libxl_sched_credit *scinfo) + int domid, libxl_sched_credit_domain *scinfo) { int rc; @@ -3925,7 +3925,7 @@ static int sched_credit_domain_get( } static int sched_credit_domain_set( - int domid, libxl_sched_credit *scinfo) + int domid, libxl_sched_credit_domain *scinfo) { int rc; @@ -3940,7 +3940,7 @@ static int sched_credit_domain_output( int domid) { char *domname; - libxl_sched_credit scinfo; + libxl_sched_credit_domain scinfo; int rc; if (domid < 0) { @@ -3961,7 +3961,7 @@ static int sched_credit_domain_output( } static int sched_credit2_domain_get( - int domid, libxl_sched_credit2 *scinfo) + int domid, libxl_sched_credit2_domain *scinfo) { int rc; @@ -3973,7 +3973,7 @@ static int sched_credit2_domain_get( } static int sched_credit2_domain_set( - int domid, libxl_sched_credit2 *scinfo) + int domid, libxl_sched_credit2_domain *scinfo) { int rc; @@ -3988,7 +3988,7 @@ static int sched_credit2_domain_output( int domid) { char *domname; - libxl_sched_credit2 scinfo; + libxl_sched_credit2_domain scinfo; int rc; if (domid < 0) { @@ -4008,7 +4008,7 @@ static int sched_credit2_domain_output( } static int sched_sedf_domain_get( - int domid, libxl_sched_sedf *scinfo) + int domid, libxl_sched_sedf_domain *scinfo) { int rc; @@ -4020,7 +4020,7 @@ static int sched_sedf_domain_get( } static int sched_sedf_domain_set( - int domid, libxl_sched_sedf *scinfo) + int domid, libxl_sched_sedf_domain *scinfo) { int rc; @@ -4035,7 +4035,7 @@ static int sched_sedf_domain_output( int domid) { char *domname; - libxl_sched_sedf scinfo; + libxl_sched_sedf_domain scinfo; int rc; if (domid < 0) { @@ -4116,7 +4116,7 @@ static int sched_domain_output( int main_sched_credit(int argc, char **argv) { - libxl_sched_credit scinfo; + libxl_sched_credit_domain scinfo; const char *dom = NULL; const char *cpupool = NULL; int weight = 256, cap = 0, opt_w = 0, opt_c = 0; @@ -4198,7 +4198,7 @@ int main_sched_credit(int argc, char **argv) int main_sched_credit2(int argc, char **argv) { - libxl_sched_credit2 scinfo; + libxl_sched_credit2_domain scinfo; const char *dom = NULL; const char *cpupool = NULL; int weight = 256, opt_w = 0; @@ -4272,7 +4272,7 @@ int main_sched_credit2(int argc, char **argv) int main_sched_sedf(int argc, char **argv) { - libxl_sched_sedf scinfo; + libxl_sched_sedf_domain scinfo; const char *dom = NULL; const char *cpupool = NULL; int period = 0, opt_p = 0; diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c b/tools/ocaml/libs/xl/xenlight_stubs.c index 38977b512..f1511d46d 100644 --- a/tools/ocaml/libs/xl/xenlight_stubs.c +++ b/tools/ocaml/libs/xl/xenlight_stubs.c @@ -473,7 +473,7 @@ value stub_xl_sched_credit_domain_get(value domid) { CAMLparam1(domid); CAMLlocal1(scinfo); - libxl_sched_credit c_scinfo; + libxl_sched_credit_domain c_scinfo; int ret; INIT_STRUCT(); @@ -483,18 +483,18 @@ value stub_xl_sched_credit_domain_get(value domid) failwith_xl("sched_credit_domain_get", &lg); FREE_CTX(); - scinfo = Val_sched_credit(&gc, &lg, &c_scinfo); + scinfo = Val_sched_credit_domain(&gc, &lg, &c_scinfo); CAMLreturn(scinfo); } value stub_xl_sched_credit_domain_set(value domid, value scinfo) { CAMLparam2(domid, scinfo); - libxl_sched_credit c_scinfo; + libxl_sched_credit_domain c_scinfo; int ret; INIT_STRUCT(); - sched_credit_val(&gc, &lg, &c_scinfo, scinfo); + sched_credit_domain_val(&gc, &lg, &c_scinfo, scinfo); INIT_CTX(); ret = libxl_sched_credit_domain_set(ctx, Int_val(domid), &c_scinfo);