From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH 8/9] x86/hypercall: Merge the hypercall arg tables Date: Mon, 18 Jul 2016 10:51:44 +0100 Message-ID: <1468835505-7278-9-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 Y2FsbCB0YWJsZXMiIGFuZAooVE9ETyAtIGNoYW5nZXNldCkgIng4Ni9wdjogTWVyZ2UgdGhlIHB2 IGh5cGVyY2FsbCB0YWJsZXMiLCB0aGlzIHJlbW92ZXMgdGhlCnJpc2sgb2YgYWNjaWRlbnRhbGx5 IHVwZGF0aW5nIG9ubHkgb25lIG9mIHRoZSB0YWJsZXMuCgpTaWduZWQtb2ZmLWJ5OiBBbmRyZXcg Q29vcGVyIDxhbmRyZXcuY29vcGVyM0BjaXRyaXguY29tPgotLS0KQ0M6IEphbiBCZXVsaWNoIDxK QmV1bGljaEBzdXNlLmNvbT4KLS0tCiB4ZW4vYXJjaC94ODYvaHZtL2h2bS5jICAgICAgICAgIHwg IDggKystLS0KIHhlbi9hcmNoL3g4Ni9oeXBlcmNhbGwuYyAgICAgICAgfCA3MCArKysrKysrKyst LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogeGVuL2luY2x1ZGUvYXNtLXg4Ni9oeXBl cmNhbGwuaCB8ICA3ICsrKy0tCiAzIGZpbGVzIGNoYW5nZWQsIDI0IGluc2VydGlvbnMoKyksIDYx IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9odm0vaHZtLmMgYi94ZW4v YXJjaC94ODYvaHZtL2h2bS5jCmluZGV4IDA5NjZiZDMuLjE5OGZlMzQgMTAwNjQ0Ci0tLSBhL3hl bi9hcmNoL3g4Ni9odm0vaHZtLmMKKysrIGIveGVuL2FyY2gveDg2L2h2bS9odm0uYwpAQCAtNDE3 NSw3ICs0MTc1LDcgQEAgaW50IGh2bV9kb19oeXBlcmNhbGwoc3RydWN0IGNwdV91c2VyX3JlZ3Mg KnJlZ3MpCiAKICNpZm5kZWYgTkRFQlVHCiAgICAgICAgIC8qIERlbGliZXJhdGVseSBjb3JydXB0 IHBhcmFtZXRlciByZWdzIG5vdCB1c2VkIGJ5IHRoaXMgaHlwZXJjYWxsLiAqLwotICAgICAgICBz d2l0Y2ggKCBoeXBlcmNhbGxfYXJnc190YWJsZVtlYXhdICkKKyAgICAgICAgc3dpdGNoICggaHlw ZXJjYWxsX2FyZ3NfdGFibGVbZWF4XS5uYXRpdmUgKQogICAgICAgICB7CiAgICAgICAgIGNhc2Ug MDogcmRpID0gMHhkZWFkYmVlZmRlYWRmMDBkVUw7CiAgICAgICAgIGNhc2UgMTogcnNpID0gMHhk ZWFkYmVlZmRlYWRmMDBkVUw7CkBAIC00MTk2LDcgKzQxOTYsNyBAQCBpbnQgaHZtX2RvX2h5cGVy Y2FsbChzdHJ1Y3QgY3B1X3VzZXJfcmVncyAqcmVncykKICAgICAgICAgaWYgKCAhY3Vyci0+YXJj aC5odm1fdmNwdS5oY2FsbF9wcmVlbXB0ZWQgKQogICAgICAgICB7CiAgICAgICAgICAgICAvKiBE ZWxpYmVyYXRlbHkgY29ycnVwdCBwYXJhbWV0ZXIgcmVncyB1c2VkIGJ5IHRoaXMgaHlwZXJjYWxs LiAqLwotICAgICAgICAgICAgc3dpdGNoICggaHlwZXJjYWxsX2FyZ3NfdGFibGVbZWF4XSApCisg ICAgICAgICAgICBzd2l0Y2ggKCBoeXBlcmNhbGxfYXJnc190YWJsZVtlYXhdLm5hdGl2ZSApCiAg ICAgICAgICAgICB7CiAgICAgICAgICAgICBjYXNlIDY6IHJlZ3MtPnI5ICA9IDB4ZGVhZGJlZWZk ZWFkZjAwZFVMOwogICAgICAgICAgICAgY2FzZSA1OiByZWdzLT5yOCAgPSAweGRlYWRiZWVmZGVh ZGYwMGRVTDsKQEAgLTQyMjIsNyArNDIyMiw3IEBAIGludCBodm1fZG9faHlwZXJjYWxsKHN0cnVj dCBjcHVfdXNlcl9yZWdzICpyZWdzKQogCiAjaWZuZGVmIE5ERUJVRwogICAgICAgICAvKiBEZWxp YmVyYXRlbHkgY29ycnVwdCBwYXJhbWV0ZXIgcmVncyBub3QgdXNlZCBieSB0aGlzIGh5cGVyY2Fs bC4gKi8KLSAgICAgICAgc3dpdGNoICggY29tcGF0X2h5cGVyY2FsbF9hcmdzX3RhYmxlW2VheF0g KQorICAgICAgICBzd2l0Y2ggKCBoeXBlcmNhbGxfYXJnc190YWJsZVtlYXhdLmNvbXBhdCApCiAg ICAgICAgIHsKICAgICAgICAgY2FzZSAwOiBlYnggPSAweGRlYWRmMDBkOwogICAgICAgICBjYXNl IDE6IGVjeCA9IDB4ZGVhZGYwMGQ7CkBAIC00MjQwLDcgKzQyNDAsNyBAQCBpbnQgaHZtX2RvX2h5 cGVyY2FsbChzdHJ1Y3QgY3B1X3VzZXJfcmVncyAqcmVncykKICAgICAgICAgaWYgKCAhY3Vyci0+ YXJjaC5odm1fdmNwdS5oY2FsbF9wcmVlbXB0ZWQgKQogICAgICAgICB7CiAgICAgICAgICAgICAv KiBEZWxpYmVyYXRlbHkgY29ycnVwdCBwYXJhbWV0ZXIgcmVncyB1c2VkIGJ5IHRoaXMgaHlwZXJj YWxsLiAqLwotICAgICAgICAgICAgc3dpdGNoICggY29tcGF0X2h5cGVyY2FsbF9hcmdzX3RhYmxl W2VheF0gKQorICAgICAgICAgICAgc3dpdGNoICggaHlwZXJjYWxsX2FyZ3NfdGFibGVbZWF4XS5j b21wYXQgKQogICAgICAgICAgICAgewogICAgICAgICAgICAgY2FzZSA2OiByZWdzLT5lYnAgPSAw eGRlYWRmMDBkOwogICAgICAgICAgICAgY2FzZSA1OiByZWdzLT5lZGkgPSAweGRlYWRmMDBkOwpk aWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L2h5cGVyY2FsbC5jIGIveGVuL2FyY2gveDg2L2h5cGVy Y2FsbC5jCmluZGV4IGI5YmQ1OGQuLjM3M2JlZGYgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9o eXBlcmNhbGwuYworKysgYi94ZW4vYXJjaC94ODYvaHlwZXJjYWxsLmMKQEAgLTIyLDc3ICsyMiwz NiBAQAogI2luY2x1ZGUgPHhlbi90cmFjZS5oPgogCiAjZGVmaW5lIEFSR1MoeCwgbikgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBcCi0gICAgWyBfX0hZUEVSVklTT1JfICMjIHggXSA9IChu KQorICAgIFsgX19IWVBFUlZJU09SXyAjIyB4IF0gPSB7IG4sIG4gfQorI2RlZmluZSBDT01QKHgs IG4sIGMpICAgICAgICAgICAgICAgICAgICAgICAgICAgXAorICAgIFsgX19IWVBFUlZJU09SXyAj IyB4IF0gPSB7IG4sIGMgfQogCi1jb25zdCB1aW50OF90IGh5cGVyY2FsbF9hcmdzX3RhYmxlW05S X2h5cGVyY2FsbHNdID0KK2NvbnN0IGh5cGVyY2FsbF9hcmdzX3QgaHlwZXJjYWxsX2FyZ3NfdGFi bGVbTlJfaHlwZXJjYWxsc10gPQogewogICAgIEFSR1Moc2V0X3RyYXBfdGFibGUsIDEpLAogICAg IEFSR1MobW11X3VwZGF0ZSwgNCksCiAgICAgQVJHUyhzZXRfZ2R0LCAyKSwKICAgICBBUkdTKHN0 YWNrX3N3aXRjaCwgMiksCi0gICAgQVJHUyhzZXRfY2FsbGJhY2tzLCAzKSwKKyAgICBDT01QKHNl dF9jYWxsYmFja3MsIDMsIDQpLAogICAgIEFSR1MoZnB1X3Rhc2tzd2l0Y2gsIDEpLAogICAgIEFS R1Moc2NoZWRfb3BfY29tcGF0LCAyKSwKICAgICBBUkdTKHBsYXRmb3JtX29wLCAxKSwKICAgICBB UkdTKHNldF9kZWJ1Z3JlZywgMiksCiAgICAgQVJHUyhnZXRfZGVidWdyZWcsIDEpLAotICAgIEFS R1ModXBkYXRlX2Rlc2NyaXB0b3IsIDIpLAorICAgIENPTVAodXBkYXRlX2Rlc2NyaXB0b3IsIDIs IDQpLAogICAgIEFSR1MobWVtb3J5X29wLCAyKSwKICAgICBBUkdTKG11bHRpY2FsbCwgMiksCi0g ICAgQVJHUyh1cGRhdGVfdmFfbWFwcGluZywgMyksCi0gICAgQVJHUyhzZXRfdGltZXJfb3AsIDEp LAorICAgIENPTVAodXBkYXRlX3ZhX21hcHBpbmcsIDMsIDQpLAorICAgIENPTVAoc2V0X3RpbWVy X29wLCAxLCAyKSwKICAgICBBUkdTKGV2ZW50X2NoYW5uZWxfb3BfY29tcGF0LCAxKSwKICAgICBB UkdTKHhlbl92ZXJzaW9uLCAyKSwKICAgICBBUkdTKGNvbnNvbGVfaW8sIDMpLAogICAgIEFSR1Mo cGh5c2Rldl9vcF9jb21wYXQsIDEpLAogICAgIEFSR1MoZ3JhbnRfdGFibGVfb3AsIDMpLAogICAg IEFSR1Modm1fYXNzaXN0LCAyKSwKLSAgICBBUkdTKHVwZGF0ZV92YV9tYXBwaW5nX290aGVyZG9t YWluLCA0KSwKLSAgICBBUkdTKHZjcHVfb3AsIDMpLAotICAgIEFSR1Moc2V0X3NlZ21lbnRfYmFz ZSwgMiksCi0gICAgQVJHUyhtbXVleHRfb3AsIDQpLAotICAgIEFSR1MoeHNtX29wLCAxKSwKLSAg ICBBUkdTKG5taV9vcCwgMiksCi0gICAgQVJHUyhzY2hlZF9vcCwgMiksCi0gICAgQVJHUyhjYWxs YmFja19vcCwgMiksCi0gICAgQVJHUyh4ZW5vcHJvZl9vcCwgMiksCi0gICAgQVJHUyhldmVudF9j aGFubmVsX29wLCAyKSwKLSAgICBBUkdTKHBoeXNkZXZfb3AsIDIpLAotICAgIEFSR1MoaHZtX29w LCAyKSwKLSAgICBBUkdTKHN5c2N0bCwgMSksCi0gICAgQVJHUyhkb21jdGwsIDEpLAotICAgIEFS R1Moa2V4ZWNfb3AsIDIpLAotICAgIEFSR1ModG1lbV9vcCwgMSksCi0gICAgQVJHUyh4ZW5wbXVf b3AsIDIpLAotICAgIEFSR1MobWNhLCAxKSwKLSAgICBBUkdTKGFyY2hfMSwgMSksCi19OwotCi1j b25zdCB1aW50OF90IGNvbXBhdF9oeXBlcmNhbGxfYXJnc190YWJsZVtOUl9oeXBlcmNhbGxzXSA9 Ci17Ci0gICAgQVJHUyhzZXRfdHJhcF90YWJsZSwgMSksCi0gICAgQVJHUyhtbXVfdXBkYXRlLCA0 KSwKLSAgICBBUkdTKHNldF9nZHQsIDIpLAotICAgIEFSR1Moc3RhY2tfc3dpdGNoLCAyKSwKLSAg ICBBUkdTKHNldF9jYWxsYmFja3MsIDQpLAotICAgIEFSR1MoZnB1X3Rhc2tzd2l0Y2gsIDEpLAot ICAgIEFSR1Moc2NoZWRfb3BfY29tcGF0LCAyKSwKLSAgICBBUkdTKHBsYXRmb3JtX29wLCAxKSwK LSAgICBBUkdTKHNldF9kZWJ1Z3JlZywgMiksCi0gICAgQVJHUyhnZXRfZGVidWdyZWcsIDEpLAot ICAgIEFSR1ModXBkYXRlX2Rlc2NyaXB0b3IsIDQpLAotICAgIEFSR1MobWVtb3J5X29wLCAyKSwK LSAgICBBUkdTKG11bHRpY2FsbCwgMiksCi0gICAgQVJHUyh1cGRhdGVfdmFfbWFwcGluZywgNCks Ci0gICAgQVJHUyhzZXRfdGltZXJfb3AsIDIpLAotICAgIEFSR1MoZXZlbnRfY2hhbm5lbF9vcF9j b21wYXQsIDEpLAotICAgIEFSR1MoeGVuX3ZlcnNpb24sIDIpLAotICAgIEFSR1MoY29uc29sZV9p bywgMyksCi0gICAgQVJHUyhwaHlzZGV2X29wX2NvbXBhdCwgMSksCi0gICAgQVJHUyhncmFudF90 YWJsZV9vcCwgMyksCi0gICAgQVJHUyh2bV9hc3Npc3QsIDIpLAotICAgIEFSR1ModXBkYXRlX3Zh X21hcHBpbmdfb3RoZXJkb21haW4sIDUpLAorICAgIENPTVAodXBkYXRlX3ZhX21hcHBpbmdfb3Ro ZXJkb21haW4sIDQsIDUpLAogICAgIEFSR1ModmNwdV9vcCwgMyksCisgICAgQ09NUChzZXRfc2Vn bWVudF9iYXNlLCAyLCAwKSwKICAgICBBUkdTKG1tdWV4dF9vcCwgNCksCiAgICAgQVJHUyh4c21f b3AsIDEpLAogICAgIEFSR1Mobm1pX29wLCAyKSwKQEAgLTExMSw2ICs3MCw3IEBAIGNvbnN0IHVp bnQ4X3QgY29tcGF0X2h5cGVyY2FsbF9hcmdzX3RhYmxlW05SX2h5cGVyY2FsbHNdID0KICAgICBB UkdTKGFyY2hfMSwgMSksCiB9OwogCisjdW5kZWYgQ09NUAogI3VuZGVmIEFSR1MKIAogI2RlZmlu ZSBIWVBFUkNBTEwoeCkgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBcCkBAIC0yMDEsNyArMTYxLDcgQEAgbG9uZyBwdl9oeXBlcmNhbGwoc3RydWN0IGNwdV91 c2VyX3JlZ3MgKnJlZ3MpCiAKICNpZm5kZWYgTkRFQlVHCiAgICAgICAgIC8qIERlbGliZXJhdGVs eSBjb3JydXB0IHBhcmFtZXRlciByZWdzIG5vdCB1c2VkIGJ5IHRoaXMgaHlwZXJjYWxsLiAqLwot ICAgICAgICBzd2l0Y2ggKCBoeXBlcmNhbGxfYXJnc190YWJsZVtlYXhdICkKKyAgICAgICAgc3dp dGNoICggaHlwZXJjYWxsX2FyZ3NfdGFibGVbZWF4XS5uYXRpdmUgKQogICAgICAgICB7CiAgICAg ICAgIGNhc2UgMDogcmRpID0gMHhkZWFkYmVlZmRlYWRmMDBkVUw7CiAgICAgICAgIGNhc2UgMTog cnNpID0gMHhkZWFkYmVlZmRlYWRmMDBkVUw7CkBAIC0yMjQsNyArMTg0LDcgQEAgbG9uZyBwdl9o eXBlcmNhbGwoc3RydWN0IGNwdV91c2VyX3JlZ3MgKnJlZ3MpCiAgICAgICAgIGlmICggcmVncy0+ cmlwID09IG9sZF9yaXAgKQogICAgICAgICB7CiAgICAgICAgICAgICAvKiBEZWxpYmVyYXRlbHkg Y29ycnVwdCBwYXJhbWV0ZXIgcmVncyB1c2VkIGJ5IHRoaXMgaHlwZXJjYWxsLiAqLwotICAgICAg ICAgICAgc3dpdGNoICggaHlwZXJjYWxsX2FyZ3NfdGFibGVbZWF4XSApCisgICAgICAgICAgICBz d2l0Y2ggKCBoeXBlcmNhbGxfYXJnc190YWJsZVtlYXhdLm5hdGl2ZSApCiAgICAgICAgICAgICB7 CiAgICAgICAgICAgICBjYXNlIDY6IHJlZ3MtPnI5ICA9IDB4ZGVhZGJlZWZkZWFkZjAwZFVMOwog ICAgICAgICAgICAgY2FzZSA1OiByZWdzLT5yOCAgPSAweGRlYWRiZWVmZGVhZGYwMGRVTDsKQEAg LTI0Nyw3ICsyMDcsNyBAQCBsb25nIHB2X2h5cGVyY2FsbChzdHJ1Y3QgY3B1X3VzZXJfcmVncyAq cmVncykKIAogI2lmbmRlZiBOREVCVUcKICAgICAgICAgLyogRGVsaWJlcmF0ZWx5IGNvcnJ1cHQg cGFyYW1ldGVyIHJlZ3Mgbm90IHVzZWQgYnkgdGhpcyBoeXBlcmNhbGwuICovCi0gICAgICAgIHN3 aXRjaCAoIGNvbXBhdF9oeXBlcmNhbGxfYXJnc190YWJsZVtlYXhdICkKKyAgICAgICAgc3dpdGNo ICggaHlwZXJjYWxsX2FyZ3NfdGFibGVbZWF4XS5jb21wYXQgKQogICAgICAgICB7CiAgICAgICAg IGNhc2UgMDogZWJ4ID0gMHhkZWFkZjAwZDsKICAgICAgICAgY2FzZSAxOiBlY3ggPSAweGRlYWRm MDBkOwpAQCAtMjcxLDcgKzIzMSw3IEBAIGxvbmcgcHZfaHlwZXJjYWxsKHN0cnVjdCBjcHVfdXNl cl9yZWdzICpyZWdzKQogICAgICAgICBpZiAoIHJlZ3MtPnJpcCA9PSBvbGRfcmlwICkKICAgICAg ICAgewogICAgICAgICAgICAgLyogRGVsaWJlcmF0ZWx5IGNvcnJ1cHQgcGFyYW1ldGVyIHJlZ3Mg dXNlZCBieSB0aGlzIGh5cGVyY2FsbC4gKi8KLSAgICAgICAgICAgIHN3aXRjaCAoIGNvbXBhdF9o eXBlcmNhbGxfYXJnc190YWJsZVtlYXhdICkKKyAgICAgICAgICAgIHN3aXRjaCAoIGh5cGVyY2Fs bF9hcmdzX3RhYmxlW2VheF0uY29tcGF0ICkKICAgICAgICAgICAgIHsKICAgICAgICAgICAgIGNh c2UgNjogcmVncy0+ZWJwID0gMHhkZWFkZjAwZDsKICAgICAgICAgICAgIGNhc2UgNTogcmVncy0+ ZWRpID0gMHhkZWFkZjAwZDsKZGlmZiAtLWdpdCBhL3hlbi9pbmNsdWRlL2FzbS14ODYvaHlwZXJj YWxsLmggYi94ZW4vaW5jbHVkZS9hc20teDg2L2h5cGVyY2FsbC5oCmluZGV4IGMwMGRlMmIuLmM1 OWFhNjkgMTAwNjQ0Ci0tLSBhL3hlbi9pbmNsdWRlL2FzbS14ODYvaHlwZXJjYWxsLmgKKysrIGIv eGVuL2luY2x1ZGUvYXNtLXg4Ni9oeXBlcmNhbGwuaApAQCAtMTksOCArMTksMTEgQEAgdHlwZWRl ZiBzdHJ1Y3QgewogICAgIGh5cGVyY2FsbF9mbl90ICpuYXRpdmUsICpjb21wYXQ7CiB9IGh5cGVy Y2FsbF90YWJsZV90OwogCi1leHRlcm4gY29uc3QgdWludDhfdCBoeXBlcmNhbGxfYXJnc190YWJs ZVtOUl9oeXBlcmNhbGxzXSwKLSAgY29tcGF0X2h5cGVyY2FsbF9hcmdzX3RhYmxlW05SX2h5cGVy Y2FsbHNdOwordHlwZWRlZiBzdHJ1Y3QgeworICAgIHVpbnQ4X3QgbmF0aXZlLCBjb21wYXQ7Cit9 IGh5cGVyY2FsbF9hcmdzX3Q7CisKK2V4dGVybiBjb25zdCBoeXBlcmNhbGxfYXJnc190IGh5cGVy Y2FsbF9hcmdzX3RhYmxlW05SX2h5cGVyY2FsbHNdOwogCiAvKgogICogQm90aCBkb19tbXVleHRf b3AoKSBhbmQgZG9fbW11X3VwZGF0ZSgpOgotLSAKMi4xLjQKCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1k ZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK