From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH v2 46/62] xen/pvshim: set correct domid value Date: Fri, 12 Jan 2018 11:28:54 +0000 Message-ID: <20180112112910.16762-47-wei.liu2@citrix.com> References: <20180112112910.16762-1-wei.liu2@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from all-amaz-eas1.inumbo.com ([34.197.232.57]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eZxzE-0003JH-52 for xen-devel@lists.xenproject.org; Fri, 12 Jan 2018 11:59:04 +0000 In-Reply-To: <20180112112910.16762-1-wei.liu2@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: Xen-devel Cc: wei.liu2@citrix.com List-Id: xen-devel@lists.xenproject.org RnJvbTogUm9nZXIgUGF1IE1vbm5lIDxyb2dlci5wYXVAY2l0cml4LmNvbT4KCklmIGRvbWlkIGlz IG5vdCBwcm92aWRlZCBieSBMMCBzZXQgZG9taWQgdG8gMSBieSBkZWZhdWx0LiBOb3RlIHRoYXQg TDAKbm90IHByb3ZpbmRpbmcgdGhlIGRvbWlkIGNhbiBjYXVzZSB0cm91YmxlIGlmIHRoZSBndWVz dCB0cmllcyB0byB1c2UKaXQncyBkb21pZCBpbnN0ZWFkIG9mIERPTUlEX1NFTEYgd2hlbiBwZXJm b3JtaW5nIGh5cGVyY2FsbHMgdGhhdCBhcmUKZm9yd2FyZGVkIHRvIHRoZSBMMCBoeXBlcnZpc29y LgoKU2luY2UgdGhlIGRvbWFpbiBjcmVhdGVkIGlzIG5vIGxvbmdlciB0aGUgaGFyZHdhcmUgZG9t YWluIGFkZCBhIGhvb2sKdG8gdGhlIGRvbWFpbiBzaHV0ZG93biBwYXRoIGluIG9yZGVyIHRvIGZv cndhcmQgc2h1dGRvd24gb3BlcmF0aW9ucyB0bwp0aGUgTDAgaHlwZXJ2aXNvci4KClNpZ25lZC1v ZmYtYnk6IFJvZ2VyIFBhdSBNb25uw6kgPHJvZ2VyLnBhdUBjaXRyaXguY29tPgpTaWduZWQtb2Zm LWJ5OiBTZXJnZXkgRHlhc2xpIDxzZXJnZXkuZHlhc2xpQGNpdHJpeC5jb20+Ci0tLQpDaGFuZ2Vz IHNpbmNlIHYxOgogLSBzL2dldF9kb20wX2RvbWlkL2dldF9pbml0aWFsX2RvbWFpbl9pZC8uCiAt IEFkZCBhIGNvbW1lbnQgcmVnYXJkaW5nIHdoeSBkb20wIG5lZWRzIHRvIGJlIGdsb2JhbC4KIC0g Rml4IGNvbXBpbGF0aW9uIG9mIHhlbi9jb21tb24vZG9tYWluLmMgb24gQVJNLgotLS0KIHhlbi9h cmNoL3g4Ni9kb20wX2J1aWxkLmMgICAgICAgfCAgMiArLQogeGVuL2FyY2gveDg2L2d1ZXN0L3hl bi5jICAgICAgICB8ICA1ICsrKysrCiB4ZW4vYXJjaC94ODYvcHYvc2hpbS5jICAgICAgICAgIHwg MjEgKysrKysrKysrKysrKysrKysrKysrCiB4ZW4vYXJjaC94ODYvc2V0dXAuYyAgICAgICAgICAg IHwgMTYgKysrKysrKysrKystLS0tLQogeGVuL2NvbW1vbi9kb21haW4uYyAgICAgICAgICAgICB8 IDEyICsrKysrKysrKysrKwogeGVuL2luY2x1ZGUvYXNtLXg4Ni9ndWVzdC94ZW4uaCB8ICA2ICsr KysrKwogeGVuL2luY2x1ZGUvYXNtLXg4Ni9wdi9zaGltLmggICB8IDEwICsrKysrKysrKysKIDcg ZmlsZXMgY2hhbmdlZCwgNjYgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS94ZW4vYXJjaC94ODYvZG9tMF9idWlsZC5jIGIveGVuL2FyY2gveDg2L2RvbTBfYnVpbGQu YwppbmRleCA5MDdhY2FkMDYwLi44NjAwMTIzNTE2IDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYv ZG9tMF9idWlsZC5jCisrKyBiL3hlbi9hcmNoL3g4Ni9kb20wX2J1aWxkLmMKQEAgLTQ3Miw3ICs0 NzIsNyBAQCBpbnQgX19pbml0IGNvbnN0cnVjdF9kb20wKHN0cnVjdCBkb21haW4gKmQsIGNvbnN0 IG1vZHVsZV90ICppbWFnZSwKICAgICBpbnQgcmM7CiAKICAgICAvKiBTYW5pdHkhICovCi0gICAg QlVHX09OKGQtPmRvbWFpbl9pZCAhPSAwKTsKKyAgICBCVUdfT04oIXB2X3NoaW0gJiYgZC0+ZG9t YWluX2lkICE9IDApOwogICAgIEJVR19PTihkLT52Y3B1WzBdID09IE5VTEwpOwogICAgIEJVR19P TihkLT52Y3B1WzBdLT5pc19pbml0aWFsaXNlZCk7CiAKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4 Ni9ndWVzdC94ZW4uYyBiL3hlbi9hcmNoL3g4Ni9ndWVzdC94ZW4uYwppbmRleCAyN2E2YzQ3NzUz Li5hZmYxNmEwZTM1IDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvZ3Vlc3QveGVuLmMKKysrIGIv eGVuL2FyY2gveDg2L2d1ZXN0L3hlbi5jCkBAIC0zMjIsNiArMzIyLDExIEBAIGNvbnN0IHVuc2ln bmVkIGxvbmcgKl9faW5pdCBoeXBlcnZpc29yX3Jlc2VydmVkX3BhZ2VzKHVuc2lnbmVkIGludCAq c2l6ZSkKICAgICByZXR1cm4gcmVzZXJ2ZWRfcGFnZXM7CiB9CiAKK3VpbnQzMl90IGh5cGVydmlz b3JfY3B1aWRfYmFzZSh2b2lkKQoreworICAgIHJldHVybiB4ZW5fY3B1aWRfYmFzZTsKK30KKwog LyoKICAqIExvY2FsIHZhcmlhYmxlczoKICAqIG1vZGU6IEMKZGlmZiAtLWdpdCBhL3hlbi9hcmNo L3g4Ni9wdi9zaGltLmMgYi94ZW4vYXJjaC94ODYvcHYvc2hpbS5jCmluZGV4IDc1MzY1YjA2OTcu Ljc4MzUxYzllZTAgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9wdi9zaGltLmMKKysrIGIveGVu L2FyY2gveDg2L3B2L3NoaW0uYwpAQCAtMjAsNiArMjAsNyBAQAogICovCiAjaW5jbHVkZSA8eGVu L2h5cGVyY2FsbC5oPgogI2luY2x1ZGUgPHhlbi9pbml0Lmg+CisjaW5jbHVkZSA8eGVuL3NodXRk b3duLmg+CiAjaW5jbHVkZSA8eGVuL3R5cGVzLmg+CiAKICNpbmNsdWRlIDxhc20vYXBpYy5oPgpA QCAtMjcsNiArMjgsOCBAQAogI2luY2x1ZGUgPGFzbS9ndWVzdC5oPgogI2luY2x1ZGUgPGFzbS9w di9tbS5oPgogCisjaW5jbHVkZSA8cHVibGljL2FyY2gteDg2L2NwdWlkLmg+CisKICNpZm5kZWYg Q09ORklHX1BWX1NISU1fRVhDTFVTSVZFCiBib29sIHB2X3NoaW07CiBib29sZWFuX3BhcmFtKCJw di1zaGltIiwgcHZfc2hpbSk7CkBAIC05MSw2ICs5NCwyNCBAQCB2b2lkIF9faW5pdCBwdl9zaGlt X3NldHVwX2RvbShzdHJ1Y3QgZG9tYWluICpkLCBsNF9wZ2VudHJ5X3QgKmw0c3RhcnQsCiAjdW5k ZWYgU0VUX0FORF9NQVBfUEFSQU0KIH0KIAordm9pZCBwdl9zaGltX3NodXRkb3duKHVpbnQ4X3Qg cmVhc29uKQoreworICAgIC8qIFhYWDogaGFuZGxlIHN1c3BlbmQgKi8KKyAgICB4ZW5faHlwZXJj YWxsX3NodXRkb3duKHJlYXNvbik7Cit9CisKK2RvbWlkX3QgZ2V0X2luaXRpYWxfZG9tYWluX2lk KHZvaWQpCit7CisgICAgdWludDMyX3QgZWF4LCBlYngsIGVjeCwgZWR4OworCisgICAgaWYgKCAh cHZfc2hpbSApCisgICAgICAgIHJldHVybiAwOworCisgICAgY3B1aWQoaHlwZXJ2aXNvcl9jcHVp ZF9iYXNlKCkgKyA0LCAmZWF4LCAmZWJ4LCAmZWN4LCAmZWR4KTsKKworICAgIHJldHVybiAoZWF4 ICYgWEVOX0hWTV9DUFVJRF9ET01JRF9QUkVTRU5UKSA/IGVjeCA6IDE7Cit9CisKIC8qCiAgKiBM b2NhbCB2YXJpYWJsZXM6CiAgKiBtb2RlOiBDCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvc2V0 dXAuYyBiL3hlbi9hcmNoL3g4Ni9zZXR1cC5jCmluZGV4IGIyYWJjYWEyNzguLjBmNDI4MmM0MmYg MTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9zZXR1cC5jCisrKyBiL3hlbi9hcmNoL3g4Ni9zZXR1 cC5jCkBAIC0xMDQsNiArMTA0LDEyIEBAIHVuc2lnbmVkIGxvbmcgX19yZWFkX21vc3RseSBtbXVf Y3I0X2ZlYXR1cmVzID0gWEVOX01JTklNQUxfQ1I0OwogI2RlZmluZSBTTUVQX0hWTV9PTkxZICgt MSkKIHN0YXRpYyBzOCBfX2luaXRkYXRhIG9wdF9zbWVwID0gMTsKIAorLyoKKyAqIEluaXRpYWwg ZG9tYWluIHBsYWNlIGhvbGRlci4gTmVlZHMgdG8gYmUgZ2xvYmFsIHNvIGl0IGNhbiBiZSBjcmVh dGVkIGluCisgKiBfX3N0YXJ0X3hlbiBhbmQgdW5wYXVzZWQgaW4gaW5pdF9kb25lLgorICovCitz dGF0aWMgc3RydWN0IGRvbWFpbiAqX19pbml0ZGF0YSBkb20wOworCiBzdGF0aWMgaW50IF9faW5p dCBwYXJzZV9zbWVwX3BhcmFtKGNvbnN0IGNoYXIgKnMpCiB7CiAgICAgaWYgKCAhKnMgKQpAQCAt NTc2LDExICs1ODIsMTEgQEAgc3RhdGljIHZvaWQgbm9pbmxpbmUgaW5pdF9kb25lKHZvaWQpCiAK ICAgICBzeXN0ZW1fc3RhdGUgPSBTWVNfU1RBVEVfYWN0aXZlOwogCisgICAgZG9tYWluX3VucGF1 c2VfYnlfc3lzdGVtY29udHJvbGxlcihkb20wKTsKKwogICAgIC8qIE1VU1QgYmUgZG9uZSBwcmlv ciB0byByZW1vdmluZyAuaW5pdCBkYXRhLiAqLwogICAgIHVucmVnaXN0ZXJfaW5pdF92aXJ0dWFs X3JlZ2lvbigpOwogCi0gICAgZG9tYWluX3VucGF1c2VfYnlfc3lzdGVtY29udHJvbGxlcihoYXJk d2FyZV9kb21haW4pOwotCiAgICAgLyogWmVybyB0aGUgLmluaXQgY29kZSBhbmQgZGF0YS4gKi8K ICAgICBmb3IgKCB2YSA9IF9faW5pdF9iZWdpbjsgdmEgPCBfcChfX2luaXRfZW5kKTsgdmEgKz0g UEFHRV9TSVpFICkKICAgICAgICAgY2xlYXJfcGFnZSh2YSk7CkBAIC02NTksNyArNjY1LDYgQEAg dm9pZCBfX2luaXQgbm9yZXR1cm4gX19zdGFydF94ZW4odW5zaWduZWQgbG9uZyBtYmlfcCkKICAg ICB1bnNpZ25lZCBsb25nIG5yX3BhZ2VzLCByYXdfbWF4X3BhZ2UsIG1vZHVsZXNfaGVhZHJvb20s ICptb2R1bGVfbWFwOwogICAgIGludCBpLCBqLCBlODIwX3dhcm4gPSAwLCBieXRlcyA9IDA7CiAg ICAgYm9vbCBhY3BpX2Jvb3RfdGFibGVfaW5pdF9kb25lID0gZmFsc2UsIHJlbG9jYXRlZCA9IGZh bHNlOwotICAgIHN0cnVjdCBkb21haW4gKmRvbTA7CiAgICAgc3RydWN0IG5zMTY1NTBfZGVmYXVs dHMgbnMxNjU1MCA9IHsKICAgICAgICAgLmRhdGFfYml0cyA9IDgsCiAgICAgICAgIC5wYXJpdHkg ICAgPSAnbicsCkBAIC0xNjE3LDExICsxNjIyLDEyIEBAIHZvaWQgX19pbml0IG5vcmV0dXJuIF9f c3RhcnRfeGVuKHVuc2lnbmVkIGxvbmcgbWJpX3ApCiAgICAgfQogCiAgICAgLyogQ3JlYXRlIGlu aXRpYWwgZG9tYWluIDAuICovCi0gICAgZG9tMCA9IGRvbWFpbl9jcmVhdGUoMCwgZG9tY3JfZmxh Z3MsIDAsICZjb25maWcpOworICAgIGRvbTAgPSBkb21haW5fY3JlYXRlKGdldF9pbml0aWFsX2Rv bWFpbl9pZCgpLCBkb21jcl9mbGFncywgMCwgJmNvbmZpZyk7CiAgICAgaWYgKCBJU19FUlIoZG9t MCkgfHwgKGFsbG9jX2RvbTBfdmNwdTAoZG9tMCkgPT0gTlVMTCkgKQogICAgICAgICBwYW5pYygi RXJyb3IgY3JlYXRpbmcgZG9tYWluIDAiKTsKIAotICAgIGRvbTAtPmlzX3ByaXZpbGVnZWQgPSAx OworICAgIGlmICggIXB2X3NoaW0gKQorICAgICAgICBkb20wLT5pc19wcml2aWxlZ2VkID0gMTsK ICAgICBkb20wLT50YXJnZXQgPSBOVUxMOwogCiAgICAgLyogR3JhYiB0aGUgRE9NMCBjb21tYW5k IGxpbmUuICovCmRpZmYgLS1naXQgYS94ZW4vY29tbW9uL2RvbWFpbi5jIGIveGVuL2NvbW1vbi9k b21haW4uYwppbmRleCA3YWY4ZDEyNTEyLi5lZjU2NmY3ZjQ1IDEwMDY0NAotLS0gYS94ZW4vY29t bW9uL2RvbWFpbi5jCisrKyBiL3hlbi9jb21tb24vZG9tYWluLmMKQEAgLTQzLDYgKzQzLDEwIEBA CiAjaW5jbHVkZSA8eGVuL3RtZW0uaD4KICNpbmNsdWRlIDxhc20vc2V0dXAuaD4KIAorI2lmZGVm IENPTkZJR19YODYKKyNpbmNsdWRlIDxhc20vZ3Vlc3QuaD4KKyNlbmRpZgorCiAvKiBMaW51eCBj b25maWcgb3B0aW9uOiBwcm9wYWdldGVkIHRvIGRvbWFpbjAgKi8KIC8qIHhlbl9wcm9jZXNzb3Jf cG1iaXRzOiB4ZW4gY29udHJvbCBDeCwgUHgsIC4uLiAqLwogdW5zaWduZWQgaW50IHhlbl9wcm9j ZXNzb3JfcG1iaXRzID0gWEVOX1BST0NFU1NPUl9QTV9QWDsKQEAgLTY5Nyw2ICs3MDEsMTQgQEAg dm9pZCBkb21haW5fc2h1dGRvd24oc3RydWN0IGRvbWFpbiAqZCwgdTggcmVhc29uKQogewogICAg IHN0cnVjdCB2Y3B1ICp2OwogCisjaWZkZWYgQ09ORklHX1g4NgorICAgIGlmICggcHZfc2hpbSAp CisgICAgeworICAgICAgICBwdl9zaGltX3NodXRkb3duKHJlYXNvbik7CisgICAgICAgIHJldHVy bjsKKyAgICB9CisjZW5kaWYKKwogICAgIHNwaW5fbG9jaygmZC0+c2h1dGRvd25fbG9jayk7CiAK ICAgICBpZiAoIGQtPnNodXRkb3duX2NvZGUgPT0gU0hVVERPV05fQ09ERV9JTlZBTElEICkKZGlm ZiAtLWdpdCBhL3hlbi9pbmNsdWRlL2FzbS14ODYvZ3Vlc3QveGVuLmggYi94ZW4vaW5jbHVkZS9h c20teDg2L2d1ZXN0L3hlbi5oCmluZGV4IDYyMjU1ZmRhOGIuLmFjNDhkY2JlNDQgMTAwNjQ0Ci0t LSBhL3hlbi9pbmNsdWRlL2FzbS14ODYvZ3Vlc3QveGVuLmgKKysrIGIveGVuL2luY2x1ZGUvYXNt LXg4Ni9ndWVzdC94ZW4uaApAQCAtMzgsNiArMzgsNyBAQCBpbnQgaHlwZXJ2aXNvcl9hbGxvY191 bnVzZWRfcGFnZShtZm5fdCAqbWZuKTsKIGludCBoeXBlcnZpc29yX2ZyZWVfdW51c2VkX3BhZ2Uo bWZuX3QgbWZuKTsKIHZvaWQgaHlwZXJ2aXNvcl9maXh1cF9lODIwKHN0cnVjdCBlODIwbWFwICpl ODIwKTsKIGNvbnN0IHVuc2lnbmVkIGxvbmcgKmh5cGVydmlzb3JfcmVzZXJ2ZWRfcGFnZXModW5z aWduZWQgaW50ICpzaXplKTsKK3VpbnQzMl90IGh5cGVydmlzb3JfY3B1aWRfYmFzZSh2b2lkKTsK IAogREVDTEFSRV9QRVJfQ1BVKHVuc2lnbmVkIGludCwgdmNwdV9pZCk7CiBERUNMQVJFX1BFUl9D UFUoc3RydWN0IHZjcHVfaW5mbyAqLCB2Y3B1X2luZm8pOwpAQCAtNjYsNiArNjcsMTEgQEAgc3Rh dGljIGlubGluZSBjb25zdCB1bnNpZ25lZCBsb25nICpoeXBlcnZpc29yX3Jlc2VydmVkX3BhZ2Vz KHVuc2lnbmVkIGludCAqc2l6ZSkKICAgICBBU1NFUlRfVU5SRUFDSEFCTEUoKTsKICAgICByZXR1 cm4gTlVMTDsKIH07CitzdGF0aWMgaW5saW5lIHVpbnQzMl90IGh5cGVydmlzb3JfY3B1aWRfYmFz ZSh2b2lkKQoreworICAgIEFTU0VSVF9VTlJFQUNIQUJMRSgpOworICAgIHJldHVybiAwOworfTsK IAogI2VuZGlmIC8qIENPTkZJR19YRU5fR1VFU1QgKi8KICNlbmRpZiAvKiBfX1g4Nl9HVUVTVF9Y RU5fSF9fICovCmRpZmYgLS1naXQgYS94ZW4vaW5jbHVkZS9hc20teDg2L3B2L3NoaW0uaCBiL3hl bi9pbmNsdWRlL2FzbS14ODYvcHYvc2hpbS5oCmluZGV4IGIwYzM2MWNiYTEuLmZmN2MwNTBkYzYg MTAwNjQ0Ci0tLSBhL3hlbi9pbmNsdWRlL2FzbS14ODYvcHYvc2hpbS5oCisrKyBiL3hlbi9pbmNs dWRlL2FzbS14ODYvcHYvc2hpbS5oCkBAIC0zNSw2ICszNSw4IEBAIHZvaWQgcHZfc2hpbV9zZXR1 cF9kb20oc3RydWN0IGRvbWFpbiAqZCwgbDRfcGdlbnRyeV90ICpsNHN0YXJ0LAogICAgICAgICAg ICAgICAgICAgICAgICB1bnNpZ25lZCBsb25nIHZhX3N0YXJ0LCB1bnNpZ25lZCBsb25nIHN0b3Jl X3ZhLAogICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBsb25nIGNvbnNvbGVfdmEsIHVu c2lnbmVkIGxvbmcgdnBoeXNtYXAsCiAgICAgICAgICAgICAgICAgICAgICAgIHN0YXJ0X2luZm9f dCAqc2kpOwordm9pZCBwdl9zaGltX3NodXRkb3duKHVpbnQ4X3QgcmVhc29uKTsKK2RvbWlkX3Qg Z2V0X2luaXRpYWxfZG9tYWluX2lkKHZvaWQpOwogCiAjZWxzZQogCkBAIC00Nyw2ICs0OSwxNCBA QCBzdGF0aWMgaW5saW5lIHZvaWQgcHZfc2hpbV9zZXR1cF9kb20oc3RydWN0IGRvbWFpbiAqZCwg bDRfcGdlbnRyeV90ICpsNHN0YXJ0LAogewogICAgIEFTU0VSVF9VTlJFQUNIQUJMRSgpOwogfQor c3RhdGljIGlubGluZSB2b2lkIHB2X3NoaW1fc2h1dGRvd24odWludDhfdCByZWFzb24pCit7Cisg ICAgQVNTRVJUX1VOUkVBQ0hBQkxFKCk7Cit9CitzdGF0aWMgaW5saW5lIGRvbWlkX3QgZ2V0X2lu aXRpYWxfZG9tYWluX2lkKHZvaWQpCit7CisgICAgcmV0dXJuIDA7Cit9CiAKICNlbmRpZgogCi0t IAoyLjExLjAKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpo dHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs