From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maran Wilson Subject: [PATCH v3 2/4] libxl: Move libxl__arch_domain_construct_memmap() earlier Date: Thu, 15 Mar 2018 14:35:16 -0700 Message-ID: <1521149718-21290-1-git-send-email-maran.wilson@oracle.com> References: <1521149589-21200-1-git-send-email-maran.wilson@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1521149589-21200-1-git-send-email-maran.wilson@oracle.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: xen-devel@lists.xen.org Cc: wei.liu2@citrix.com, boris.ostrovsky@oracle.com, roger.pau@citrix.com, ian.jackson@eu.citrix.com, maran.wilson@oracle.com List-Id: xen-devel@lists.xenproject.org RnJvbTogQm9yaXMgT3N0cm92c2t5IDxib3Jpcy5vc3Ryb3Zza3lAb3JhY2xlLmNvbT4KClNpbmNl IGh2bV9zdGFydF9pbmZvIGhhcyBub3cgYmVlbiBleHBhbmRlZCB0byBpbmNsdWRlIFBWSCBndWVz dCdzCm1lbW9yeSBtYXAgKGkuZS4gZTgyMCkgd2UgbmVlZCB0byBrbm93IHNpemUgb2YgdGhpcyBt YXAgYnkgdGhlIHRpbWUgd2UKY3JlYXRlIGRvbS0+c3RhcnRfaW5mb19zZWcgaW4gYWxsb2NfbWFn aWNfcGFnZXNfaHZtKCkuCgpUbyBkbyBzbyB3ZSBoYXZlIHRvIGNhbGwgbGlieGxfX2FyY2hfZG9t YWluX2NvbnN0cnVjdF9tZW1tYXAoKSBlYXJsaWVyLApiZWZvcmUgeGNfZG9tX2J1aWxkX2ltYWdl KCkuCgpTaWduZWQtb2ZmLWJ5OiBCb3JpcyBPc3Ryb3Zza3kgPGJvcmlzLm9zdHJvdnNreUBvcmFj bGUuY29tPgotLS0KIHRvb2xzL2xpYnhsL2xpYnhsX2NyZWF0ZS5jICAgfCAgMiArLQogdG9vbHMv bGlieGwvbGlieGxfZG9tLmMgICAgICB8IDEyICsrKysrKysrKy0tLQogdG9vbHMvbGlieGwvbGli eGxfaW50ZXJuYWwuaCB8ICAxICsKIHRvb2xzL2xpYnhsL2xpYnhsX3g4Ni5jICAgICAgfCAgMyAr KysKIDQgZmlsZXMgY2hhbmdlZCwgMTQgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS90b29scy9saWJ4bC9saWJ4bF9jcmVhdGUuYyBiL3Rvb2xzL2xpYnhsL2xpYnhs X2NyZWF0ZS5jCmluZGV4IGM0OTgxMzUuLjVkY2UzZGYgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2xpYnhs L2xpYnhsX2NyZWF0ZS5jCisrKyBiL3Rvb2xzL2xpYnhsL2xpYnhsX2NyZWF0ZS5jCkBAIC00ODgs NyArNDg4LDcgQEAgaW50IGxpYnhsX19kb21haW5fYnVpbGQobGlieGxfX2djICpnYywKIAogICAg ICAgICBicmVhazsKICAgICBjYXNlIExJQlhMX0RPTUFJTl9UWVBFX1BWOgotICAgICAgICByZXQg PSBsaWJ4bF9fYnVpbGRfcHYoZ2MsIGRvbWlkLCBpbmZvLCBzdGF0ZSk7CisgICAgICAgIHJldCA9 IGxpYnhsX19idWlsZF9wdihnYywgZG9taWQsIGRfY29uZmlnLCBpbmZvLCBzdGF0ZSk7CiAgICAg ICAgIGlmIChyZXQpCiAgICAgICAgICAgICBnb3RvIG91dDsKIApkaWZmIC0tZ2l0IGEvdG9vbHMv bGlieGwvbGlieGxfZG9tLmMgYi90b29scy9saWJ4bC9saWJ4bF9kb20uYwppbmRleCAyZTI5YjUy Li45MTdiNDVlIDEwMDY0NAotLS0gYS90b29scy9saWJ4bC9saWJ4bF9kb20uYworKysgYi90b29s cy9saWJ4bC9saWJ4bF9kb20uYwpAQCAtNjk4LDYgKzY5OCw3IEBAIHN0YXRpYyBpbnQgc2V0X3Zu dW1hX2luZm8obGlieGxfX2djICpnYywgdWludDMyX3QgZG9taWQsCiB9CiAKIHN0YXRpYyBpbnQg bGlieGxfX2J1aWxkX2RvbShsaWJ4bF9fZ2MgKmdjLCB1aW50MzJfdCBkb21pZCwKKyAgICAgICAg ICAgICBsaWJ4bF9kb21haW5fY29uZmlnICpkX2NvbmZpZywKICAgICAgICAgICAgICBsaWJ4bF9k b21haW5fYnVpbGRfaW5mbyAqaW5mbywgbGlieGxfX2RvbWFpbl9idWlsZF9zdGF0ZSAqc3RhdGUs CiAgICAgICAgICAgICAgc3RydWN0IHhjX2RvbV9pbWFnZSAqZG9tKQogewpAQCAtNzM3LDYgKzcz OCwxMSBAQCBzdGF0aWMgaW50IGxpYnhsX19idWlsZF9kb20obGlieGxfX2djICpnYywgdWludDMy X3QgZG9taWQsCiAgICAgICAgIExPR0UoRVJST1IsICJsaWJ4bF9fYXJjaF9kb21haW5fZmluYWxp c2VfaHdfZGVzY3JpcHRpb24gZmFpbGVkIik7CiAgICAgICAgIGdvdG8gb3V0OwogICAgIH0KKyAg ICByZXQgPSBsaWJ4bF9fYXJjaF9kb21haW5fY29uc3RydWN0X21lbW1hcChnYywgZF9jb25maWcs IGRvbWlkLCBkb20pOworICAgIGlmIChyZXQgIT0gMCkgeworICAgICAgICBMT0coRVJST1IsICJz ZXR0aW5nIGRvbWFpbiBtZW1vcnkgbWFwIGZhaWxlZCIpOworICAgICAgICBnb3RvIG91dDsKKyAg ICB9CiAgICAgaWYgKCAocmV0ID0geGNfZG9tX2J1aWxkX2ltYWdlKGRvbSkpICE9IDAgKSB7CiAg ICAgICAgIExPR0UoRVJST1IsICJ4Y19kb21fYnVpbGRfaW1hZ2UgZmFpbGVkIik7CiAgICAgICAg IGdvdG8gb3V0OwpAQCAtNzU4LDcgKzc2NCw3IEBAIG91dDoKICAgICByZXR1cm4gcmV0ICE9IDAg PyBFUlJPUl9GQUlMIDogMDsKIH0KIAotaW50IGxpYnhsX19idWlsZF9wdihsaWJ4bF9fZ2MgKmdj LCB1aW50MzJfdCBkb21pZCwKK2ludCBsaWJ4bF9fYnVpbGRfcHYobGlieGxfX2djICpnYywgdWlu dDMyX3QgZG9taWQsIGxpYnhsX2RvbWFpbl9jb25maWcgKmRfY29uZmlnLAogICAgICAgICAgICAg IGxpYnhsX2RvbWFpbl9idWlsZF9pbmZvICppbmZvLCBsaWJ4bF9fZG9tYWluX2J1aWxkX3N0YXRl ICpzdGF0ZSkKIHsKICAgICBsaWJ4bF9jdHggKmN0eCA9IGxpYnhsX19nY19vd25lcihnYyk7CkBA IC04NDcsNyArODUzLDcgQEAgaW50IGxpYnhsX19idWlsZF9wdihsaWJ4bF9fZ2MgKmdjLCB1aW50 MzJfdCBkb21pZCwKICAgICAgICAgICAgIGRvbS0+dm5vZGVfdG9fcG5vZGVbaV0gPSBpbmZvLT52 bnVtYV9ub2Rlc1tpXS5wbm9kZTsKICAgICB9CiAKLSAgICByZXQgPSBsaWJ4bF9fYnVpbGRfZG9t KGdjLCBkb21pZCwgaW5mbywgc3RhdGUsIGRvbSk7CisgICAgcmV0ID0gbGlieGxfX2J1aWxkX2Rv bShnYywgZG9taWQsIGRfY29uZmlnLCBpbmZvLCBzdGF0ZSwgZG9tKTsKICAgICBpZiAocmV0ICE9 IDApCiAgICAgICAgIGdvdG8gb3V0OwogCkBAIC0xMjkzLDcgKzEyOTksNyBAQCBpbnQgbGlieGxf X2J1aWxkX2h2bShsaWJ4bF9fZ2MgKmdjLCB1aW50MzJfdCBkb21pZCwKICAgICAgICAgICAgIGRv bS0+dm5vZGVfdG9fcG5vZGVbaV0gPSBpbmZvLT52bnVtYV9ub2Rlc1tpXS5wbm9kZTsKICAgICB9 CiAKLSAgICByYyA9IGxpYnhsX19idWlsZF9kb20oZ2MsIGRvbWlkLCBpbmZvLCBzdGF0ZSwgZG9t KTsKKyAgICByYyA9IGxpYnhsX19idWlsZF9kb20oZ2MsIGRvbWlkLCBkX2NvbmZpZywgaW5mbywg c3RhdGUsIGRvbSk7CiAgICAgaWYgKHJjICE9IDApCiAgICAgICAgIGdvdG8gb3V0OwogCmRpZmYg LS1naXQgYS90b29scy9saWJ4bC9saWJ4bF9pbnRlcm5hbC5oIGIvdG9vbHMvbGlieGwvbGlieGxf aW50ZXJuYWwuaAppbmRleCA1MDY2ODdmLi45MTRkZjIzIDEwMDY0NAotLS0gYS90b29scy9saWJ4 bC9saWJ4bF9pbnRlcm5hbC5oCisrKyBiL3Rvb2xzL2xpYnhsL2xpYnhsX2ludGVybmFsLmgKQEAg LTExNTksNiArMTE1OSw3IEBAIF9oaWRkZW4gaW50IGxpYnhsX19idWlsZF9wb3N0KGxpYnhsX19n YyAqZ2MsIHVpbnQzMl90IGRvbWlkLAogICAgICAgICAgICAgICAgY2hhciAqKnZtc19lbnRzLCBj aGFyICoqbG9jYWxfZW50cyk7CiAKIF9oaWRkZW4gaW50IGxpYnhsX19idWlsZF9wdihsaWJ4bF9f Z2MgKmdjLCB1aW50MzJfdCBkb21pZCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBsaWJ4 bF9kb21haW5fY29uZmlnICpjb25zdCBkX2NvbmZpZywKICAgICAgICAgICAgICBsaWJ4bF9kb21h aW5fYnVpbGRfaW5mbyAqaW5mbywgbGlieGxfX2RvbWFpbl9idWlsZF9zdGF0ZSAqc3RhdGUpOwog X2hpZGRlbiBpbnQgbGlieGxfX2J1aWxkX2h2bShsaWJ4bF9fZ2MgKmdjLCB1aW50MzJfdCBkb21p ZCwKICAgICAgICAgICAgICAgbGlieGxfZG9tYWluX2NvbmZpZyAqZF9jb25maWcsCmRpZmYgLS1n aXQgYS90b29scy9saWJ4bC9saWJ4bF94ODYuYyBiL3Rvb2xzL2xpYnhsL2xpYnhsX3g4Ni5jCmlu ZGV4IGQ4MjAxM2YuLjMzMzFjYzUgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2xpYnhsL2xpYnhsX3g4Ni5j CisrKyBiL3Rvb2xzL2xpYnhsL2xpYnhsX3g4Ni5jCkBAIC01MjUsNiArNTI1LDkgQEAgaW50IGxp YnhsX19hcmNoX2RvbWFpbl9jb25zdHJ1Y3RfbWVtbWFwKGxpYnhsX19nYyAqZ2MsCiAgICAgdWlu dDMyX3QgbG93bWVtX3N0YXJ0ID0gZG9tLT5kZXZpY2VfbW9kZWwgPyBHVUVTVF9MT1dfTUVNX1NU QVJUX0RFRkFVTFQgOiAwOwogICAgIHVuc2lnbmVkIHBhZ2Vfc2l6ZSA9IFhDX0RPTV9QQUdFX1NJ WkUoZG9tKTsKIAorICAgIGlmIChkX2NvbmZpZy0+Yl9pbmZvLnR5cGUgPT0gTElCWExfRE9NQUlO X1RZUEVfUFYpCisgICAgICAgIHJldHVybiAwOworCiAgICAgLyogQWRkIGFsbCByZG0gZW50cmll cy4gKi8KICAgICBmb3IgKGkgPSAwOyBpIDwgZF9jb25maWctPm51bV9yZG1zOyBpKyspCiAgICAg ICAgIGlmIChkX2NvbmZpZy0+cmRtc1tpXS5wb2xpY3kgIT0gTElCWExfUkRNX1JFU0VSVkVfUE9M SUNZX0lOVkFMSUQpCi0tIAoxLjguMy4xCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMu eGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3Rp bmZvL3hlbi1kZXZlbA==