|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [Xen-devel] [PATCH 6 of 9] libxl: Rename libxl_sched_* to include _domain
On 22/02/2012 16:15, "George Dunlap" <George.Dunlap@xxxxxxxxxxxxx> wrote:
> 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
I've applied up to and including this patch (since it's Acked by Ian). I
leave the remaining three patches to a libxl maintainer.
-- Keir
> Signed-off-by: George Dunlap <george.dunlap@xxxxxxxxxxxxx>
> Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
>
> diff -r b5d446a34508 -r af02b1ea16da tools/libxl/libxl.c
> --- a/tools/libxl/libxl.c Wed Feb 22 16:08:28 2012 +0000
> +++ b/tools/libxl/libxl.c Wed Feb 22 16:08:28 2012 +0000
> @@ -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_
> 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_
> }
>
> 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
> }
>
> 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
> }
>
> 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_ct
> }
>
> 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 -r b5d446a34508 -r af02b1ea16da tools/libxl/libxl.h
> --- a/tools/libxl/libxl.h Wed Feb 22 16:08:28 2012 +0000
> +++ b/tools/libxl/libxl.h Wed Feb 22 16:08:28 2012 +0000
> @@ -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 -r b5d446a34508 -r af02b1ea16da tools/libxl/libxl_types.idl
> --- a/tools/libxl/libxl_types.idl Wed Feb 22 16:08:28 2012 +0000
> +++ b/tools/libxl/libxl_types.idl Wed Feb 22 16:08:28 2012 +0000
> @@ -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 -r b5d446a34508 -r af02b1ea16da tools/libxl/xl_cmdimpl.c
> --- a/tools/libxl/xl_cmdimpl.c Wed Feb 22 16:08:28 2012 +0000
> +++ b/tools/libxl/xl_cmdimpl.c Wed Feb 22 16:08:28 2012 +0000
> @@ -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 **a
>
> 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 **
>
> 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 -r b5d446a34508 -r af02b1ea16da tools/ocaml/libs/xl/xenlight_stubs.c
> --- a/tools/ocaml/libs/xl/xenlight_stubs.c Wed Feb 22 16:08:28 2012 +0000
> +++ b/tools/ocaml/libs/xl/xenlight_stubs.c Wed Feb 22 16:08:28 2012 +0000
> @@ -473,7 +473,7 @@ value stub_xl_sched_credit_domain_get(va
> {
> 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(va
> 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);
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@xxxxxxxxxxxxx
> http://lists.xen.org/xen-devel
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |