[Xen-changelog] Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1443, 2005/05/11 18:37:59+01:00, cl349@xxxxxxxxxxxxxxxxxxxx

        Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
        into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk



 xc_linux_build.c |    9 +++++++--
 xc_plan9_build.c |   10 +++++++---
 xc_vmx_build.c   |    9 +++++++--
 3 files changed, 21 insertions(+), 7 deletions(-)


diff -Nru a/tools/libxc/xc_linux_build.c b/tools/libxc/xc_linux_build.c
--- a/tools/libxc/xc_linux_build.c      2005-05-11 17:04:57 -04:00
+++ b/tools/libxc/xc_linux_build.c      2005-05-11 17:04:57 -04:00
@@ -356,14 +356,19 @@
 
     op.cmd = DOM0_GETDOMAININFO;
     op.u.getdomaininfo.domain = (domid_t)domid;
-    op.u.getdomaininfo.exec_domain = 0;
-    op.u.getdomaininfo.ctxt = ctxt;
     if ( (do_dom0_op(xc_handle, &op) < 0) || 
          ((u16)op.u.getdomaininfo.domain != domid) )
     {
         PERROR("Could not get info on domain");
         goto error_out;
     }
+
+    if ( xc_domain_get_vcpu_context(xc_handle, domid, 0, ctxt) )
+    {
+        PERROR("Could not get vcpu context");
+        goto error_out;
+    }
+
     if ( !(op.u.getdomaininfo.flags & DOMFLAGS_PAUSED) ||
          (ctxt->pt_base != 0) )
     {
diff -Nru a/tools/libxc/xc_plan9_build.c b/tools/libxc/xc_plan9_build.c
--- a/tools/libxc/xc_plan9_build.c      2005-05-11 17:04:57 -04:00
+++ b/tools/libxc/xc_plan9_build.c      2005-05-11 17:04:57 -04:00
@@ -440,17 +440,21 @@
 
        op.cmd = DOM0_GETDOMAININFO;
        op.u.getdomaininfo.domain = (domid_t) domid;
-        op.u.getdomaininfo.exec_domain = 0;
-       op.u.getdomaininfo.ctxt = ctxt;
        if ((do_dom0_op(xc_handle, &op) < 0) ||
            ((u32) op.u.getdomaininfo.domain != domid)) {
                PERROR("Could not get info on domain");
                goto error_out;
        }
        DPRINTF(("xc_get_tot_pages returns %ld pages\n", tot_pages));
+       
+       if ( xc_domain_get_vcpu_context(xc_handle, domid, 0, ctxt) )
+       {
+           PERROR("Could not get vcpu context");
+           goto error_out;
+       }
 
        if (!(op.u.getdomaininfo.flags & DOMFLAGS_PAUSED)
-           || (op.u.getdomaininfo.ctxt->pt_base != 0)) {
+           || (ctxt->pt_base != 0)) {
                ERROR("Domain is already constructed");
                goto error_out;
        }
diff -Nru a/tools/libxc/xc_vmx_build.c b/tools/libxc/xc_vmx_build.c
--- a/tools/libxc/xc_vmx_build.c        2005-05-11 17:04:57 -04:00
+++ b/tools/libxc/xc_vmx_build.c        2005-05-11 17:04:57 -04:00
@@ -543,14 +543,19 @@
 
     op.cmd = DOM0_GETDOMAININFO;
     op.u.getdomaininfo.domain = (domid_t)domid;
-    op.u.getdomaininfo.exec_domain = 0;
-    op.u.getdomaininfo.ctxt = ctxt;
     if ( (do_dom0_op(xc_handle, &op) < 0) || 
          ((u16)op.u.getdomaininfo.domain != domid) )
     {
         PERROR("Could not get info on domain");
         goto error_out;
     }
+
+    if ( xc_domain_get_vcpu_context(xc_handle, domid, 0, ctxt) )
+    {
+        PERROR("Could not get vcpu context");
+        goto error_out;
+    }
+
     if ( !(op.u.getdomaininfo.flags & DOMFLAGS_PAUSED) ||
          (ctxt->pt_base != 0) )
     {

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