From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Stabellini Subject: [PATCH 2/2] Partially revert 21550029f709072aacf3b90edd574e7d3021b400 Date: Tue, 25 Oct 2016 15:46:55 -0700 Message-ID: <1477435615-28752-2-git-send-email-sstabellini@kernel.org> References: <1477435615-28752-1-git-send-email-sstabellini@kernel.org> 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 1bzAUq-00039n-E9 for xen-devel@lists.xenproject.org; Tue, 25 Oct 2016 22:47:04 +0000 In-Reply-To: <1477435615-28752-1-git-send-email-sstabellini@kernel.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: julien.grall@arm.com, sstabellini@kernel.org, wei.liu2@citrix.com List-Id: xen-devel@lists.xenproject.org Q29tbWl0IDIxNTUwMDI5ZjcwOTA3MmFhY2YzYjkwZWRkNTc0ZTdkMzAyMWI0MDAgcmVtb3ZlZCB0 aGUKUExBVEZPUk1fUVVJUktfR0lDXzY0S19TVFJJREUgcXVpcmsgYW5kIGludHJvZHVjZWQgYSB3 YXkgdG8KYXV0b21hdGljYWxseSBkZXRlY3QgdGhhdCB0aGUgdHdvIEdJQ0MgcGFnZXMgaGF2ZSBh IDY0SyBzdHJpZGUuCgpIb3dldmVyIHRoZSBoZXVyaXN0aWMgcmVxdWlyZXMgdGhhdCB0aGUgZGV2 aWNlIHRyZWUgZm9yIHRoZSBwbGF0Zm9ybQpyZXBvcnRzIGEgR0lDQyBzaXplID09IDEyOEssIHdo aWNoIGlzIG5vdCB0aGUgY2FzZSBmb3Igc29tZSB2ZXJzaW9ucyBvZgpYR2VuZS4KCkZpeCB0aGUg aXNzdWUgYnkgcGFydGlhbGx5IHJldmVydGluZwoyMTU1MDAyOWY3MDkwNzJhYWNmM2I5MGVkZDU3 NGU3ZDMwMjFiNDAwOgoKLSByZWludHJvZHVjZSBQTEFURk9STV9RVUlSS19HSUNfNjRLX1NUUklE RSBmb3IgWEdlbmUKLSBmb3JjZSBjc2l6ZSB0byBTWl8xMjhLIGZvciBtYXBwaW5nIGlmIFBMQVRG T1JNX1FVSVJLX0dJQ182NEtfU1RSSURFCgpTaWduZWQtb2ZmLWJ5OiBTdGVmYW5vIFN0YWJlbGxp bmkgPHNzdGFiZWxsaW5pQGtlcm5lbC5vcmc+Ci0tLQogeGVuL2FyY2gvYXJtL2dpYy12Mi5jICAg ICAgICAgICAgICAgIHwgMTAgKysrKysrKystLQogeGVuL2FyY2gvYXJtL3BsYXRmb3Jtcy94Z2Vu ZS1zdG9ybS5jIHwgIDYgKysrKysrCiB4ZW4vaW5jbHVkZS9hc20tYXJtL3BsYXRmb3JtLmggICAg ICAgfCAgNiArKysrKysKIDMgZmlsZXMgY2hhbmdlZCwgMjAgaW5zZXJ0aW9ucygrKSwgMiBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS94ZW4vYXJjaC9hcm0vZ2ljLXYyLmMgYi94ZW4vYXJjaC9h cm0vZ2ljLXYyLmMKaW5kZXggOWJkOWQwYi4uMmM2YjhmMSAxMDA2NDQKLS0tIGEveGVuL2FyY2gv YXJtL2dpYy12Mi5jCisrKyBiL3hlbi9hcmNoL2FybS9naWMtdjIuYwpAQCAtMTE0Niw2ICsxMTQ2 LDcgQEAgc3RhdGljIGludCBnaWN2Ml9tYWtlX2h3ZG9tX21hZHQoY29uc3Qgc3RydWN0IGRvbWFp biAqZCwgdTMyIG9mZnNldCkKIHN0YXRpYyBpbnQgX19pbml0IGdpY3YyX2luaXQodm9pZCkKIHsK ICAgICB1aW50MzJfdCBhbGlhc2VkX29mZnNldCA9IDA7CisgICAgcGFkZHJfdCBjc2l6ZV9tYXA7 CiAKICAgICBpZiAoIGFjcGlfZGlzYWJsZWQgKQogICAgICAgICBnaWN2Ml9kdF9pbml0KCk7CkBA IC0xMTY1LDE1ICsxMTY2LDIwIEBAIHN0YXRpYyBpbnQgX19pbml0IGdpY3YyX2luaXQodm9pZCkK ICAgICAgICAgIChoYmFzZSAmIH5QQUdFX01BU0spIHx8ICh2YmFzZSAmIH5QQUdFX01BU0spICkK ICAgICAgICAgcGFuaWMoIkdJQ3YyIGludGVyZmFjZXMgbm90IHBhZ2UgYWxpZ25lZCIpOwogCisg ICAgaWYgKCBwbGF0Zm9ybV9oYXNfcXVpcmsoUExBVEZPUk1fUVVJUktfR0lDXzY0S19TVFJJREUp ICkKKyAgICAgICAgY3NpemVfbWFwID0gU1pfMTI4SzsKKyAgICBlbHNlCisgICAgICAgIGNzaXpl X21hcCA9IGNzaXplOworCiAgICAgZ2ljdjIubWFwX2RiYXNlID0gaW9yZW1hcF9ub2NhY2hlKGRi YXNlLCBQQUdFX1NJWkUpOwogICAgIGlmICggIWdpY3YyLm1hcF9kYmFzZSApCiAgICAgICAgIHBh bmljKCJHSUN2MjogRmFpbGVkIHRvIGlvcmVtYXAgZm9yIEdJQyBkaXN0cmlidXRvclxuIik7CiAK LSAgICBnaWN2Mi5tYXBfY2Jhc2UgPSBpb3JlbWFwX25vY2FjaGUoY2Jhc2UsIGNzaXplKTsKKyAg ICBnaWN2Mi5tYXBfY2Jhc2UgPSBpb3JlbWFwX25vY2FjaGUoY2Jhc2UsIGNzaXplX21hcCk7CiAg ICAgaWYgKCAhZ2ljdjIubWFwX2NiYXNlICkKICAgICAgICAgcGFuaWMoIkdJQ3YyOiBGYWlsZWQg dG8gaW9yZW1hcCBmb3IgR0lDIENQVSBpbnRlcmZhY2VcbiIpOwogCi0gICAgaWYgKCBnaWN2Ml9p c19hbGlhc2VkKGNiYXNlLCBjc2l6ZSkgKQorICAgIGlmICggZ2ljdjJfaXNfYWxpYXNlZChjYmFz ZSwgY3NpemVfbWFwKSApCiAgICAgewogICAgICAgICAvKgogICAgICAgICAgKiBNb3ZlIHRoZSBi YXNlIHVwIGJ5IDYwa0IsIHNvIHRoYXQgd2UgaGF2ZSBhIDhrQiBjb250aWd1b3VzCmRpZmYgLS1n aXQgYS94ZW4vYXJjaC9hcm0vcGxhdGZvcm1zL3hnZW5lLXN0b3JtLmMgYi94ZW4vYXJjaC9hcm0v cGxhdGZvcm1zL3hnZW5lLXN0b3JtLmMKaW5kZXggNjg2YjE5Yi4uYzc5NWE5NSAxMDA2NDQKLS0t IGEveGVuL2FyY2gvYXJtL3BsYXRmb3Jtcy94Z2VuZS1zdG9ybS5jCisrKyBiL3hlbi9hcmNoL2Fy bS9wbGF0Zm9ybXMveGdlbmUtc3Rvcm0uYwpAQCAtNjcsNiArNjcsMTEgQEAgc3RhdGljIHZvaWQg X19pbml0IHhnZW5lX2NoZWNrX3BpcnFfZW9pKHZvaWQpCiAgICAgICAgICAgICAgICJQbGVhc2Ug dXBncmFkZSB5b3VyIGZpcm13YXJlIHRvIHRoZSBsYXRlc3QgdmVyc2lvbiIpOwogfQogCitzdGF0 aWMgdWludDMyX3QgeGdlbmVfc3Rvcm1fcXVpcmtzKHZvaWQpCit7CisgICAgcmV0dXJuIFBMQVRG T1JNX1FVSVJLX0dJQ182NEtfU1RSSURFOworfQorCiBzdGF0aWMgdm9pZCB4Z2VuZV9zdG9ybV9y ZXNldCh2b2lkKQogewogICAgIHZvaWQgX19pb21lbSAqYWRkcjsKQEAgLTExNiw2ICsxMjEsNyBA QCBQTEFURk9STV9TVEFSVCh4Z2VuZV9zdG9ybSwgIkFQTSBYLUdFTkUgU1RPUk0iKQogICAgIC5j b21wYXRpYmxlID0geGdlbmVfc3Rvcm1fZHRfY29tcGF0LAogICAgIC5pbml0ID0geGdlbmVfc3Rv cm1faW5pdCwKICAgICAucmVzZXQgPSB4Z2VuZV9zdG9ybV9yZXNldCwKKyAgICAucXVpcmtzID0g eGdlbmVfc3Rvcm1fcXVpcmtzLAogUExBVEZPUk1fRU5ECiAKIC8qCmRpZmYgLS1naXQgYS94ZW4v aW5jbHVkZS9hc20tYXJtL3BsYXRmb3JtLmggYi94ZW4vaW5jbHVkZS9hc20tYXJtL3BsYXRmb3Jt LmgKaW5kZXggYzZlNTAxMC4uMmVhOWQ2MSAxMDA2NDQKLS0tIGEveGVuL2luY2x1ZGUvYXNtLWFy bS9wbGF0Zm9ybS5oCisrKyBiL3hlbi9pbmNsdWRlL2FzbS1hcm0vcGxhdGZvcm0uaApAQCAtMzks NiArMzksMTIgQEAgc3RydWN0IHBsYXRmb3JtX2Rlc2MgewogICAgIGNvbnN0IHN0cnVjdCBkdF9k ZXZpY2VfbWF0Y2ggKmJsYWNrbGlzdF9kZXY7CiB9OwogCisvKgorICogUXVpcmsgZm9yIHBsYXRm b3JtcyB3aGVyZSB0aGUgNEsgR0lDIHJlZ2lzdGVyIHJhbmdlcyBhcmUgcGxhY2VkIGF0CisgKiA2 NEsgc3RyaWRlLgorICovCisjZGVmaW5lIFBMQVRGT1JNX1FVSVJLX0dJQ182NEtfU1RSSURFICgx IDw8IDApCisKIHZvaWQgX19pbml0IHBsYXRmb3JtX2luaXQodm9pZCk7CiBpbnQgX19pbml0IHBs YXRmb3JtX2luaXRfdGltZSh2b2lkKTsKIGludCBfX2luaXQgcGxhdGZvcm1fc3BlY2lmaWNfbWFw cGluZyhzdHJ1Y3QgZG9tYWluICpkKTsKLS0gCjEuOS4xCgoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2 ZWxAbGlzdHMueGVuLm9yZwpodHRwczovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg==