ocaml: fix build after 25446:648508ee27a2, 25449:68d46c5ea0a3 et al.

These renamed a type and the associated functions and the ocaml bindings were
not updated to suit.

This also highlighted that libxl_domain_sched_params should not be DIR_IN since
it is also use as an output struct.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl
index a77bbf722d0cb56b50ff9a60674641bd0b265730..a528da2c17b2946f6f1b90bb19b73199c620114a 100644 (file)
--- a/tools/libxl/libxl_types.idl
+++ b/tools/libxl/libxl_types.idl
@@ -232,7 +232,7 @@ libxl_domain_sched_params = Struct("domain_sched_params",[
     ("slice",        integer, {'init_val': 'LIBXL_DOMAIN_SCHED_PARAM_SLICE_DEFAULT'}),
     ("latency",      integer, {'init_val': 'LIBXL_DOMAIN_SCHED_PARAM_LATENCY_DEFAULT'}),
     ("extratime",    integer, {'init_val': 'LIBXL_DOMAIN_SCHED_PARAM_EXTRATIME_DEFAULT'}),
-    ], dir=DIR_IN)
+    ])
 
 libxl_domain_build_info = Struct("domain_build_info",[
     ("max_vcpus",       integer),

diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py
index 384ec5b4ea895bf39809405b88f70d4c43bc88d6..b379b571080cc74d27a79d60e32de790c6d5b739 100644 (file)
--- a/tools/ocaml/libs/xl/genwrap.py
+++ b/tools/ocaml/libs/xl/genwrap.py
@@ -32,8 +32,9 @@ functions = { # ( name , [type1,type2,....] )
                       ],
     "cputopology":    [ ("get",            ["unit", "t array"]),
                       ],
-    "sched_credit":   [ ("domain_get",     ["domid", "t"]),
-                        ("domain_set",     ["domid", "t", "unit"]),
+    "domain_sched_params":
+                      [ ("get",            ["domid", "t"]),
+                        ("set",            ["domid", "t", "unit"]),
                       ],
 }
 def stub_fn_name(ty, name):

diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c b/tools/ocaml/libs/xl/xenlight_stubs.c
index 2ba07fc5795e33fe0ab040586de7cabbaf8b7642..c712b2bd015e05e0c86c9c44b3b0109c0cec7a3a 100644 (file)
--- a/tools/ocaml/libs/xl/xenlight_stubs.c
+++ b/tools/ocaml/libs/xl/xenlight_stubs.c
@@ -496,37 +496,37 @@ value stub_xl_cputopology_get(value unit)
        CAMLreturn(topology);
 }
 
-value stub_xl_sched_credit_domain_get(value domid)
+value stub_xl_domain_sched_params_get(value domid)
 {
        CAMLparam1(domid);
        CAMLlocal1(scinfo);
-       libxl_sched_credit_domain c_scinfo;
+       libxl_domain_sched_params c_scinfo;
        int ret;
        INIT_STRUCT();
 
        INIT_CTX();
-       ret = libxl_sched_credit_domain_get(ctx, Int_val(domid), &c_scinfo);
+       ret = libxl_domain_sched_params_get(ctx, Int_val(domid), &c_scinfo);
        if (ret != 0)
-               failwith_xl("sched_credit_domain_get", &lg);
+               failwith_xl("domain_sched_params_get", &lg);
        FREE_CTX();
 
-       scinfo = Val_sched_credit_domain(&gc, &lg, &c_scinfo);
+       scinfo = Val_domain_sched_params(&gc, &lg, &c_scinfo);
        CAMLreturn(scinfo);
 }
 
-value stub_xl_sched_credit_domain_set(value domid, value scinfo)
+value stub_xl_domain_sched_params_set(value domid, value scinfo)
 {
        CAMLparam2(domid, scinfo);
-       libxl_sched_credit_domain c_scinfo;
+       libxl_domain_sched_params c_scinfo;
        int ret;
        INIT_STRUCT();
 
-       sched_credit_domain_val(&gc, &lg, &c_scinfo, scinfo);
+       domain_sched_params_val(&gc, &lg, &c_scinfo, scinfo);
 
        INIT_CTX();
-       ret = libxl_sched_credit_domain_set(ctx, Int_val(domid), &c_scinfo);
+       ret = libxl_domain_sched_params_set(ctx, Int_val(domid), &c_scinfo);
        if (ret != 0)
-               failwith_xl("sched_credit_domain_set", &lg);
+               failwith_xl("domain_sched_params_set", &lg);
        FREE_CTX();
 
        CAMLreturn(Val_unit);