From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH 7/9] x86/pv: Merge the pv hypercall tables Date: Mon, 18 Jul 2016 10:51:43 +0100 Message-ID: <1468835505-7278-8-git-send-email-andrew.cooper3@citrix.com> References: <1468835505-7278-1-git-send-email-andrew.cooper3@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1468835505-7278-1-git-send-email-andrew.cooper3@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 , Jan Beulich List-Id: xen-devel@lists.xenproject.org Rm9yIHRoZSBzYW1lIHJlYXNvbiBhcyBjL3MgMzNhMjMxZTNmICJ4ODYvSFZNOiBmb2xkIGh5cGVy Y2FsbCB0YWJsZXMiLCB0aGlzCnJlbW92ZXMgdGhlIHJpc2sgb2YgYWNjaWRlbnRhbGx5IHVwZGF0 aW5nIG9ubHkgb25lIG9mIHRoZSB0YWJsZXMuCgpTaWduZWQtb2ZmLWJ5OiBBbmRyZXcgQ29vcGVy IDxhbmRyZXcuY29vcGVyM0BjaXRyaXguY29tPgotLS0KQ0M6IEphbiBCZXVsaWNoIDxKQmV1bGlj aEBzdXNlLmNvbT4KLS0tCiB4ZW4vYXJjaC94ODYvaHlwZXJjYWxsLmMgfCA3NSArKysrKysrKyst LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAx MyBpbnNlcnRpb25zKCspLCA2MiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94 ODYvaHlwZXJjYWxsLmMgYi94ZW4vYXJjaC94ODYvaHlwZXJjYWxsLmMKaW5kZXggODkyMDEyZC4u YjliZDU4ZCAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L2h5cGVyY2FsbC5jCisrKyBiL3hlbi9h cmNoL3g4Ni9oeXBlcmNhbGwuYwpAQCAtMTE0LDY0ICsxMTQsMTUgQEAgY29uc3QgdWludDhfdCBj b21wYXRfaHlwZXJjYWxsX2FyZ3NfdGFibGVbTlJfaHlwZXJjYWxsc10gPQogI3VuZGVmIEFSR1MK IAogI2RlZmluZSBIWVBFUkNBTEwoeCkgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBcCi0gICAgWyBfX0hZUEVSVklTT1JfICMjIHggXSA9IChoeXBlcmNhbGxf Zm5fdCAqKSBkb18gIyMgeAorICAgIFsgX19IWVBFUlZJU09SXyAjIyB4IF0gPSB7IChoeXBlcmNh bGxfZm5fdCAqKSBkb18gIyMgeCwgICAgICAgICBcCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgKGh5cGVyY2FsbF9mbl90ICopIGRvXyAjIyB4IH0KKyNkZWZpbmUgQ09NUEFUX0NBTEwo eCkgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAorICAgIFsg X19IWVBFUlZJU09SXyAjIyB4IF0gPSB7IChoeXBlcmNhbGxfZm5fdCAqKSBkb18gIyMgeCwgICAg ICAgICBcCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGh5cGVyY2FsbF9mbl90ICop IGNvbXBhdF8gIyMgeCB9CiAKICNkZWZpbmUgZG9fYXJjaF8xICAgICAgICAgICAgIHBhZ2luZ19k b21jdGxfY29udGludWF0aW9uCiAKLWh5cGVyY2FsbF9mbl90ICpjb25zdCBoeXBlcmNhbGxfdGFi bGVbTlJfaHlwZXJjYWxsc10gPSB7Ci0gICAgSFlQRVJDQUxMKHNldF90cmFwX3RhYmxlKSwKLSAg ICBIWVBFUkNBTEwobW11X3VwZGF0ZSksCi0gICAgSFlQRVJDQUxMKHNldF9nZHQpLAotICAgIEhZ UEVSQ0FMTChzdGFja19zd2l0Y2gpLAotICAgIEhZUEVSQ0FMTChzZXRfY2FsbGJhY2tzKSwKLSAg ICBIWVBFUkNBTEwoZnB1X3Rhc2tzd2l0Y2gpLAotICAgIEhZUEVSQ0FMTChzY2hlZF9vcF9jb21w YXQpLAotICAgIEhZUEVSQ0FMTChwbGF0Zm9ybV9vcCksCi0gICAgSFlQRVJDQUxMKHNldF9kZWJ1 Z3JlZyksCi0gICAgSFlQRVJDQUxMKGdldF9kZWJ1Z3JlZyksCi0gICAgSFlQRVJDQUxMKHVwZGF0 ZV9kZXNjcmlwdG9yKSwKLSAgICBIWVBFUkNBTEwobWVtb3J5X29wKSwKLSAgICBIWVBFUkNBTEwo bXVsdGljYWxsKSwKLSAgICBIWVBFUkNBTEwodXBkYXRlX3ZhX21hcHBpbmcpLAotICAgIEhZUEVS Q0FMTChzZXRfdGltZXJfb3ApLAotICAgIEhZUEVSQ0FMTChldmVudF9jaGFubmVsX29wX2NvbXBh dCksCi0gICAgSFlQRVJDQUxMKHhlbl92ZXJzaW9uKSwKLSAgICBIWVBFUkNBTEwoY29uc29sZV9p byksCi0gICAgSFlQRVJDQUxMKHBoeXNkZXZfb3BfY29tcGF0KSwKLSAgICBIWVBFUkNBTEwoZ3Jh bnRfdGFibGVfb3ApLAotICAgIEhZUEVSQ0FMTCh2bV9hc3Npc3QpLAotICAgIEhZUEVSQ0FMTCh1 cGRhdGVfdmFfbWFwcGluZ19vdGhlcmRvbWFpbiksCi0gICAgSFlQRVJDQUxMKGlyZXQpLAotICAg IEhZUEVSQ0FMTCh2Y3B1X29wKSwKLSAgICBIWVBFUkNBTEwoc2V0X3NlZ21lbnRfYmFzZSksCi0g ICAgSFlQRVJDQUxMKG1tdWV4dF9vcCksCi0gICAgSFlQRVJDQUxMKHhzbV9vcCksCi0gICAgSFlQ RVJDQUxMKG5taV9vcCksCi0gICAgSFlQRVJDQUxMKHNjaGVkX29wKSwKLSAgICBIWVBFUkNBTEwo Y2FsbGJhY2tfb3ApLAotI2lmZGVmIENPTkZJR19YRU5PUFJPRgotICAgIEhZUEVSQ0FMTCh4ZW5v cHJvZl9vcCksCi0jZW5kaWYKLSAgICBIWVBFUkNBTEwoZXZlbnRfY2hhbm5lbF9vcCksCi0gICAg SFlQRVJDQUxMKHBoeXNkZXZfb3ApLAotICAgIEhZUEVSQ0FMTChodm1fb3ApLAotICAgIEhZUEVS Q0FMTChzeXNjdGwpLAotICAgIEhZUEVSQ0FMTChkb21jdGwpLAotI2lmZGVmIENPTkZJR19LRVhF QwotICAgIEhZUEVSQ0FMTChrZXhlY19vcCksCi0jZW5kaWYKLSNpZmRlZiBDT05GSUdfVE1FTQot ICAgIEhZUEVSQ0FMTCh0bWVtX29wKSwKLSNlbmRpZgotICAgIEhZUEVSQ0FMTCh4ZW5wbXVfb3Ap LAotICAgIEhZUEVSQ0FMTChtY2EpLAotICAgIEhZUEVSQ0FMTChhcmNoXzEpLAotfTsKLQotI2Rl ZmluZSBDT01QQVRfQ0FMTCh4KSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBcCi0gICAgWyBfX0hZUEVSVklTT1JfICMjIHggXSA9IChoeXBlcmNhbGxfZm5fdCAq KSBjb21wYXRfICMjIHgKLQotaHlwZXJjYWxsX2ZuX3QgKmNvbnN0IGNvbXBhdF9oeXBlcmNhbGxf dGFibGVbTlJfaHlwZXJjYWxsc10gPSB7CitzdGF0aWMgY29uc3QgaHlwZXJjYWxsX3RhYmxlX3Qg cHZfaHlwZXJjYWxsX3RhYmxlW05SX2h5cGVyY2FsbHNdID0gewogICAgIENPTVBBVF9DQUxMKHNl dF90cmFwX3RhYmxlKSwKICAgICBIWVBFUkNBTEwobW11X3VwZGF0ZSksCiAgICAgQ09NUEFUX0NB TEwoc2V0X2dkdCksCkBAIC0yMzYsNyArMTg3LDcgQEAgbG9uZyBwdl9oeXBlcmNhbGwoc3RydWN0 IGNwdV91c2VyX3JlZ3MgKnJlZ3MpCiAKICAgICBBU1NFUlQoY3Vyci0+YXJjaC5mbGFncyAmIFRG X2tlcm5lbF9tb2RlKTsKIAotICAgIGlmICggKGVheCA+PSBOUl9oeXBlcmNhbGxzKSB8fCAhaHlw ZXJjYWxsX3RhYmxlW2VheF0gKQorICAgIGlmICggKGVheCA+PSBOUl9oeXBlcmNhbGxzKSB8fCAh cHZfaHlwZXJjYWxsX3RhYmxlW2VheF0ubmF0aXZlICkKICAgICAgICAgIHJldHVybiAtRU5PU1lT OwogCiAgICAgaWYgKCAhaXNfcHZfMzJiaXRfdmNwdShjdXJyKSApCkBAIC0yNjcsNyArMjE4LDcg QEAgbG9uZyBwdl9oeXBlcmNhbGwoc3RydWN0IGNwdV91c2VyX3JlZ3MgKnJlZ3MpCiAgICAgICAg ICAgICBfX3RyYWNlX2h5cGVyY2FsbChUUkNfUFZfSFlQRVJDQUxMX1YyLCBlYXgsIGFyZ3MpOwog ICAgICAgICB9CiAKLSAgICAgICAgcmV0ID0gaHlwZXJjYWxsX3RhYmxlW2VheF0ocmRpLCByc2ks IHJkeCwgcjEwLCByOCwgcjkpOworICAgICAgICByZXQgPSBwdl9oeXBlcmNhbGxfdGFibGVbZWF4 XS5uYXRpdmUocmRpLCByc2ksIHJkeCwgcjEwLCByOCwgcjkpOwogCiAjaWZuZGVmIE5ERUJVRwog ICAgICAgICBpZiAoIHJlZ3MtPnJpcCA9PSBvbGRfcmlwICkKQEAgLTMxNCw3ICsyNjUsNyBAQCBs b25nIHB2X2h5cGVyY2FsbChzdHJ1Y3QgY3B1X3VzZXJfcmVncyAqcmVncykKICAgICAgICAgICAg IF9fdHJhY2VfaHlwZXJjYWxsKFRSQ19QVl9IWVBFUkNBTExfVjIsIGVheCwgYXJncyk7CiAgICAg ICAgIH0KIAotICAgICAgICByZXQgPSBjb21wYXRfaHlwZXJjYWxsX3RhYmxlW2VheF0oZWJ4LCBl Y3gsIGVkeCwgZXNpLCBlZGksIGVicCk7CisgICAgICAgIHJldCA9IHB2X2h5cGVyY2FsbF90YWJs ZVtlYXhdLmNvbXBhdChlYngsIGVjeCwgZWR4LCBlc2ksIGVkaSwgZWJwKTsKIAogI2lmbmRlZiBO REVCVUcKICAgICAgICAgaWYgKCByZWdzLT5yaXAgPT0gb2xkX3JpcCApCkBAIC0zNDQsOCArMjk1 LDggQEAgdm9pZCBhcmNoX2RvX211bHRpY2FsbF9jYWxsKHN0cnVjdCBtY19zdGF0ZSAqc3RhdGUp CiAgICAgewogICAgICAgICBzdHJ1Y3QgbXVsdGljYWxsX2VudHJ5ICpjYWxsID0gJnN0YXRlLT5j YWxsOwogCi0gICAgICAgIGlmICggKGNhbGwtPm9wIDwgTlJfaHlwZXJjYWxscykgJiYgaHlwZXJj YWxsX3RhYmxlW2NhbGwtPm9wXSApCi0gICAgICAgICAgICBjYWxsLT5yZXN1bHQgPSBoeXBlcmNh bGxfdGFibGVbY2FsbC0+b3BdKAorICAgICAgICBpZiAoIChjYWxsLT5vcCA8IE5SX2h5cGVyY2Fs bHMpICYmIHB2X2h5cGVyY2FsbF90YWJsZVtjYWxsLT5vcF0ubmF0aXZlICkKKyAgICAgICAgICAg IGNhbGwtPnJlc3VsdCA9IHB2X2h5cGVyY2FsbF90YWJsZVtjYWxsLT5vcF0ubmF0aXZlKAogICAg ICAgICAgICAgICAgIGNhbGwtPmFyZ3NbMF0sIGNhbGwtPmFyZ3NbMV0sIGNhbGwtPmFyZ3NbMl0s CiAgICAgICAgICAgICAgICAgY2FsbC0+YXJnc1szXSwgY2FsbC0+YXJnc1s0XSwgY2FsbC0+YXJn c1s1XSk7CiAgICAgICAgIGVsc2UKQEAgLTM1Niw4ICszMDcsOCBAQCB2b2lkIGFyY2hfZG9fbXVs dGljYWxsX2NhbGwoc3RydWN0IG1jX3N0YXRlICpzdGF0ZSkKICAgICB7CiAgICAgICAgIHN0cnVj dCBjb21wYXRfbXVsdGljYWxsX2VudHJ5ICpjYWxsID0gJnN0YXRlLT5jb21wYXRfY2FsbDsKIAot ICAgICAgICBpZiAoIChjYWxsLT5vcCA8IE5SX2h5cGVyY2FsbHMpICYmIGNvbXBhdF9oeXBlcmNh bGxfdGFibGVbY2FsbC0+b3BdICkKLSAgICAgICAgICAgIGNhbGwtPnJlc3VsdCA9IGNvbXBhdF9o eXBlcmNhbGxfdGFibGVbY2FsbC0+b3BdKAorICAgICAgICBpZiAoIChjYWxsLT5vcCA8IE5SX2h5 cGVyY2FsbHMpICYmIHB2X2h5cGVyY2FsbF90YWJsZVtjYWxsLT5vcF0uY29tcGF0ICkKKyAgICAg ICAgICAgIGNhbGwtPnJlc3VsdCA9IHB2X2h5cGVyY2FsbF90YWJsZVtjYWxsLT5vcF0uY29tcGF0 KAogICAgICAgICAgICAgICAgIGNhbGwtPmFyZ3NbMF0sIGNhbGwtPmFyZ3NbMV0sIGNhbGwtPmFy Z3NbMl0sCiAgICAgICAgICAgICAgICAgY2FsbC0+YXJnc1szXSwgY2FsbC0+YXJnc1s0XSwgY2Fs bC0+YXJnc1s1XSk7CiAgICAgICAgIGVsc2UKLS0gCjIuMS40CgoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4t ZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwczovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg==