From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH v5 06/13] x86: simplify guest_has_trap_callback Date: Mon, 26 Jun 2017 17:28:35 +0100 Message-ID: <20170626162842.482-7-wei.liu2@citrix.com> References: <20170626162842.482-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 1dPWt1-00059G-Ah for xen-devel@lists.xenproject.org; Mon, 26 Jun 2017 16:29:15 +0000 In-Reply-To: <20170626162842.482-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 VGhlcmUgaXMgb25seSBvbmUgY2FsbGVyIGZvciB0aGF0IGZ1bmN0aW9uLiBTaW1wbGlmeSB0aGUg ZnVuY3Rpb24sCm1vdmUgaXQgY2xvc2UgdG8gdGhlIGNhbGxlciBhbmQgcmVuYW1lIGl0LgoKU2ln bmVkLW9mZi1ieTogV2VpIExpdSA8d2VpLmxpdTJAY2l0cml4LmNvbT4KLS0tCiB4ZW4vYXJjaC94 ODYvY3B1L21jaGVjay92bWNlLmMgfCAxMSArKysrKysrKysrLQogeGVuL2FyY2gveDg2L3RyYXBz LmMgICAgICAgICAgIHwgMTggLS0tLS0tLS0tLS0tLS0tLS0tCiB4ZW4vaW5jbHVkZS9hc20teDg2 L3RyYXBzLmggICAgfCAgOCAtLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCAxMCBpbnNlcnRpb25z KCspLCAyNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvY3B1L21jaGVj ay92bWNlLmMgYi94ZW4vYXJjaC94ODYvY3B1L21jaGVjay92bWNlLmMKaW5kZXggZDU5MWQzMTYw MC4uMzY4Mjg1ODEwYSAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L2NwdS9tY2hlY2svdm1jZS5j CisrKyBiL3hlbi9hcmNoL3g4Ni9jcHUvbWNoZWNrL3ZtY2UuYwpAQCAtMzU5LDYgKzM1OSwxNSBA QCBzdGF0aWMgaW50IHZtY2VfbG9hZF92Y3B1X2N0eHQoc3RydWN0IGRvbWFpbiAqZCwgaHZtX2Rv bWFpbl9jb250ZXh0X3QgKmgpCiBIVk1fUkVHSVNURVJfU0FWRV9SRVNUT1JFKFZNQ0VfVkNQVSwg dm1jZV9zYXZlX3ZjcHVfY3R4dCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgdm1jZV9sb2Fk X3ZjcHVfY3R4dCwgMSwgSFZNU1JfUEVSX1ZDUFUpOwogCitzdGF0aWMgaW5saW5lIGJvb2wgcHZf Y2FsbGJhY2tfcmVnaXN0ZXJlZChjb25zdCBzdHJ1Y3QgdmNwdSAqdiwgdWludDhfdCB2ZWN0b3Ip Cit7CisjaWZkZWYgQ09ORklHX1BWCisgICAgcmV0dXJuIHYtPmFyY2gucHZfdmNwdS50cmFwX2N0 eHRbdmVjdG9yXS5hZGRyZXNzOworI2Vsc2UKKyAgICByZXR1cm4gZmFsc2U7CisjZW5kaWYKK30K KwogLyoKICAqIGZvciBJbnRlbCBNQ0UsIGJyb2FkY2FzdCB2TUNFIHRvIGFsbCB2Y3B1cwogICog Zm9yIEFNRCBNQ0UsIG9ubHkgaW5qZWN0IHZNQ0UgdG8gdmNwdTAKQEAgLTM4Myw3ICszOTIsNyBA QCBpbnQgaW5qZWN0X3ZtY2Uoc3RydWN0IGRvbWFpbiAqZCwgaW50IHZjcHUpCiAgICAgICAgICAg ICBjb250aW51ZTsKIAogICAgICAgICBpZiAoIChpc19odm1fZG9tYWluKGQpIHx8Ci0gICAgICAg ICAgICAgIGd1ZXN0X2hhc190cmFwX2NhbGxiYWNrKGQsIHYtPnZjcHVfaWQsIFRSQVBfbWFjaGlu ZV9jaGVjaykpICYmCisgICAgICAgICAgICAgIHB2X2NhbGxiYWNrX3JlZ2lzdGVyZWQodiwgVFJB UF9tYWNoaW5lX2NoZWNrKSkgJiYKICAgICAgICAgICAgICAhdGVzdF9hbmRfc2V0X2Jvb2wodi0+ bWNlX3BlbmRpbmcpICkKICAgICAgICAgewogICAgICAgICAgICAgbWNlX3ByaW50ayhNQ0VfVkVS Qk9TRSwgIk1DRTogaW5qZWN0IHZNQ0UgdG8gJXB2XG4iLCB2KTsKZGlmZiAtLWdpdCBhL3hlbi9h cmNoL3g4Ni90cmFwcy5jIGIveGVuL2FyY2gveDg2L3RyYXBzLmMKaW5kZXggYzQzZjNmMTA5NS4u ZjNjNWRlNmYyYyAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L3RyYXBzLmMKKysrIGIveGVuL2Fy Y2gveDg2L3RyYXBzLmMKQEAgLTIwMDgsMjQgKzIwMDgsNiBAQCBsb25nIHVucmVnaXN0ZXJfZ3Vl c3Rfbm1pX2NhbGxiYWNrKHZvaWQpCiAgICAgcmV0dXJuIDA7CiB9CiAKLWludCBndWVzdF9oYXNf dHJhcF9jYWxsYmFjayhzdHJ1Y3QgZG9tYWluICpkLCB1aW50MTZfdCB2Y3B1aWQsIHVuc2lnbmVk IGludCB0cmFwX25yKQotewotICAgIHN0cnVjdCB2Y3B1ICp2OwotICAgIHN0cnVjdCB0cmFwX2lu Zm8gKnQ7Ci0KLSAgICBCVUdfT04oZCA9PSBOVUxMKTsKLSAgICBCVUdfT04odmNwdWlkID49IGQt Pm1heF92Y3B1cyk7Ci0KLSAgICAvKiBTYW5pdHkgY2hlY2sgLSBYWFggc2hvdWxkIGJlIG1vcmUg ZmluZSBncmFpbmVkLiAqLwotICAgIEJVR19PTih0cmFwX25yID49IE5SX1ZFQ1RPUlMpOwotCi0g ICAgdiA9IGQtPnZjcHVbdmNwdWlkXTsKLSAgICB0ID0gJnYtPmFyY2gucHZfdmNwdS50cmFwX2N0 eHRbdHJhcF9ucl07Ci0KLSAgICByZXR1cm4gKHQtPmFkZHJlc3MgIT0gMCk7Ci19Ci0KLQogaW50 IHNlbmRfZ3Vlc3RfdHJhcChzdHJ1Y3QgZG9tYWluICpkLCB1aW50MTZfdCB2Y3B1aWQsIHVuc2ln bmVkIGludCB0cmFwX25yKQogewogICAgIHN0cnVjdCB2Y3B1ICp2OwpkaWZmIC0tZ2l0IGEveGVu L2luY2x1ZGUvYXNtLXg4Ni90cmFwcy5oIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni90cmFwcy5oCmlu ZGV4IDg5M2I0ZGJlNzcuLmNjMWQ3ZDAxZDkgMTAwNjQ0Ci0tLSBhL3hlbi9pbmNsdWRlL2FzbS14 ODYvdHJhcHMuaAorKysgYi94ZW4vaW5jbHVkZS9hc20teDg2L3RyYXBzLmgKQEAgLTI5LDE0ICsy OSw2IEBAIHN0cnVjdCBjcHVfdXNlcl9yZWdzOwogCiB2b2lkIGFzeW5jX2V4Y2VwdGlvbl9jbGVh bnVwKHN0cnVjdCB2Y3B1ICopOwogIAotLyoqCi0gKiBndWVzdF9oYXNfdHJhcF9jYWxsYmFjawot ICoKLSAqIHJldHVybnMgdHJ1ZSAobm9uLXplcm8pIGlmIGd1ZXN0IHJlZ2lzdGVyZWQgYSB0cmFw IGhhbmRsZXIKLSAqLwotZXh0ZXJuIGludCBndWVzdF9oYXNfdHJhcF9jYWxsYmFjayhzdHJ1Y3Qg ZG9tYWluICpkLCB1aW50MTZfdCB2Y3B1aWQsCi0JCQkJdW5zaWduZWQgaW50IHRyYXBfbnIpOwot CiAvKioKICAqIHNlbmRfZ3Vlc3RfdHJhcAogICoKLS0gCjIuMTEuMAoKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QK WGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=