Update xenctrl ocaml bindings used by xenopsd

gangj · gangj · commit a8782c0c647c · 2025-06-25T17:08:58.000+08:00
Update for xenctrl api: domain_get_runstate_info.
As this api is not used by xenopsd now, we can update directly without
considering backwards compatibility.

Signed-off-by: Gang Ji &lt;gang.ji@cloud.com&gt;
diff --git a/ocaml/xenopsd/c_stubs/xenctrlext_stubs.c b/ocaml/xenopsd/c_stubs/xenctrlext_stubs.c
@@ -113,11 +113,14 @@ CAMLprim value stub_xenctrlext_get_runstate_info(value xch_val, value domid)
 	CAMLparam2(xch_val, domid);
 #if defined(XENCTRL_HAS_GET_RUNSTATE_INFO)
 	CAMLlocal1(result);
-	xc_runstate_info_t info;
+	xc_runstate_info_t info = { 0 };
 	int retval;
 	xc_interface *xch = xch_of_val(xch_val);
+	uint32_t c_domid = Int_val(domid);
 
-	retval = xc_get_runstate_info(xch, Int_val(domid), &info);
+	caml_release_runtime_system();
+	retval = xc_get_runstate_info(xch, c_domid, &info);
+	caml_acquire_runtime_system();
 	if (retval < 0)
 		failwith_xc(xch);
 
@@ -126,8 +129,9 @@ CAMLprim value stub_xenctrlext_get_runstate_info(value xch_val, value domid)
 	   1 : missed_changes (int32)
 	   2 : state_entry_time (int64)
 	   3-8 : times (int64s)
+	   9 : runnable (int64)
 	*/
-	result = caml_alloc_tuple(9);
+	result = caml_alloc_tuple(10);
 	Store_field(result, 0, caml_copy_int32(info.state));
 	Store_field(result, 1, caml_copy_int32(info.missed_changes));
 	Store_field(result, 2, caml_copy_int64(info.state_entry_time));
@@ -137,6 +141,7 @@ CAMLprim value stub_xenctrlext_get_runstate_info(value xch_val, value domid)
 	Store_field(result, 6, caml_copy_int64(info.time[3]));
 	Store_field(result, 7, caml_copy_int64(info.time[4]));
 	Store_field(result, 8, caml_copy_int64(info.time[5]));
+	Store_field(result, 9, caml_copy_int64(info.runnable));
 
 	CAMLreturn(result);
 #else
diff --git a/ocaml/xenopsd/xc/xenctrlext.ml b/ocaml/xenopsd/xc/xenctrlext.ml
@@ -63,6 +63,7 @@ type runstateinfo = {
   ; time3: int64
   ; time4: int64
   ; time5: int64
+  ; runnable: int64
 }
 
 external domain_get_runstate_info : handle -> int -> runstateinfo
diff --git a/ocaml/xenopsd/xc/xenctrlext.mli b/ocaml/xenopsd/xc/xenctrlext.mli
@@ -45,6 +45,7 @@ type runstateinfo = {
   ; time3: int64
   ; time4: int64
   ; time5: int64
+  ; runnable: int64
 }
 
 external domain_get_runstate_info : handle -> int -> runstateinfo

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,7 @@ type runstateinfo = {`
`63`	`63`	`; time3: int64`
`64`	`64`	`; time4: int64`
`65`	`65`	`; time5: int64`
	`66`	`+ ; runnable: int64`
`66`	`67`	`}`
`67`	`68`
`68`	`69`	`external domain_get_runstate_info : handle -> int -> runstateinfo`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ type runstateinfo = {`
`45`	`45`	`; time3: int64`
`46`	`46`	`; time4: int64`
`47`	`47`	`; time5: int64`
	`48`	`+ ; runnable: int64`
`48`	`49`	`}`
`49`	`50`
`50`	`51`	`external domain_get_runstate_info : handle -> int -> runstateinfo`