Re: [PATCH 2/8] HVM save restore: new hyper-call

["Zhai, Edwin" <edwin.zhai@intel.com>]

[-- Attachment #1: Type: text/plain, Size: 956 bytes --]

On Thu, Jan 11, 2007 at 11:29:49AM -0600, Anthony Liguori wrote:
> Zhai, Edwin wrote:
> >+
> >+/* set info to hvm guest for restore */
> >+int xc_domain_hvm_setcontext(int xc_handle,
> >+                             uint32_t domid,
> >+                             hvm_domain_context_t *hvm_ctxt)
> >+{
> >+    int rc;
> >+    DECLARE_DOMCTL;
> >+
> >+    domctl.cmd = XEN_DOMCTL_sethvmcontext;
> >+    domctl.domain = domid;
> >+    set_xen_guest_handle(domctl.u.hvmcontext.ctxt, hvm_ctxt);
> >+
> >+    if ( (rc = mlock(hvm_ctxt, sizeof(*hvm_ctxt))) != 0 )
> >+        return rc;
> >+
> >+    rc = do_domctl(xc_handle, &domctl);
> >+
> >+    safe_munlock(hvm_ctxt, sizeof(*hvm_ctxt));
> >+
> >+    return rc;
> > }
> 
> Perhaps these should be lock_pages instead of calling mlock() directly?

yes, you are right. i forgot to refresh old patch when rebase.
attached minor fix is okay.

thanks,

> 
> Regards,
> 
> Anthony Liguori
> 

-- 
best rgds,
edwin

[-- Attachment #2: hyper-call-fix.patch --]
[-- Type: text/plain, Size: 1098 bytes --]

diff -r bc8f03bef99f tools/libxc/xc_domain.c
--- a/tools/libxc/xc_domain.c	Thu Jan 11 21:06:24 2007 +0800
+++ b/tools/libxc/xc_domain.c	Fri Jan 12 23:20:55 2007 +0800
@@ -247,12 +247,12 @@ int xc_domain_hvm_getcontext(int xc_hand
     domctl.domain = (domid_t)domid;
     set_xen_guest_handle(domctl.u.hvmcontext.ctxt, hvm_ctxt);
 
-    if ( (rc = mlock(hvm_ctxt, sizeof(*hvm_ctxt))) != 0 )
+    if ( (rc = lock_pages(hvm_ctxt, sizeof(*hvm_ctxt))) != 0 )
         return rc;
 
     rc = do_domctl(xc_handle, &domctl);
 
-    safe_munlock(hvm_ctxt, sizeof(*hvm_ctxt));
+    unlock_pages(hvm_ctxt, sizeof(*hvm_ctxt));
 
     return rc;
 }
@@ -269,12 +269,12 @@ int xc_domain_hvm_setcontext(int xc_hand
     domctl.domain = domid;
     set_xen_guest_handle(domctl.u.hvmcontext.ctxt, hvm_ctxt);
 
-    if ( (rc = mlock(hvm_ctxt, sizeof(*hvm_ctxt))) != 0 )
+    if ( (rc = lock_pages(hvm_ctxt, sizeof(*hvm_ctxt))) != 0 )
         return rc;
 
     rc = do_domctl(xc_handle, &domctl);
 
-    safe_munlock(hvm_ctxt, sizeof(*hvm_ctxt));
+    unlock_pages(hvm_ctxt, sizeof(*hvm_ctxt));
 
     return rc;
 }

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

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