From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Stabellini Subject: [PATCH v3 2/2] Partially revert 21550029f709072aacf3b90edd574e7d3021b400 Date: Tue, 8 Nov 2016 11:42:43 -0800 Message-ID: <1478634163-27368-2-git-send-email-sstabellini@kernel.org> References: <1478634163-27368-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.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1c4CIE-0001sT-Vc for xen-devel@lists.xenproject.org; Tue, 08 Nov 2016 19:42:51 +0000 In-Reply-To: <1478634163-27368-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 RSBmb3IgWEdlbmUKLSBmb3JjZSBjc2l6ZSBhbmQgdnNpemUgdG8gU1pfMTI4SyBpZiBjc2l6ZSBp cyBpbml0aWFsbHkgNEsgYW5kIGlmCiAgUExBVEZPUk1fUVVJUktfR0lDXzY0S19TVFJJREUKCkFs c28gYWRkIGEgd2FybmluZyBpbiBjYXNlIEdJQ0MgaXMgU1pfMTI4SyBidXQgbm90IGFsaWFzZWQu CgpTaWduZWQtb2ZmLWJ5OiBTdGVmYW5vIFN0YWJlbGxpbmkgPHNzdGFiZWxsaW5pQGtlcm5lbC5v cmc+ClJlbGVhc2UtYWNrZWQtYnk6IFdlaSBMaXUgPHdlaS5saXUyQGNpdHJpeC5jb20+CgotLS0K CkNoYW5nZXMgaW4gdjM6Ci0gYWRkIGEgd2FybmluZyB3aGVuIGVuYWJsaW5nIHRoZSBxdWlyawot IHVwZGF0ZSBjb21tZW50IHRvIG1hdGNoIHRoZSBuZXcgYmVoYXZpb3Igb2YgdGhlIHF1aXJrCgpD aGFuZ2VzIGluIHYyOgotIG9ubHkgc2V0IGNzaXplIHRvIFNaXzEyOEsgaWYgaXQgaXMgaW5pdGlh bGx5IFNaXzRLCi0gc2V0IHZzaXplIHRvIG1hdGNoCi0gYWRkIHdhcm5pbmcgaWYgZ2ljYyBpcyBT Wl8xMjhLIGFuZCBub3QgYWxpYXNlZAotLS0KIHhlbi9hcmNoL2FybS9naWMtdjIuYyAgICAgICAg ICAgICAgICB8IDEyICsrKysrKysrKystLQogeGVuL2FyY2gvYXJtL3BsYXRmb3Jtcy94Z2VuZS1z dG9ybS5jIHwgIDYgKysrKysrCiB4ZW4vaW5jbHVkZS9hc20tYXJtL3BsYXRmb3JtLmggICAgICAg fCAgNyArKysrKysrCiAzIGZpbGVzIGNoYW5nZWQsIDIzIGluc2VydGlvbnMoKyksIDIgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gvYXJtL2dpYy12Mi5jIGIveGVuL2FyY2gvYXJt L2dpYy12Mi5jCmluZGV4IDliZDlkMGIuLmJjYTZkMjcgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL2Fy bS9naWMtdjIuYworKysgYi94ZW4vYXJjaC9hcm0vZ2ljLXYyLmMKQEAgLTk2NSw3ICs5NjUsMTIg QEAgc3RhdGljIHZvaWQgX19pbml0IGdpY3YyX2R0X2luaXQodm9pZCkKICAgICAgICAgcHJpbnRr KFhFTkxPR19XQVJOSU5HICJHSUN2MjogV0FSTklORzogIgogICAgICAgICAgICAgICAgIlRoZSBH SUNDIHNpemUgaXMgdG9vIHNtYWxsOiAlIyJQUkl4NjQiIGV4cGVjdGVkICUjeFxuIiwKICAgICAg ICAgICAgICAgIGNzaXplLCBTWl84Syk7Ci0gICAgICAgIGNzaXplID0gU1pfOEs7CisgICAgICAg IGlmICggcGxhdGZvcm1faGFzX3F1aXJrKFBMQVRGT1JNX1FVSVJLX0dJQ182NEtfU1RSSURFKSAp CisgICAgICAgIHsKKyAgICAgICAgICAgIHByaW50ayhYRU5MT0dfV0FSTklORyAiR0lDdjI6IGVu YWJsZSBwbGF0Zm9ybSBxdWlyazogNjRLIHN0cmlkZVxuIik7CisgICAgICAgICAgICB2c2l6ZSA9 IGNzaXplID0gU1pfMTI4SzsKKyAgICAgICAgfSBlbHNlCisgICAgICAgICAgICBjc2l6ZSA9IFNa XzhLOwogICAgIH0KIAogICAgIC8qCkBAIC0xMTg5LDcgKzExOTQsMTAgQEAgc3RhdGljIGludCBf X2luaXQgZ2ljdjJfaW5pdCh2b2lkKQogICAgICAgICBwcmludGsoWEVOTE9HX1dBUk5JTkcKICAg ICAgICAgICAgICAgICJHSUN2MjogQWRqdXN0aW5nIENQVSBpbnRlcmZhY2UgYmFzZSB0byAlIyJQ Ukl4NjQiXG4iLAogICAgICAgICAgICAgICAgY2Jhc2UgKyBhbGlhc2VkX29mZnNldCk7Ci0gICAg fQorICAgIH0gZWxzZSBpZiAoIGNzaXplID09IFNaXzEyOEsgKQorICAgICAgICBwcmludGsoWEVO TE9HX1dBUk5JTkcKKyAgICAgICAgICAgICAgICAiR0lDdjI6IEdJQ0Mgc2l6ZT0lbHUgYnV0IG5v dCBhbGlhc2VkXG4iLAorICAgICAgICAgICAgICAgIGNzaXplKTsKIAogICAgIGdpY3YyLm1hcF9o YmFzZSA9IGlvcmVtYXBfbm9jYWNoZShoYmFzZSwgUEFHRV9TSVpFKTsKICAgICBpZiAoICFnaWN2 Mi5tYXBfaGJhc2UgKQpkaWZmIC0tZ2l0IGEveGVuL2FyY2gvYXJtL3BsYXRmb3Jtcy94Z2VuZS1z dG9ybS5jIGIveGVuL2FyY2gvYXJtL3BsYXRmb3Jtcy94Z2VuZS1zdG9ybS5jCmluZGV4IDY4NmIx OWIuLmM3OTVhOTUgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL2FybS9wbGF0Zm9ybXMveGdlbmUtc3Rv cm0uYworKysgYi94ZW4vYXJjaC9hcm0vcGxhdGZvcm1zL3hnZW5lLXN0b3JtLmMKQEAgLTY3LDYg KzY3LDExIEBAIHN0YXRpYyB2b2lkIF9faW5pdCB4Z2VuZV9jaGVja19waXJxX2VvaSh2b2lkKQog ICAgICAgICAgICAgICAiUGxlYXNlIHVwZ3JhZGUgeW91ciBmaXJtd2FyZSB0byB0aGUgbGF0ZXN0 IHZlcnNpb24iKTsKIH0KIAorc3RhdGljIHVpbnQzMl90IHhnZW5lX3N0b3JtX3F1aXJrcyh2b2lk KQoreworICAgIHJldHVybiBQTEFURk9STV9RVUlSS19HSUNfNjRLX1NUUklERTsKK30KKwogc3Rh dGljIHZvaWQgeGdlbmVfc3Rvcm1fcmVzZXQodm9pZCkKIHsKICAgICB2b2lkIF9faW9tZW0gKmFk ZHI7CkBAIC0xMTYsNiArMTIxLDcgQEAgUExBVEZPUk1fU1RBUlQoeGdlbmVfc3Rvcm0sICJBUE0g WC1HRU5FIFNUT1JNIikKICAgICAuY29tcGF0aWJsZSA9IHhnZW5lX3N0b3JtX2R0X2NvbXBhdCwK ICAgICAuaW5pdCA9IHhnZW5lX3N0b3JtX2luaXQsCiAgICAgLnJlc2V0ID0geGdlbmVfc3Rvcm1f cmVzZXQsCisgICAgLnF1aXJrcyA9IHhnZW5lX3N0b3JtX3F1aXJrcywKIFBMQVRGT1JNX0VORAog CiAvKgpkaWZmIC0tZ2l0IGEveGVuL2luY2x1ZGUvYXNtLWFybS9wbGF0Zm9ybS5oIGIveGVuL2lu Y2x1ZGUvYXNtLWFybS9wbGF0Zm9ybS5oCmluZGV4IGM2ZTUwMTAuLjA4MDEwYmEgMTAwNjQ0Ci0t LSBhL3hlbi9pbmNsdWRlL2FzbS1hcm0vcGxhdGZvcm0uaAorKysgYi94ZW4vaW5jbHVkZS9hc20t YXJtL3BsYXRmb3JtLmgKQEAgLTM5LDYgKzM5LDEzIEBAIHN0cnVjdCBwbGF0Zm9ybV9kZXNjIHsK ICAgICBjb25zdCBzdHJ1Y3QgZHRfZGV2aWNlX21hdGNoICpibGFja2xpc3RfZGV2OwogfTsKIAor LyoKKyAqIFF1aXJrIGZvciBwbGF0Zm9ybXMgd2hlcmUgZGV2aWNlIHRyZWUgaW5jb3JyZWN0bHkg cmVwb3J0cyA0SyBHSUNDCisgKiBzaXplLCBidXQgYWN0dWFsbHkgdGhlIHR3byBHSUNDIHJlZ2lz dGVyIHJhbmdlcyBhcmUgcGxhY2VkIGF0IDY0SworICogc3RyaWRlLgorICovCisjZGVmaW5lIFBM QVRGT1JNX1FVSVJLX0dJQ182NEtfU1RSSURFICgxIDw8IDApCisKIHZvaWQgX19pbml0IHBsYXRm b3JtX2luaXQodm9pZCk7CiBpbnQgX19pbml0IHBsYXRmb3JtX2luaXRfdGltZSh2b2lkKTsKIGlu dCBfX2luaXQgcGxhdGZvcm1fc3BlY2lmaWNfbWFwcGluZyhzdHJ1Y3QgZG9tYWluICpkKTsKLS0g CjEuOS4xCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K WGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwczovL2xp c3RzLnhlbi5vcmcveGVuLWRldmVsCg==