From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Jan Beulich" Subject: [PATCH 3/4] x86: reduce code duplication in guest_remove_page() Date: Tue, 20 Nov 2018 09:19:23 -0700 Message-ID: <5BF4340B02000078001FE273@prv1-mh.provo.novell.com> References: <5BF4328902000078001FE240@prv1-mh.provo.novell.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1gP8kJ-0008Ov-W8 for xen-devel@lists.xenproject.org; Tue, 20 Nov 2018 16:19:28 +0000 In-Reply-To: <5BF4328902000078001FE240@prv1-mh.provo.novell.com> Content-Disposition: inline List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: xen-devel Cc: Stefano Stabellini , Wei Liu , Konrad Rzeszutek Wilk , George Dunlap , Andrew Cooper , Ian Jackson , Tim Deegan , Julien Grall List-Id: xen-devel@lists.xenproject.org UXVpdGUgYSBiaXQgb2YgZHVwbGljYXRlIGNvZGUgaGFzIGFjY3VtdWxhdGVkIG9uIHRoZSAicGFn aW5nIiB0eXBlcwpzcGVjaWFsIGNhc2UgcGF0aC4gUmUtdXNlIHdoYXQgY2FuIGJlIHJlLXVzZWQg ZnJvbSB0aGUgY29tbW9uIHBhdGguCgpTaW5jZSBpdCBuZWVkcyB0b3VjaGluZyBhbnl3YXksIHNs aWdodGx5IHJlLWZvcm1hdCBhbmQgZXh0ZW5kIHRoZQpnZHByaW50aygpIG9uIHRoZSBjb21tb24g cGF0aCBhcyB3ZWxsLgoKU2lnbmVkLW9mZi1ieTogSmFuIEJldWxpY2ggPGpiZXVsaWNoQHN1c2Uu Y29tPgoKLS0tIGEveGVuL2NvbW1vbi9tZW1vcnkuYworKysgYi94ZW4vY29tbW9uL21lbW9yeS5j CkBAIC0zMjAsMzAgKzMyMCwxNSBAQCBpbnQgZ3Vlc3RfcmVtb3ZlX3BhZ2Uoc3RydWN0IGRvbWFp biAqZCwKICAgICAgICAgaWYgKCBwMm10ID09IHAybV9yYW1fcGFnaW5nX291dCApCiAgICAgICAg IHsKICAgICAgICAgICAgIEFTU0VSVChtZm5fdmFsaWQobWZuKSk7Ci0gICAgICAgICAgICBwYWdl ID0gbWZuX3RvX3BhZ2UobWZuKTsKLSAgICAgICAgICAgIHJjID0gLUVOWElPOwotICAgICAgICAg ICAgaWYgKCAhZ2V0X3BhZ2UocGFnZSwgZCkgKQotICAgICAgICAgICAgICAgIGdvdG8gb3V0X3B1 dF9nZm47CisgICAgICAgICAgICBnb3RvIG9idGFpbl9wYWdlOwogICAgICAgICB9Ci0gICAgICAg IGVsc2UKLSAgICAgICAgICAgIHBhZ2UgPSBOVUxMOwogCiAgICAgICAgIHJjID0gZ3Vlc3RfcGh5 c21hcF9yZW1vdmVfcGFnZShkLCBfZ2ZuKGdtZm4pLCBtZm4sIDApOwogICAgICAgICBpZiAoIHJj ICkKLSAgICAgICAgewotICAgICAgICAgICAgaWYgKCBwYWdlICkKLSAgICAgICAgICAgICAgICBw dXRfcGFnZShwYWdlKTsKICAgICAgICAgICAgIGdvdG8gb3V0X3B1dF9nZm47Ci0gICAgICAgIH0K IAogICAgICAgICBwdXRfZ2ZuKGQsIGdtZm4pOwogCi0gICAgICAgIGlmICggcGFnZSApCi0gICAg ICAgIHsKLSAgICAgICAgICAgIGlmICggdGVzdF9hbmRfY2xlYXJfYml0KF9QR0NfYWxsb2NhdGVk LCAmcGFnZS0+Y291bnRfaW5mbykgKQotICAgICAgICAgICAgICAgIHB1dF9wYWdlKHBhZ2UpOwot ICAgICAgICAgICAgcHV0X3BhZ2UocGFnZSk7Ci0gICAgICAgIH0KICAgICAgICAgcDJtX21lbV9w YWdpbmdfZHJvcF9wYWdlKGQsIGdtZm4sIHAybXQpOwogCiAgICAgICAgIHJldHVybiAwOwpAQCAt Mzg1LDExICszNzAsMTYgQEAgaW50IGd1ZXN0X3JlbW92ZV9wYWdlKHN0cnVjdCBkb21haW4gKmQs CiAgICAgfQogI2VuZGlmIC8qIENPTkZJR19YODYgKi8KIAorIG9idGFpbl9wYWdlOiBfX21heWJl X3VudXNlZDsKICAgICBwYWdlID0gbWZuX3RvX3BhZ2UobWZuKTsKICAgICBpZiAoIHVubGlrZWx5 KCFnZXRfcGFnZShwYWdlLCBkKSkgKQogICAgIHsKICAgICAgICAgcHV0X2dmbihkLCBnbWZuKTsK LSAgICAgICAgZ2RwcmludGsoWEVOTE9HX0lORk8sICJCYWQgcGFnZSBmcmVlIGZvciBkb21haW4g JXVcbiIsIGQtPmRvbWFpbl9pZCk7CisjaWZkZWYgQ09ORklHX1g4NgorICAgICAgICBpZiAoICFw Mm1faXNfcGFnaW5nKHAybXQpICkKKyNlbmRpZgorICAgICAgICAgICAgZ2RwcmludGsoWEVOTE9H X0lORk8sICJCYWQgcGFnZSBmcmVlIGZvciBEb20ldSBHRk4gJWx4XG4iLAorICAgICAgICAgICAg ICAgICAgICAgZC0+ZG9tYWluX2lkLCBnbWZuKTsKIAogICAgICAgICByZXR1cm4gLUVOWElPOwog ICAgIH0KCgoKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpo dHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs