From mboxrd@z Thu Jan  1 00:00:00 1970
From: Kip Macy <kip.macy@gmail.com>
Subject: resend Fwd: xc_ptrace fix
Date: Fri, 29 Apr 2005 17:04:32 -0700
Message-ID: <b1fa291705042917045011b248@mail.gmail.com>
References: <b1fa291705042819082aa11463@mail.gmail.com>
Reply-To: Kip Macy <kip.macy@gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <b1fa291705042819082aa11463@mail.gmail.com>
Content-Disposition: inline
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 <xen-devel@lists.xensource.com>
List-Id: xen-devel@lists.xenproject.org

Please apply.  Paravirtualized guest debugging does not work without
this change.

---------- Forwarded message ----------
From: Kip Macy <kip.macy@gmail.com>
Date: Apr 28, 2005 7:08 PM
Subject: xc_ptrace fix
To: xen-devel <xen-devel@lists.xensource.com>


Make work for paravirtualized guest

# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2005/04/28 15:22:26-07:00 kmacy@curly.lab.netapp.com
#   Fix xc_ptrace
#   Signed-off-by: Kip Macy <kmacy@fsmware.com>
#
# BitKeeper/etc/logging_ok
#   2005/04/28 15:22:26-07:00 kmacy@curly.lab.netapp.com +1 -0
#   Logging to logging@openlogging.org accepted
#
# tools/libxc/xc_ptrace.c
#   2005/04/28 15:22:15-07:00 kmacy@curly.lab.netapp.com +4 -2
#   don't reference page_array in the paravirtualized case
#
diff -Nru a/tools/libxc/xc_ptrace.c b/tools/libxc/xc_ptrace.c
--- a/tools/libxc/xc_ptrace.c   2005-04-27 19:11:24 -07:00
+++ b/tools/libxc/xc_ptrace.c   2005-04-27 19:11:24 -07:00
@@ -181,7 +181,8 @@
     }
     if ((pde =3D cr3_virt[cpu][vtopdi(va)]) =3D=3D 0) /* logical address *=
/
        goto error_out;
-    pde =3D page_array[pde >> PAGE_SHIFT] << PAGE_SHIFT;
+    if (ctxt[cpu].flags & VGCF_VMX_GUEST)
+       pde =3D page_array[pde >> PAGE_SHIFT] << PAGE_SHIFT;
     if (pde !=3D pde_phys[cpu])
     {
        pde_phys[cpu] =3D pde;
@@ -194,7 +195,8 @@
     }
     if ((page =3D pde_virt[cpu][vtopti(va)]) =3D=3D 0) /* logical address =
*/
        goto error_out;
-    page =3D page_array[page >> PAGE_SHIFT] << PAGE_SHIFT;
+    if (ctxt[cpu].flags & VGCF_VMX_GUEST)
+       page =3D page_array[page >> PAGE_SHIFT] << PAGE_SHIFT;
     if (page !=3D page_phys[cpu] || perm !=3D prev_perm[cpu])
     {
        page_phys[cpu] =3D page;