From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Stabellini Subject: [PULL 03/21] xen: create wrappers for all other uses of xc_hvm_XXX() functions Date: Fri, 21 Apr 2017 13:14:44 -0700 Message-ID: <1492805702-19690-3-git-send-email-sstabellini@kernel.org> References: <1492805702-19690-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 1d1exX-0008QH-3J for xen-devel@lists.xenproject.org; Fri, 21 Apr 2017 20:15:15 +0000 In-Reply-To: <1492805702-19690-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: peter.maydell@linaro.org Cc: sstabellini@kernel.org, stefanha@gmail.com, qemu-devel@nongnu.org, Paul Durrant , stefanha@redhat.com, anthony.perard@citrix.com, xen-devel@lists.xenproject.org List-Id: xen-devel@lists.xenproject.org RnJvbTogUGF1bCBEdXJyYW50IDxwYXVsLmR1cnJhbnRAY2l0cml4LmNvbT4KClRoaXMgcGF0Y2gg Y3JlYXRlcyBpbmxpbmUgd3JhcHBlciBmdW5jdGlvbnMgaW4geGVuX2NvbW1vbi5oIGZvciBhbGwg b3Blbgpjb2RlZCBjYWxscyB0byB4Y19odm1fWFhYKCkgZnVuY3Rpb25zIG91dHNpZGUgb2YgeGVu X2NvbW1vbi5oIHNvIHRoYXQgdXNlCm9mIHhlbl94YyBjYW4gYmUgbWFkZSBpbXBsaWNpdC4gVGhp cyBhZ2FpbiBpcyBpbiBwcmVwYXJhdGlvbiBmb3IgdGhlIG1vdmUKdG8gdXNpbmcgbGlieGVuZGV2 aWNlbW9kZWwuCgpTaWduZWQtb2ZmLWJ5OiBQYXVsIER1cnJhbnQgPHBhdWwuZHVycmFudEBjaXRy aXguY29tPgpSZXZpZXdlZC1ieTogQW50aG9ueSBQZXJhcmQgPGFudGhvbnkucGVyYXJkQGNpdHJp eC5jb20+ClJldmlld2VkLWJ5OiBTdGVmYW5vIFN0YWJlbGxpbmkgPHNzdGFiZWxsaW5pQGtlcm5l bC5vcmc+Ci0tLQogaHcvaTM4Ni94ZW4veGVuX3BsYXRmb3JtLmMgIHwgIDIgKy0KIGluY2x1ZGUv aHcveGVuL3hlbl9jb21tb24uaCB8IDQ0ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrCiB4ZW4taHZtLmMgICAgICAgICAgICAgICAgICAgfCAyNyArKysrKysrKysr KysrLS0tLS0tLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgNTggaW5zZXJ0aW9ucygrKSwgMTUg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvaHcvaTM4Ni94ZW4veGVuX3BsYXRmb3JtLmMgYi9o dy9pMzg2L3hlbi94ZW5fcGxhdGZvcm0uYwppbmRleCA2MDEwZjM1Li4xNDE5ZmM5IDEwMDY0NAot LS0gYS9ody9pMzg2L3hlbi94ZW5fcGxhdGZvcm0uYworKysgYi9ody9pMzg2L3hlbi94ZW5fcGxh dGZvcm0uYwpAQCAtMTk1LDcgKzE5NSw3IEBAIHN0YXRpYyB2b2lkIHBsYXRmb3JtX2ZpeGVkX2lv cG9ydF93cml0ZWIodm9pZCAqb3BhcXVlLCB1aW50MzJfdCBhZGRyLCB1aW50MzJfdCB2CiAgICAg Y2FzZSAwOiAvKiBQbGF0Zm9ybSBmbGFncyAqLyB7CiAgICAgICAgIGh2bW1lbV90eXBlX3QgbWVt X3R5cGUgPSAodmFsICYgUEZGTEFHX1JPTV9MT0NLKSA/CiAgICAgICAgICAgICBIVk1NRU1fcmFt X3JvIDogSFZNTUVNX3JhbV9ydzsKLSAgICAgICAgaWYgKHhjX2h2bV9zZXRfbWVtX3R5cGUoeGVu X3hjLCB4ZW5fZG9taWQsIG1lbV90eXBlLCAweGMwLCAweDQwKSkgeworICAgICAgICBpZiAoeGVu X3NldF9tZW1fdHlwZSh4ZW5fZG9taWQsIG1lbV90eXBlLCAweGMwLCAweDQwKSkgewogICAgICAg ICAgICAgRFBSSU5URigidW5hYmxlIHRvIGNoYW5nZSByby9ydyBzdGF0ZSBvZiBST00gbWVtb3J5 IGFyZWEhXG4iKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIHMtPmZsYWdzID0gdmFs ICYgUEZGTEFHX1JPTV9MT0NLOwpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9ody94ZW4veGVuX2NvbW1v bi5oIGIvaW5jbHVkZS9ody94ZW4veGVuX2NvbW1vbi5oCmluZGV4IDFlMDhiOTguLjMxY2YyNWYg MTAwNjQ0Ci0tLSBhL2luY2x1ZGUvaHcveGVuL3hlbl9jb21tb24uaAorKysgYi9pbmNsdWRlL2h3 L3hlbi94ZW5fY29tbW9uLmgKQEAgLTI2LDYgKzI2LDUwIEBAIGV4dGVybiB4Y19pbnRlcmZhY2Ug Knhlbl94YzsKICAqIFdlIGRvbid0IHN1cHBvcnQgWGVuIHByaW9yIHRvIDQuMi4wLgogICovCiAK K3N0YXRpYyBpbmxpbmUgaW50IHhlbl9zZXRfbWVtX3R5cGUoZG9taWRfdCBkb21pZCwgaHZtbWVt X3R5cGVfdCB0eXBlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1aW50NjRf dCBmaXJzdF9wZm4sIHVpbnQzMl90IG5yKQoreworICAgIHJldHVybiB4Y19odm1fc2V0X21lbV90 eXBlKHhlbl94YywgZG9taWQsIHR5cGUsIGZpcnN0X3BmbiwgbnIpOworfQorCitzdGF0aWMgaW5s aW5lIGludCB4ZW5fc2V0X3BjaV9pbnR4X2xldmVsKGRvbWlkX3QgZG9taWQsIHVpbnQxNl90IHNl Z21lbnQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQ4X3Qg YnVzLCB1aW50OF90IGRldmljZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgdWludDhfdCBpbnR4LCB1bnNpZ25lZCBpbnQgbGV2ZWwpCit7CisgICAgcmV0dXJuIHhj X2h2bV9zZXRfcGNpX2ludHhfbGV2ZWwoeGVuX3hjLCBkb21pZCwgc2VnbWVudCwgYnVzLCBkZXZp Y2UsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50eCwgbGV2ZWwpOwor fQorCitzdGF0aWMgaW5saW5lIGludCB4ZW5fc2V0X3BjaV9saW5rX3JvdXRlKGRvbWlkX3QgZG9t aWQsIHVpbnQ4X3QgbGluaywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgdWludDhfdCBpcnEpCit7CisgICAgcmV0dXJuIHhjX2h2bV9zZXRfcGNpX2xpbmtfcm91dGUo eGVuX3hjLCBkb21pZCwgbGluaywgaXJxKTsKK30KKworc3RhdGljIGlubGluZSBpbnQgeGVuX2lu amVjdF9tc2koZG9taWRfdCBkb21pZCwgdWludDY0X3QgbXNpX2FkZHIsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICB1aW50MzJfdCBtc2lfZGF0YSkKK3sKKyAgICByZXR1cm4geGNf aHZtX2luamVjdF9tc2koeGVuX3hjLCBkb21pZCwgbXNpX2FkZHIsIG1zaV9kYXRhKTsKK30KKwor c3RhdGljIGlubGluZSBpbnQgeGVuX3NldF9pc2FfaXJxX2xldmVsKGRvbWlkX3QgZG9taWQsIHVp bnQ4X3QgaXJxLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2ln bmVkIGludCBsZXZlbCkKK3sKKyAgICByZXR1cm4geGNfaHZtX3NldF9pc2FfaXJxX2xldmVsKHhl bl94YywgZG9taWQsIGlycSwgbGV2ZWwpOworfQorCitzdGF0aWMgaW5saW5lIGludCB4ZW5fdHJh Y2tfZGlydHlfdnJhbShkb21pZF90IGRvbWlkLCB1aW50NjRfdCBmaXJzdF9wZm4sCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1aW50MzJfdCBuciwgdW5zaWduZWQgbG9u ZyAqYml0bWFwKQoreworICAgIHJldHVybiB4Y19odm1fdHJhY2tfZGlydHlfdnJhbSh4ZW5feGMs IGRvbWlkLCBmaXJzdF9wZm4sIG5yLCBiaXRtYXApOworfQorCitzdGF0aWMgaW5saW5lIGludCB4 ZW5fbW9kaWZpZWRfbWVtb3J5KGRvbWlkX3QgZG9taWQsIHVpbnQ2NF90IGZpcnN0X3BmbiwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdWludDMyX3QgbnIpCit7CisgICAg cmV0dXJuIHhjX2h2bV9tb2RpZmllZF9tZW1vcnkoeGVuX3hjLCBkb21pZCwgZmlyc3RfcGZuLCBu cik7Cit9CisKIC8qIFhlbiA0LjIgdGhyb3VnaCA0LjYgKi8KICNpZiBDT05GSUdfWEVOX0NUUkxf SU5URVJGQUNFX1ZFUlNJT04gPCA0NzEKIApkaWZmIC0tZ2l0IGEveGVuLWh2bS5jIGIveGVuLWh2 bS5jCmluZGV4IGVkZjQ5ODMuLjRiOTI4Y2YgMTAwNjQ0Ci0tLSBhL3hlbi1odm0uYworKysgYi94 ZW4taHZtLmMKQEAgLTEyNSw4ICsxMjUsOCBAQCBpbnQgeGVuX3BjaV9zbG90X2dldF9waXJxKFBD SURldmljZSAqcGNpX2RldiwgaW50IGlycV9udW0pCiAKIHZvaWQgeGVuX3BpaXgzX3NldF9pcnEo dm9pZCAqb3BhcXVlLCBpbnQgaXJxX251bSwgaW50IGxldmVsKQogewotICAgIHhjX2h2bV9zZXRf cGNpX2ludHhfbGV2ZWwoeGVuX3hjLCB4ZW5fZG9taWQsIDAsIDAsIGlycV9udW0gPj4gMiwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlycV9udW0gJiAzLCBsZXZlbCk7CisgICAgeGVu X3NldF9wY2lfaW50eF9sZXZlbCh4ZW5fZG9taWQsIDAsIDAsIGlycV9udW0gPj4gMiwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgIGlycV9udW0gJiAzLCBsZXZlbCk7CiB9CiAKIHZvaWQgeGVu X3BpaXhfcGNpX3dyaXRlX2NvbmZpZ19jbGllbnQodWludDMyX3QgYWRkcmVzcywgdWludDMyX3Qg dmFsLCBpbnQgbGVuKQpAQCAtMTQxLDcgKzE0MSw3IEBAIHZvaWQgeGVuX3BpaXhfcGNpX3dyaXRl X2NvbmZpZ19jbGllbnQodWludDMyX3QgYWRkcmVzcywgdWludDMyX3QgdmFsLCBpbnQgbGVuKQog ICAgICAgICB9CiAgICAgICAgIHYgJj0gMHhmOwogICAgICAgICBpZiAoKChhZGRyZXNzICsgaSkg Pj0gMHg2MCkgJiYgKChhZGRyZXNzICsgaSkgPD0gMHg2MykpIHsKLSAgICAgICAgICAgIHhjX2h2 bV9zZXRfcGNpX2xpbmtfcm91dGUoeGVuX3hjLCB4ZW5fZG9taWQsIGFkZHJlc3MgKyBpIC0gMHg2 MCwgdik7CisgICAgICAgICAgICB4ZW5fc2V0X3BjaV9saW5rX3JvdXRlKHhlbl9kb21pZCwgYWRk cmVzcyArIGkgLSAweDYwLCB2KTsKICAgICAgICAgfQogICAgIH0KIH0KQEAgLTE1Niw3ICsxNTYs NyBAQCBpbnQgeGVuX2lzX3BpcnFfbXNpKHVpbnQzMl90IG1zaV9kYXRhKQogCiB2b2lkIHhlbl9o dm1faW5qZWN0X21zaSh1aW50NjRfdCBhZGRyLCB1aW50MzJfdCBkYXRhKQogewotICAgIHhjX2h2 bV9pbmplY3RfbXNpKHhlbl94YywgeGVuX2RvbWlkLCBhZGRyLCBkYXRhKTsKKyAgICB4ZW5faW5q ZWN0X21zaSh4ZW5fZG9taWQsIGFkZHIsIGRhdGEpOwogfQogCiBzdGF0aWMgdm9pZCB4ZW5fc3Vz cGVuZF9ub3RpZmllcihOb3RpZmllciAqbm90aWZpZXIsIHZvaWQgKmRhdGEpCkBAIC0xNjgsNyAr MTY4LDcgQEAgc3RhdGljIHZvaWQgeGVuX3N1c3BlbmRfbm90aWZpZXIoTm90aWZpZXIgKm5vdGlm aWVyLCB2b2lkICpkYXRhKQogCiBzdGF0aWMgdm9pZCB4ZW5fc2V0X2lycSh2b2lkICpvcGFxdWUs IGludCBpcnEsIGludCBsZXZlbCkKIHsKLSAgICB4Y19odm1fc2V0X2lzYV9pcnFfbGV2ZWwoeGVu X3hjLCB4ZW5fZG9taWQsIGlycSwgbGV2ZWwpOworICAgIHhlbl9zZXRfaXNhX2lycV9sZXZlbCh4 ZW5fZG9taWQsIGlycSwgbGV2ZWwpOwogfQogCiBxZW11X2lycSAqeGVuX2ludGVycnVwdF9jb250 cm9sbGVyX2luaXQodm9pZCkKQEAgLTQ4MSwxMCArNDgxLDEwIEBAIHN0YXRpYyB2b2lkIHhlbl9z ZXRfbWVtb3J5KHN0cnVjdCBNZW1vcnlMaXN0ZW5lciAqbGlzdGVuZXIsCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgc2VjdGlvbi0+bXIsIHNlY3Rpb24tPm9mZnNldF93aXRoaW5fcmVn aW9uKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIG1lbV90eXBlID0gSFZNTUVNX3Jh bV9ybzsKLSAgICAgICAgICAgIGlmICh4Y19odm1fc2V0X21lbV90eXBlKHhlbl94YywgeGVuX2Rv bWlkLCBtZW1fdHlwZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXJ0 X2FkZHIgPj4gVEFSR0VUX1BBR0VfQklUUywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHNpemUgPj4gVEFSR0VUX1BBR0VfQklUUykpIHsKLSAgICAgICAgICAgICAgICBEUFJJ TlRGKCJ4Y19odm1fc2V0X21lbV90eXBlIGVycm9yLCBhZGRyOiAiVEFSR0VUX0ZNVF9wbHgiXG4i LAorICAgICAgICAgICAgaWYgKHhlbl9zZXRfbWVtX3R5cGUoeGVuX2RvbWlkLCBtZW1fdHlwZSwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXJ0X2FkZHIgPj4gVEFSR0VUX1BB R0VfQklUUywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNpemUgPj4gVEFSR0VU X1BBR0VfQklUUykpIHsKKyAgICAgICAgICAgICAgICBEUFJJTlRGKCJ4ZW5fc2V0X21lbV90eXBl IGVycm9yLCBhZGRyOiAiVEFSR0VUX0ZNVF9wbHgiXG4iLAogICAgICAgICAgICAgICAgICAgICAg ICAgc3RhcnRfYWRkcik7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KQEAgLTU4Niw5ICs1ODYs OCBAQCBzdGF0aWMgdm9pZCB4ZW5fc3luY19kaXJ0eV9iaXRtYXAoWGVuSU9TdGF0ZSAqc3RhdGUs CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICByYyA9IHhjX2h2bV90cmFja19kaXJ0eV92 cmFtKHhlbl94YywgeGVuX2RvbWlkLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg c3RhcnRfYWRkciA+PiBUQVJHRVRfUEFHRV9CSVRTLCBucGFnZXMsCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBiaXRtYXApOworICAgIHJjID0geGVuX3RyYWNrX2RpcnR5X3ZyYW0o eGVuX2RvbWlkLCBzdGFydF9hZGRyID4+IFRBUkdFVF9QQUdFX0JJVFMsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBucGFnZXMsIGJpdG1hcCk7CiAgICAgaWYgKHJjIDwgMCkgewogI2lm bmRlZiBFTk9EQVRBCiAjZGVmaW5lIEVOT0RBVEEgIEVOT0VOVApAQCAtNjM0LDcgKzYzMyw3IEBA IHN0YXRpYyB2b2lkIHhlbl9sb2dfc3RvcChNZW1vcnlMaXN0ZW5lciAqbGlzdGVuZXIsIE1lbW9y eVJlZ2lvblNlY3Rpb24gKnNlY3Rpb24sCiAgICAgaWYgKG9sZCAmIH5uZXcgJiAoMSA8PCBESVJU WV9NRU1PUllfVkdBKSkgewogICAgICAgICBzdGF0ZS0+bG9nX2Zvcl9kaXJ0eWJpdCA9IE5VTEw7 CiAgICAgICAgIC8qIERpc2FibGUgZGlydHkgYml0IHRyYWNraW5nICovCi0gICAgICAgIHhjX2h2 bV90cmFja19kaXJ0eV92cmFtKHhlbl94YywgeGVuX2RvbWlkLCAwLCAwLCBOVUxMKTsKKyAgICAg ICAgeGVuX3RyYWNrX2RpcnR5X3ZyYW0oeGVuX2RvbWlkLCAwLCAwLCBOVUxMKTsKICAgICB9CiB9 CiAKQEAgLTE0MDMsNyArMTQwMiw3IEBAIHZvaWQgeGVuX2h2bV9tb2RpZmllZF9tZW1vcnkocmFt X2FkZHJfdCBzdGFydCwgcmFtX2FkZHJfdCBsZW5ndGgpCiAgICAgICAgIHN0YXJ0X3BmbiA9IHN0 YXJ0ID4+IFRBUkdFVF9QQUdFX0JJVFM7CiAgICAgICAgIG5iX3BhZ2VzID0gKChzdGFydCArIGxl bmd0aCArIFRBUkdFVF9QQUdFX1NJWkUgLSAxKSA+PiBUQVJHRVRfUEFHRV9CSVRTKQogICAgICAg ICAgICAgLSBzdGFydF9wZm47Ci0gICAgICAgIHJjID0geGNfaHZtX21vZGlmaWVkX21lbW9yeSh4 ZW5feGMsIHhlbl9kb21pZCwgc3RhcnRfcGZuLCBuYl9wYWdlcyk7CisgICAgICAgIHJjID0geGVu X21vZGlmaWVkX21lbW9yeSh4ZW5fZG9taWQsIHN0YXJ0X3BmbiwgbmJfcGFnZXMpOwogICAgICAg ICBpZiAocmMpIHsKICAgICAgICAgICAgIGZwcmludGYoc3RkZXJyLAogICAgICAgICAgICAgICAg ICAgICAiJXMgZmFpbGVkIGZvciAiUkFNX0FERFJfRk1UIiAoIlJBTV9BRERSX0ZNVCIpOiAlaSwg JXNcbiIsCi0tIAoxLjkuMQoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcK aHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=