From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH v2 15/18] x86: clean up pv/traps.c Date: Fri, 5 May 2017 15:48:33 +0100 Message-ID: <20170505144836.8612-16-wei.liu2@citrix.com> References: <20170505144836.8612-1-wei.liu2@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d6eyu-0004Uu-Lg for xen-devel@lists.xenproject.org; Fri, 05 May 2017 15:17:20 +0000 In-Reply-To: <20170505144836.8612-1-wei.liu2@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: Xen-devel Cc: Andrew Cooper , Wei Liu , Jan Beulich List-Id: xen-devel@lists.xenproject.org Rml4IGNvZGluZyBzdHlsZSBpc3N1ZXMuCgpObyBmdW5jdGlvbmFsIGNoYW5nZS4KClNpZ25lZC1v ZmYtYnk6IFdlaSBMaXUgPHdlaS5saXUyQGNpdHJpeC5jb20+Ci0tLQogeGVuL2FyY2gveDg2L3B2 L3RyYXBzLmMgfCAyNSArKysrKysrKysrKysrLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwg MTMgaW5zZXJ0aW9ucygrKSwgMTIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gv eDg2L3B2L3RyYXBzLmMgYi94ZW4vYXJjaC94ODYvcHYvdHJhcHMuYwppbmRleCA4Y2FiZWY3YTQ0 Li44YWE0ZDllMzM1IDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvcHYvdHJhcHMuYworKysgYi94 ZW4vYXJjaC94ODYvcHYvdHJhcHMuYwpAQCAtMjk0LDEyICsyOTQsMTIgQEAgaW50IHNlbmRfZ3Vl c3RfdHJhcChzdHJ1Y3QgZG9tYWluICpkLCB1aW50MTZfdCB2Y3B1aWQsIHVuc2lnbmVkIGludCB0 cmFwX25yKQogICAgICAgICAgICAgcmV0dXJuIC1FQlVTWTsKICAgICAgICAgaWYgKCAhdGVzdF9h bmRfc2V0X2Jvb2wodi0+bm1pX3BlbmRpbmcpICkKICAgICAgICAgewotICAgICAgICAgICAgICAg c3QtPmRvbWFpbiA9IGQ7Ci0gICAgICAgICAgICAgICBzdC0+cHJvY2Vzc29yID0gdi0+cHJvY2Vz c29yOworICAgICAgICAgICAgc3QtPmRvbWFpbiA9IGQ7CisgICAgICAgICAgICBzdC0+cHJvY2Vz c29yID0gdi0+cHJvY2Vzc29yOwogCi0gICAgICAgICAgICAgICAvKiBub3Qgc2FmZSB0byB3YWtl IHVwIGEgdmNwdSBoZXJlICovCi0gICAgICAgICAgICAgICByYWlzZV9zb2Z0aXJxKE5NSV9NQ0Vf U09GVElSUSk7Ci0gICAgICAgICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgICAgIC8qIG5vdCBz YWZlIHRvIHdha2UgdXAgYSB2Y3B1IGhlcmUgKi8KKyAgICAgICAgICAgIHJhaXNlX3NvZnRpcnEo Tk1JX01DRV9TT0ZUSVJRKTsKKyAgICAgICAgICAgIHJldHVybiAwOwogICAgICAgICB9CiAgICAg ICAgIHN0LT52Y3B1ID0gTlVMTDsKICAgICAgICAgYnJlYWs7CkBAIC0zMDksMTYgKzMwOSwxNyBA QCBpbnQgc2VuZF9ndWVzdF90cmFwKHN0cnVjdCBkb21haW4gKmQsIHVpbnQxNl90IHZjcHVpZCwg dW5zaWduZWQgaW50IHRyYXBfbnIpCiAgICAgICAgICAgICByZXR1cm4gLUVCVVNZOwogCiAgICAg ICAgIC8qIFdlIGFyZSBjYWxsZWQgYnkgdGhlIG1hY2hpbmUgY2hlY2sgKGV4Y2VwdGlvbiBvciBw b2xsaW5nKSBoYW5kbGVycwotICAgICAgICAgKiBvbiB0aGUgcGh5c2ljYWwgQ1BVIHRoYXQgcmVw b3J0ZWQgYSBtYWNoaW5lIGNoZWNrIGVycm9yLiAqLworICAgICAgICAgKiBvbiB0aGUgcGh5c2lj YWwgQ1BVIHRoYXQgcmVwb3J0ZWQgYSBtYWNoaW5lIGNoZWNrIGVycm9yLgorICAgICAgICAgKi8K IAogICAgICAgICBpZiAoICF0ZXN0X2FuZF9zZXRfYm9vbCh2LT5tY2VfcGVuZGluZykgKQogICAg ICAgICB7Ci0gICAgICAgICAgICAgICAgc3QtPmRvbWFpbiA9IGQ7Ci0gICAgICAgICAgICAgICAg c3QtPnByb2Nlc3NvciA9IHYtPnByb2Nlc3NvcjsKKyAgICAgICAgICAgIHN0LT5kb21haW4gPSBk OworICAgICAgICAgICAgc3QtPnByb2Nlc3NvciA9IHYtPnByb2Nlc3NvcjsKIAotICAgICAgICAg ICAgICAgIC8qIG5vdCBzYWZlIHRvIHdha2UgdXAgYSB2Y3B1IGhlcmUgKi8KLSAgICAgICAgICAg ICAgICByYWlzZV9zb2Z0aXJxKE5NSV9NQ0VfU09GVElSUSk7Ci0gICAgICAgICAgICAgICAgcmV0 dXJuIDA7CisgICAgICAgICAgICAvKiBub3Qgc2FmZSB0byB3YWtlIHVwIGEgdmNwdSBoZXJlICov CisgICAgICAgICAgICByYWlzZV9zb2Z0aXJxKE5NSV9NQ0VfU09GVElSUSk7CisgICAgICAgICAg ICByZXR1cm4gMDsKICAgICAgICAgfQogICAgICAgICBzdC0+dmNwdSA9IE5VTEw7CiAgICAgICAg IGJyZWFrOwpAQCAtNzcyLDcgKzc3Myw3IEBAIHVuc2lnbmVkIGludCBjb21wYXRfaXJldCh2b2lk KQogCiAgICAgLyogUmVzdG9yZSBDUyBhbmQgRUlQLiAqLwogICAgIGlmICggdW5saWtlbHkoX19n ZXRfdXNlcihyZWdzLT5laXAsICh1MzIgKilyZWdzLT5yc3AgKyAxKSkgfHwKLSAgICAgICAgdW5s aWtlbHkoX19nZXRfdXNlcihyZWdzLT5jcywgKHUzMiAqKXJlZ3MtPnJzcCArIDIpKSApCisgICAg ICAgICB1bmxpa2VseShfX2dldF91c2VyKHJlZ3MtPmNzLCAodTMyICopcmVncy0+cnNwICsgMikp ICkKICAgICB7CiAgICAgICAgIGRvbWFpbl9jcmFzaCh2LT5kb21haW4pOwogICAgICAgICByZXR1 cm4gMDsKLS0gCjIuMTEuMAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcK aHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=