WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] [xen-unstable] tools/ocaml: Fix up ocaml build for timer

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-unstable] tools/ocaml: Fix up ocaml build for timer_mode, hpet and vpt_align
From: Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date: Thu, 08 Jul 2010 02:10:44 -0700
Delivery-date: Thu, 08 Jul 2010 02:14:34 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
# Date 1278433864 -3600
# Node ID 7925f4d390434fb1efc365b68a7d7f6b8cfd0cfc
# Parent  15bcf57fcf24333ab753a4736c222785b9a28310
tools/ocaml: Fix up ocaml build for timer_mode, hpet and vpt_align

c/s da46b25cf17d broke the ocaml build.  This fixes it.

Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 tools/ocaml/libs/xl/xl_stubs.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff -r 15bcf57fcf24 -r 7925f4d39043 tools/ocaml/libs/xl/xl_stubs.c
--- a/tools/ocaml/libs/xl/xl_stubs.c    Tue Jul 06 17:22:39 2010 +0100
+++ b/tools/ocaml/libs/xl/xl_stubs.c    Tue Jul 06 17:31:04 2010 +0100
@@ -97,9 +97,6 @@ static int domain_build_info_val (libxl_
        CAMLparam1(v);
        CAMLlocal1(infopriv);
 
-       c_val->timer_mode = Int_val(Field(v, 0));
-       c_val->hpet = Int_val(Field(v, 1));
-       c_val->vpt_align = Int_val(Field(v, 2));
        c_val->max_vcpus = Int_val(Field(v, 3));
        c_val->cur_vcpus = Int_val(Field(v, 4));
        c_val->max_memkb = Int64_val(Field(v, 5));
@@ -116,6 +113,9 @@ static int domain_build_info_val (libxl_
                c_val->u.hvm.nx = Bool_val(Field(infopriv, 3));
                c_val->u.hvm.viridian = Bool_val(Field(infopriv, 4));
                c_val->u.hvm.timeoffset = String_val(Field(infopriv, 5));
+               c_val->u.hvm.timer_mode = Int_val(Field(v, 0));
+               c_val->u.hvm.hpet = Int_val(Field(v, 1));
+               c_val->u.hvm.vpt_align = Int_val(Field(v, 2));
        } else {
                c_val->u.pv.slack_memkb = Int64_val(Field(infopriv, 0));
                c_val->u.pv.cmdline = String_val(Field(infopriv, 1));

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-unstable] tools/ocaml: Fix up ocaml build for timer_mode, hpet and vpt_align, Xen patchbot-unstable <=