From mboxrd@z Thu Jan  1 00:00:00 1970
From: Russ Blaine <russell.blaine@sun.com>
Subject: [PATCH] Fix troublesome mlock() calls
Date: Thu, 25 Jan 2007 14:37:40 -0800
Message-ID: <45B93134.7080603@sun.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

# HG changeset patch
# User russell.blaine@sun.com
# Date 1169764305 28800
# Node ID e013822b121117a2ee7b4ebb879eda2676d263ce
# Parent  092c502fb7a8f0cd406c36e16f40660db25d64c3
Fix troublesome mlock() calls

Signed-off-by: Russell Blaine <russell.blaine@sun.com>

diff --git a/tools/libxc/xc_misc.c b/tools/libxc/xc_misc.c
--- a/tools/libxc/xc_misc.c
+++ b/tools/libxc/xc_misc.c
@@ -110,10 +110,10 @@ int xc_hvm_set_pci_intx_level(
      arg.intx   = intx;
      arg.level  = level;

-    if ( mlock(&arg, sizeof(arg)) != 0 )
+    if ( (rc = lock_pages(&arg, sizeof(arg))) != 0 )
      {
          PERROR("Could not lock memory");
-        return -1;
+        return rc;
      }

      rc = do_xen_hypercall(xc_handle, &hypercall);
@@ -140,10 +140,10 @@ int xc_hvm_set_isa_irq_level(
      arg.isa_irq = isa_irq;
      arg.level   = level;

-    if ( mlock(&arg, sizeof(arg)) != 0 )
+    if ( (rc = lock_pages(&arg, sizeof(arg))) != 0 )
      {
          PERROR("Could not lock memory");
-        return -1;
+        return rc;
      }

      rc = do_xen_hypercall(xc_handle, &hypercall);
@@ -168,10 +168,10 @@ int xc_hvm_set_pci_link_route(
      arg.link    = link;
      arg.isa_irq = isa_irq;

-    if ( mlock(&arg, sizeof(arg)) != 0 )
+    if ( (rc = lock_pages(&arg, sizeof(arg))) != 0 )
      {
          PERROR("Could not lock memory");
-        return -1;
+        return rc;
      }

      rc = do_xen_hypercall(xc_handle, &hypercall);