From: Mukesh Rathor Subject: [PATCH] gdbsx: use MTF flag for HVM guests for single step Date: Fri, 3 Sep 2010 17:06:46 -0700 Message-ID: <20100903170646.45f08b7f@mantra.us.oracle.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/W=ZuUODooyRImHG4sykhWne" Return-path: List-Unsubscribe: , List-Post: List-Help: List-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 --MP_/W=ZuUODooyRImHG4sykhWne Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline The attached patch first tries the MTF flag for HVM guest single step, reverting to manually setting the TF flag if MTF fails. Tested on 4.0.1. Compile tested on unstable. thanks, Mukesh Signed-off-by: mukesh.rathor@oracle.com diff -r 1831912d4109 tools/debugger/gdbsx/xg/xg_main.c --- a/tools/debugger/gdbsx/xg/xg_main.c Thu Sep 02 19:12:42 2010 +0100 +++ b/tools/debugger/gdbsx/xg/xg_main.c Fri Sep 03 17:03:05 2010 -0700 @@ -158,6 +158,7 @@ /* + * Precondition: domctl global struct must be filled * Returns : 0 Success, failure otherwise with errno set */ static int @@ -366,6 +367,19 @@ union vcpu_guest_context_any anyc; int sz = sizeof(anyc); + /* first try the MTF for hvm guest. otherwise do manually */ + if (_hvm_guest) { + domctl.u.debug_op.vcpu = which_vcpu; + domctl.u.debug_op.op = setit ? XEN_DOMCTL_DEBUG_OP_SINGLE_STEP_ON : + XEN_DOMCTL_DEBUG_OP_SINGLE_STEP_OFF; + + if (_domctl_hcall(XEN_DOMCTL_debug_op, NULL, 0) == 0) { + XGTRC("vcpu:%d:MTF success setit:%d\n", which_vcpu, setit); + return 0; + } + XGTRC("vcpu:%d:MTF failed. setit:%d\n", which_vcpu, setit); + } + memset(&anyc, 0, sz); domctl.u.vcpucontext.vcpu = (uint16_t)which_vcpu; set_xen_guest_handle(domctl.u.vcpucontext.ctxt, &anyc.ctxt); --MP_/W=ZuUODooyRImHG4sykhWne Content-Type: application/octet-stream; name=gdbsx.out Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=gdbsx.out ZGlmZiAtciAxODMxOTEyZDQxMDkgdG9vbHMvZGVidWdnZXIvZ2Ric3gveGcveGdfbWFpbi5jCi0t LSBhL3Rvb2xzL2RlYnVnZ2VyL2dkYnN4L3hnL3hnX21haW4uYwlUaHUgU2VwIDAyIDE5OjEyOjQy IDIwMTAgKzAxMDAKKysrIGIvdG9vbHMvZGVidWdnZXIvZ2Ric3gveGcveGdfbWFpbi5jCUZyaSBT ZXAgMDMgMTc6MDM6MDUgMjAxMCAtMDcwMApAQCAtMTU4LDYgKzE1OCw3IEBACiAKIAogLyoKKyAq IFByZWNvbmRpdGlvbjogZG9tY3RsIGdsb2JhbCBzdHJ1Y3QgbXVzdCBiZSBmaWxsZWQgCiAgKiBS ZXR1cm5zIDogMCBTdWNjZXNzLCBmYWlsdXJlIG90aGVyd2lzZSB3aXRoIGVycm5vIHNldAogICov CiBzdGF0aWMgaW50CkBAIC0zNjYsNiArMzY3LDE5IEBACiAgICAgdW5pb24gdmNwdV9ndWVzdF9j b250ZXh0X2FueSBhbnljOwogICAgIGludCBzeiA9IHNpemVvZihhbnljKTsKIAorICAgIC8qIGZp cnN0IHRyeSB0aGUgTVRGIGZvciBodm0gZ3Vlc3QuIG90aGVyd2lzZSBkbyBtYW51YWxseSAqLwor ICAgIGlmIChfaHZtX2d1ZXN0KSB7CisgICAgICAgIGRvbWN0bC51LmRlYnVnX29wLnZjcHUgPSB3 aGljaF92Y3B1OworICAgICAgICBkb21jdGwudS5kZWJ1Z19vcC5vcCA9IHNldGl0ID8gWEVOX0RP TUNUTF9ERUJVR19PUF9TSU5HTEVfU1RFUF9PTiA6CisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBYRU5fRE9NQ1RMX0RFQlVHX09QX1NJTkdMRV9TVEVQX09GRjsKKworICAg ICAgICBpZiAoX2RvbWN0bF9oY2FsbChYRU5fRE9NQ1RMX2RlYnVnX29wLCBOVUxMLCAwKSA9PSAw KSB7CisgICAgICAgICAgICBYR1RSQygidmNwdTolZDpNVEYgc3VjY2VzcyBzZXRpdDolZFxuIiwg d2hpY2hfdmNwdSwgc2V0aXQpOworICAgICAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIH0KKyAg ICAgICAgWEdUUkMoInZjcHU6JWQ6TVRGIGZhaWxlZC4gc2V0aXQ6JWRcbiIsIHdoaWNoX3ZjcHUs IHNldGl0KTsKKyAgICB9CisKICAgICBtZW1zZXQoJmFueWMsIDAsIHN6KTsKICAgICBkb21jdGwu dS52Y3B1Y29udGV4dC52Y3B1ID0gKHVpbnQxNl90KXdoaWNoX3ZjcHU7CiAgICAgc2V0X3hlbl9n dWVzdF9oYW5kbGUoZG9tY3RsLnUudmNwdWNvbnRleHQuY3R4dCwgJmFueWMuY3R4dCk7Cg== --MP_/W=ZuUODooyRImHG4sykhWne Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --MP_/W=ZuUODooyRImHG4sykhWne--