From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vincent Hanquez Subject: [PATCH 3/3] Properly adjust fields in ocaml structure to match the C layer. Date: Tue, 13 Jul 2010 14:51:13 +0100 Message-ID: <1279029073-28530-4-git-send-email-vincent.hanquez@eu.citrix.com> References: <1279029073-28530-1-git-send-email-vincent.hanquez@eu.citrix.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------1.7.1" Return-path: In-Reply-To: <1279029073-28530-1-git-send-email-vincent.hanquez@eu.citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Xen Devel Cc: Vincent Hanquez List-Id: xen-devel@lists.xenproject.org --------------1.7.1 Content-Type: text/plain; charset="UTF-8"; format=fixed Content-Transfer-Encoding: quoted-printable Signed-off-by: Vincent Hanquez --- tools/ocaml/libs/xl/xl.ml | 6 +++--- tools/ocaml/libs/xl/xl.mli | 6 +++--- tools/ocaml/libs/xl/xl_stubs.c | 24 ++++++++++++------------ 3 files changed, 18 insertions(+), 18 deletions(-) --------------1.7.1 Content-Type: text/x-patch; name="0003-Properly-adjust-fields-in-ocaml-structure-to-match-t.patch" Content-Disposition: attachment; filename="0003-Properly-adjust-fields-in-ocaml-structure-to-match-t.patch" Content-Transfer-Encoding: quoted-printable diff --git a/tools/ocaml/libs/xl/xl.ml b/tools/ocaml/libs/xl/xl.ml index 1e3642f..0e47a85 100644 --- a/tools/ocaml/libs/xl/xl.ml +++ b/tools/ocaml/libs/xl/xl.ml @@ -45,15 +45,15 @@ type build_hvm_info =3D nx : bool; viridian : bool; timeoffset : string; + timer_mode : int; + hpet : int; + vpt_align : int; } =20 type build_spec =3D BuildHVM of build_hvm_info | BuildPV of build_pv_inf= o =20 type build_info =3D { - timer_mode : int; - hpet : int; - vpt_align : int; max_vcpus : int; cur_vcpus : int; max_memkb : int64; diff --git a/tools/ocaml/libs/xl/xl.mli b/tools/ocaml/libs/xl/xl.mli index 4193e59..6494296 100644 --- a/tools/ocaml/libs/xl/xl.mli +++ b/tools/ocaml/libs/xl/xl.mli @@ -45,15 +45,15 @@ type build_hvm_info =3D nx : bool; viridian : bool; timeoffset : string; + timer_mode : int; + hpet : int; + vpt_align : int; } =20 type build_spec =3D BuildHVM of build_hvm_info | BuildPV of build_pv_inf= o =20 type build_info =3D { - timer_mode : int; - hpet : int; - vpt_align : int; max_vcpus : int; cur_vcpus : int; max_memkb : int64; diff --git a/tools/ocaml/libs/xl/xl_stubs.c b/tools/ocaml/libs/xl/xl_stub= s.c index 2d0bb54..4e8d45e 100644 --- a/tools/ocaml/libs/xl/xl_stubs.c +++ b/tools/ocaml/libs/xl/xl_stubs.c @@ -114,15 +114,15 @@ static int domain_build_info_val (libxl_domain_buil= d_info *c_val, value v) CAMLparam1(v); CAMLlocal1(infopriv); =20 - c_val->max_vcpus =3D Int_val(Field(v, 3)); - c_val->cur_vcpus =3D Int_val(Field(v, 4)); - c_val->max_memkb =3D Int64_val(Field(v, 5)); - c_val->target_memkb =3D Int64_val(Field(v, 6)); - c_val->video_memkb =3D Int64_val(Field(v, 7)); - c_val->shadow_memkb =3D Int64_val(Field(v, 8)); - c_val->kernel =3D String_val(Field(v, 9)); - c_val->hvm =3D Tag_val(Field(v, 10)) =3D=3D 0; - infopriv =3D Field(Field(v, 10), 0); + c_val->max_vcpus =3D Int_val(Field(v, 0)); + c_val->cur_vcpus =3D Int_val(Field(v, 1)); + c_val->max_memkb =3D Int64_val(Field(v, 2)); + c_val->target_memkb =3D Int64_val(Field(v, 3)); + c_val->video_memkb =3D Int64_val(Field(v, 4)); + c_val->shadow_memkb =3D Int64_val(Field(v, 5)); + c_val->kernel =3D String_val(Field(v, 6)); + c_val->hvm =3D Tag_val(Field(v, 7)) =3D=3D 0; + infopriv =3D Field(Field(v, 7), 0); if (c_val->hvm) { c_val->u.hvm.pae =3D Bool_val(Field(infopriv, 0)); c_val->u.hvm.apic =3D Bool_val(Field(infopriv, 1)); @@ -130,9 +130,9 @@ static int domain_build_info_val (libxl_domain_build_= info *c_val, value v) c_val->u.hvm.nx =3D Bool_val(Field(infopriv, 3)); c_val->u.hvm.viridian =3D Bool_val(Field(infopriv, 4)); c_val->u.hvm.timeoffset =3D String_val(Field(infopriv, 5)); - c_val->u.hvm.timer_mode =3D Int_val(Field(v, 0)); - c_val->u.hvm.hpet =3D Int_val(Field(v, 1)); - c_val->u.hvm.vpt_align =3D Int_val(Field(v, 2)); + c_val->u.hvm.timer_mode =3D Int_val(Field(infopriv, 6)); + c_val->u.hvm.hpet =3D Int_val(Field(infopriv, 7)); + c_val->u.hvm.vpt_align =3D Int_val(Field(infopriv, 8)); } else { c_val->u.pv.slack_memkb =3D Int64_val(Field(infopriv, 0)); c_val->u.pv.cmdline =3D String_val(Field(infopriv, 1)); --------------1.7.1 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --------------1.7.1--