From mboxrd@z Thu Jan 1 00:00:00 1970 From: Haozhong Zhang Subject: [RFC XEN PATCH v4 41/41] tools/libxl: build qemu options from xl vNVDIMM configs Date: Thu, 7 Dec 2017 18:10:30 +0800 Message-ID: <20171207101030.22364-42-haozhong.zhang@intel.com> References: <20171207101030.22364-1-haozhong.zhang@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20171207101030.22364-1-haozhong.zhang@intel.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: Haozhong Zhang , Wei Liu , Ian Jackson , Chao Peng , Dan Williams List-Id: xen-devel@lists.xenproject.org Rm9yIHhsIGNvbmZpZ3MKICB2bnZkaW1tcyA9IFsgJ3R5cGU9bWZuLGJhY2tlbmQ9JFBNRU0wX01G Tixucl9wYWdlcz0kTjAnLCAuLi4gXQoKdGhlIGZvbGxvd2luZyBxZW11IG9wdGlvbnMgd2lsbCBi ZSBidWlsdAoKICAtbWFjaGluZSA8ZXhpc3Rpbmcgb3B0aW9ucz4sbnZkaW1tCiAgLW0gPGV4aXN0 aW5nIG9wdGlvbnM+LHNsb3RzPSROUl9TTE9UUyxtYXhtZW09JE1FTV9TSVpFCiAgLW9iamVjdCBt ZW1vcnktYmFja2VuZC14ZW4saWQ9bWVtMSxob3N0LWFkZHI9JFBNRU0wX0FERFIsc2l6ZT0kUE1F TTBfU0laRQogIC1kZXZpY2UgbnZkaW1tLGlkPXhlbl9udmRpbW0xLG1lbWRldj1tZW0xCiAgLi4u CgppbiB3aGljaCwKIC0gTlJfU0xPVFMgaXMgdGhlIG51bWJlciBvZiBlbnRyaWVzIGluIHZudmRp bW1zICsgMSwKIC0gTUVNX1NJWkUgaXMgdGhlIHRvdGFsIHNpemUgb2YgYWxsIFJBTSBhbmQgTlZE SU1NIGRldmljZXMsCiAtIFBNRU0wX0FERFIgPSBQTUVNMF9NRk4gKiA0MDk2LAogLSBQTUVNMF9T SVpFID0gTjAgKiA0MDk2LAoKU2lnbmVkLW9mZi1ieTogSGFvemhvbmcgWmhhbmcgPGhhb3pob25n LnpoYW5nQGludGVsLmNvbT4KLS0tCkNjOiBJYW4gSmFja3NvbiA8aWFuLmphY2tzb25AZXUuY2l0 cml4LmNvbT4KQ2M6IFdlaSBMaXUgPHdlaS5saXUyQGNpdHJpeC5jb20+Ci0tLQogdG9vbHMvbGli eGwvbGlieGxfZG0uYyB8IDgxICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKy0tCiAxIGZpbGUgY2hhbmdlZCwgNzkgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS90b29scy9saWJ4bC9saWJ4bF9kbS5jIGIvdG9vbHMvbGlieGwv bGlieGxfZG0uYwppbmRleCBhMmVhOTVhOWJlLi5hYTIwMDc4NjQyIDEwMDY0NAotLS0gYS90b29s cy9saWJ4bC9saWJ4bF9kbS5jCisrKyBiL3Rvb2xzL2xpYnhsL2xpYnhsX2RtLmMKQEAgLTkzNSw2 ICs5MzUsNTggQEAgc3RhdGljIGNoYXIgKnFlbXVfZGlza19pZGVfZHJpdmVfc3RyaW5nKGxpYnhs X19nYyAqZ2MsIGNvbnN0IGNoYXIgKnRhcmdldF9wYXRoLAogICAgIHJldHVybiBkcml2ZTsKIH0K IAorI2lmIGRlZmluZWQoX19saW51eF9fKQorCitzdGF0aWMgdWludDY0X3QgbGlieGxfX2J1aWxk X2RtX3ZudmRpbW1fYXJncygKKyAgICBsaWJ4bF9fZ2MgKmdjLCBmbGV4YXJyYXlfdCAqZG1fYXJn cywKKyAgICBzdHJ1Y3QgbGlieGxfZGV2aWNlX3ZudmRpbW0gKmRldiwgaW50IGRldl9ubykKK3sK KyAgICB1aW50NjRfdCBhZGRyID0gMCwgc2l6ZSA9IDA7CisgICAgY2hhciAqYXJnOworCisgICAg c3dpdGNoIChkZXYtPmJhY2tlbmRfdHlwZSkKKyAgICB7CisgICAgY2FzZSBMSUJYTF9WTlZESU1N X0JBQ0tFTkRfVFlQRV9NRk46CisgICAgICAgIGFkZHIgPSBkZXYtPnUubWZuIDw8IFhDX1BBR0Vf U0hJRlQ7CisgICAgICAgIHNpemUgPSBkZXYtPm5yX3BhZ2VzIDw8IFhDX1BBR0VfU0hJRlQ7Cisg ICAgICAgIGJyZWFrOworICAgIH0KKworICAgIGlmICghc2l6ZSkKKyAgICAgICAgcmV0dXJuIDA7 CisKKyAgICBmbGV4YXJyYXlfYXBwZW5kKGRtX2FyZ3MsICItb2JqZWN0Iik7CisgICAgYXJnID0g R0NTUFJJTlRGKCJtZW1vcnktYmFja2VuZC14ZW4saWQ9bWVtJWQsaG9zdC1hZGRyPSUiUFJJdTY0 IixzaXplPSUiUFJJdTY0LAorICAgICAgICAgICAgICAgICAgICBkZXZfbm8gKyAxLCBhZGRyLCBz aXplKTsKKyAgICBmbGV4YXJyYXlfYXBwZW5kKGRtX2FyZ3MsIGFyZyk7CisKKyAgICBmbGV4YXJy YXlfYXBwZW5kKGRtX2FyZ3MsICItZGV2aWNlIik7CisgICAgYXJnID0gR0NTUFJJTlRGKCJudmRp bW0saWQ9eGVuX252ZGltbSVkLG1lbWRldj1tZW0lZCIsCisgICAgICAgICAgICAgICAgICAgIGRl dl9ubyArIDEsIGRldl9ubyArIDEpOworICAgIGZsZXhhcnJheV9hcHBlbmQoZG1fYXJncywgYXJn KTsKKworICAgIHJldHVybiBzaXplOworfQorCitzdGF0aWMgdWludDY0X3QgbGlieGxfX2J1aWxk X2RtX3ZudmRpbW1zX2FyZ3MoCisgICAgbGlieGxfX2djICpnYywgZmxleGFycmF5X3QgKmRtX2Fy Z3MsCisgICAgc3RydWN0IGxpYnhsX2RldmljZV92bnZkaW1tICp2bnZkaW1tcywgaW50IG51bV92 bnZkaW1tcykKK3sKKyAgICB1aW50NjRfdCB0b3RhbF9zaXplID0gMCwgc2l6ZTsKKyAgICB1bnNp Z25lZCBpbnQgaTsKKworICAgIGZvciAoaSA9IDA7IGkgPCBudW1fdm52ZGltbXM7IGkrKykgewor ICAgICAgICBzaXplID0gbGlieGxfX2J1aWxkX2RtX3ZudmRpbW1fYXJncyhnYywgZG1fYXJncywg JnZudmRpbW1zW2ldLCBpKTsKKyAgICAgICAgaWYgKCFzaXplKQorICAgICAgICAgICAgYnJlYWs7 CisgICAgICAgIHRvdGFsX3NpemUgKz0gc2l6ZTsKKyAgICB9CisKKyAgICByZXR1cm4gdG90YWxf c2l6ZTsKK30KKworI2VuZGlmIC8qIF9fbGludXhfXyAqLworCiBzdGF0aWMgaW50IGxpYnhsX19i dWlsZF9kZXZpY2VfbW9kZWxfYXJnc19uZXcobGlieGxfX2djICpnYywKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBjaGFyICpkbSwgaW50IGd1ZXN0X2RvbWlk LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGxpYnhsX2Rv bWFpbl9jb25maWcgKmd1ZXN0X2NvbmZpZywKQEAgLTk0OCwxMyArMTAwMCwxOCBAQCBzdGF0aWMg aW50IGxpYnhsX19idWlsZF9kZXZpY2VfbW9kZWxfYXJnc19uZXcobGlieGxfX2djICpnYywKICAg ICBjb25zdCBsaWJ4bF9kZXZpY2VfbmljICpuaWNzID0gZ3Vlc3RfY29uZmlnLT5uaWNzOwogICAg IGNvbnN0IGludCBudW1fZGlza3MgPSBndWVzdF9jb25maWctPm51bV9kaXNrczsKICAgICBjb25z dCBpbnQgbnVtX25pY3MgPSBndWVzdF9jb25maWctPm51bV9uaWNzOworI2lmIGRlZmluZWQoX19s aW51eF9fKQorICAgIGNvbnN0IGludCBudW1fdm52ZGltbXMgPSBndWVzdF9jb25maWctPm51bV92 bnZkaW1tczsKKyNlbHNlCisgICAgY29uc3QgaW50IG51bV92bnZkaW1tcyA9IDA7CisjZW5kaWYK ICAgICBjb25zdCBsaWJ4bF92bmNfaW5mbyAqdm5jID0gbGlieGxfX2RtX3ZuYyhndWVzdF9jb25m aWcpOwogICAgIGNvbnN0IGxpYnhsX3NkbF9pbmZvICpzZGwgPSBkbV9zZGwoZ3Vlc3RfY29uZmln KTsKICAgICBjb25zdCBjaGFyICprZXltYXAgPSBkbV9rZXltYXAoZ3Vlc3RfY29uZmlnKTsKICAg ICBjaGFyICptYWNoaW5lYXJnOwogICAgIGZsZXhhcnJheV90ICpkbV9hcmdzLCAqZG1fZW52czsK ICAgICBpbnQgaSwgY29ubmVjdGlvbiwgZGV2aWQsIHJldDsKLSAgICB1aW50NjRfdCByYW1fc2l6 ZTsKKyAgICB1aW50NjRfdCByYW1fc2l6ZSwgcmFtX3NpemVfaW5fYnl0ZSA9IDAsIHZudmRpbW1z X3NpemUgPSAwOwogICAgIGNvbnN0IGNoYXIgKnBhdGgsICpjaGFyZGV2OwogICAgIGNoYXIgKnVz ZXIgPSBOVUxMOwogICAgIHN0cnVjdCBwYXNzd2QgKnVzZXJfYmFzZSwgdXNlcl9wd2J1ZjsKQEAg LTE0ODEsNiArMTUzOCw5IEBAIHN0YXRpYyBpbnQgbGlieGxfX2J1aWxkX2RldmljZV9tb2RlbF9h cmdzX25ldyhsaWJ4bF9fZ2MgKmdjLAogICAgICAgICAgICAgfQogICAgICAgICB9CiAKKyAgICAg ICAgaWYgKG51bV92bnZkaW1tcykKKyAgICAgICAgICAgIG1hY2hpbmVhcmcgPSBsaWJ4bF9fc3By aW50ZihnYywgIiVzLG52ZGltbSIsIG1hY2hpbmVhcmcpOworCiAgICAgICAgIGZsZXhhcnJheV9h cHBlbmQoZG1fYXJncywgbWFjaGluZWFyZyk7CiAgICAgICAgIGZvciAoaSA9IDA7IGJfaW5mby0+ ZXh0cmFfaHZtICYmIGJfaW5mby0+ZXh0cmFfaHZtW2ldICE9IE5VTEw7IGkrKykKICAgICAgICAg ICAgIGZsZXhhcnJheV9hcHBlbmQoZG1fYXJncywgYl9pbmZvLT5leHRyYV9odm1baV0pOwpAQCAt MTQ5MCw4ICsxNTUwLDI1IEBAIHN0YXRpYyBpbnQgbGlieGxfX2J1aWxkX2RldmljZV9tb2RlbF9h cmdzX25ldyhsaWJ4bF9fZ2MgKmdjLAogICAgIH0KIAogICAgIHJhbV9zaXplID0gbGlieGxfX3Np emVrYl90b19tYihiX2luZm8tPm1heF9tZW1rYiAtIGJfaW5mby0+dmlkZW9fbWVta2IpOworICAg IGlmIChudW1fdm52ZGltbXMpIHsKKyAgICAgICAgcmFtX3NpemVfaW5fYnl0ZSA9IHJhbV9zaXpl IDw8IDIwOworICAgICAgICB2bnZkaW1tc19zaXplID0gbGlieGxfX2J1aWxkX2RtX3ZudmRpbW1z X2FyZ3MoZ2MsIGRtX2FyZ3MsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBndWVzdF9jb25maWctPnZudmRpbW1zLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbnVtX3ZudmRpbW1zKTsKKyAg ICAgICAgaWYgKHJhbV9zaXplX2luX2J5dGUgKyB2bnZkaW1tc19zaXplIDwgcmFtX3NpemVfaW5f Ynl0ZSkgeworICAgICAgICAgICAgTE9HKEVSUk9SLAorICAgICAgICAgICAgICAgICJ0b3RhbCBz aXplIG9mIFJBTSAoJSJQUkl1NjQiKSBhbmQgTlZESU1NICglIlBSSXU2NCIpIG92ZXJmbG93IiwK KyAgICAgICAgICAgICAgICByYW1fc2l6ZV9pbl9ieXRlLCB2bnZkaW1tc19zaXplKTsKKyAgICAg ICAgICAgIHJldHVybiBFUlJPUl9JTlZBTDsKKyAgICAgICAgfQorICAgIH0KICAgICBmbGV4YXJy YXlfYXBwZW5kKGRtX2FyZ3MsICItbSIpOwotICAgIGZsZXhhcnJheV9hcHBlbmQoZG1fYXJncywg R0NTUFJJTlRGKCIlIlBSSWQ2NCwgcmFtX3NpemUpKTsKKyAgICBmbGV4YXJyYXlfYXBwZW5kKGRt X2FyZ3MsCisgICAgICAgICAgICAgICAgICAgICB2bnZkaW1tc19zaXplID8KKyAgICAgICAgICAg ICAgICAgICAgIEdDU1BSSU5URigiJSJQUklkNjQiLHNsb3RzPSVkLG1heG1lbT0lIlBSSWQ2NCwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByYW1fc2l6ZSwgbnVtX3ZudmRpbW1zICsg MSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBST1VORFVQKHJhbV9zaXplX2luX2J5 dGUsIDEyKSArIHZudmRpbW1zX3NpemUpIDoKKyAgICAgICAgICAgICAgICAgICAgIEdDU1BSSU5U RigiJSJQUklkNjQsIHJhbV9zaXplKSk7CiAKICAgICBpZiAoYl9pbmZvLT50eXBlID09IExJQlhM X0RPTUFJTl9UWVBFX0hWTSkgewogICAgICAgICBpZiAoYl9pbmZvLT51Lmh2bS5oZHR5cGUgPT0g TElCWExfSERUWVBFX0FIQ0kpCi0tIAoyLjE1LjEKCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBs aXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4v bGlzdGluZm8veGVuLWRldmVs