From mboxrd@z Thu Jan 1 00:00:00 1970 From: Haozhong Zhang Subject: [RFC XEN PATCH v3 39/39] tools/libxl: build qemu options from xl vNVDIMM configs Date: Mon, 11 Sep 2017 12:38:20 +0800 Message-ID: <20170911043820.14617-40-haozhong.zhang@intel.com> References: <20170911043820.14617-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: <20170911043820.14617-1-haozhong.zhang@intel.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.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 bGlieGxfZG0uYwppbmRleCBlMGU2YTk5ZTY3Li45YmRiM2NkYjI5IDEwMDY0NAotLS0gYS90b29s cy9saWJ4bC9saWJ4bF9kbS5jCisrKyBiL3Rvb2xzL2xpYnhsL2xpYnhsX2RtLmMKQEAgLTkxMCw2 ICs5MTAsNTggQEAgc3RhdGljIGNoYXIgKnFlbXVfZGlza19pZGVfZHJpdmVfc3RyaW5nKGxpYnhs 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 bWFpbl9jb25maWcgKmd1ZXN0X2NvbmZpZywKQEAgLTkyMywxMyArOTc1LDE4IEBAIHN0YXRpYyBp bnQgbGlieGxfX2J1aWxkX2RldmljZV9tb2RlbF9hcmdzX25ldyhsaWJ4bF9fZ2MgKmdjLAogICAg IGNvbnN0IGxpYnhsX2RldmljZV9uaWMgKm5pY3MgPSBndWVzdF9jb25maWctPm5pY3M7CiAgICAg Y29uc3QgaW50IG51bV9kaXNrcyA9IGd1ZXN0X2NvbmZpZy0+bnVtX2Rpc2tzOwogICAgIGNvbnN0 IGludCBudW1fbmljcyA9IGd1ZXN0X2NvbmZpZy0+bnVtX25pY3M7CisjaWYgZGVmaW5lZChfX2xp bnV4X18pCisgICAgY29uc3QgaW50IG51bV92bnZkaW1tcyA9IGd1ZXN0X2NvbmZpZy0+bnVtX3Zu dmRpbW1zOworI2Vsc2UKKyAgICBjb25zdCBpbnQgbnVtX3ZudmRpbW1zID0gMDsKKyNlbmRpZgog ICAgIGNvbnN0IGxpYnhsX3ZuY19pbmZvICp2bmMgPSBsaWJ4bF9fZG1fdm5jKGd1ZXN0X2NvbmZp Zyk7CiAgICAgY29uc3QgbGlieGxfc2RsX2luZm8gKnNkbCA9IGRtX3NkbChndWVzdF9jb25maWcp OwogICAgIGNvbnN0IGNoYXIgKmtleW1hcCA9IGRtX2tleW1hcChndWVzdF9jb25maWcpOwogICAg IGNoYXIgKm1hY2hpbmVhcmc7CiAgICAgZmxleGFycmF5X3QgKmRtX2FyZ3MsICpkbV9lbnZzOwog ICAgIGludCBpLCBjb25uZWN0aW9uLCBkZXZpZCwgcmV0OwotICAgIHVpbnQ2NF90IHJhbV9zaXpl OworICAgIHVpbnQ2NF90IHJhbV9zaXplLCByYW1fc2l6ZV9pbl9ieXRlID0gMCwgdm52ZGltbXNf c2l6ZSA9IDA7CiAgICAgY29uc3QgY2hhciAqcGF0aCwgKmNoYXJkZXY7CiAgICAgY2hhciAqdXNl ciA9IE5VTEw7CiAKQEAgLTE0NTEsNiArMTUwOCw5IEBAIHN0YXRpYyBpbnQgbGlieGxfX2J1aWxk X2RldmljZV9tb2RlbF9hcmdzX25ldyhsaWJ4bF9fZ2MgKmdjLAogICAgICAgICAgICAgfQogICAg ICAgICB9CiAKKyAgICAgICAgaWYgKG51bV92bnZkaW1tcykKKyAgICAgICAgICAgIG1hY2hpbmVh cmcgPSBsaWJ4bF9fc3ByaW50ZihnYywgIiVzLG52ZGltbSIsIG1hY2hpbmVhcmcpOworCiAgICAg ICAgIGZsZXhhcnJheV9hcHBlbmQoZG1fYXJncywgbWFjaGluZWFyZyk7CiAgICAgICAgIGZvciAo aSA9IDA7IGJfaW5mby0+ZXh0cmFfaHZtICYmIGJfaW5mby0+ZXh0cmFfaHZtW2ldICE9IE5VTEw7 IGkrKykKICAgICAgICAgICAgIGZsZXhhcnJheV9hcHBlbmQoZG1fYXJncywgYl9pbmZvLT5leHRy YV9odm1baV0pOwpAQCAtMTQ2MCw4ICsxNTIwLDI1IEBAIHN0YXRpYyBpbnQgbGlieGxfX2J1aWxk X2RldmljZV9tb2RlbF9hcmdzX25ldyhsaWJ4bF9fZ2MgKmdjLAogICAgIH0KIAogICAgIHJhbV9z aXplID0gbGlieGxfX3NpemVrYl90b19tYihiX2luZm8tPm1heF9tZW1rYiAtIGJfaW5mby0+dmlk ZW9fbWVta2IpOworICAgIGlmIChudW1fdm52ZGltbXMpIHsKKyAgICAgICAgcmFtX3NpemVfaW5f Ynl0ZSA9IHJhbV9zaXplIDw8IDIwOworICAgICAgICB2bnZkaW1tc19zaXplID0gbGlieGxfX2J1 aWxkX2RtX3ZudmRpbW1zX2FyZ3MoZ2MsIGRtX2FyZ3MsCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBndWVzdF9jb25maWctPnZudmRpbW1zLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbnVt X3ZudmRpbW1zKTsKKyAgICAgICAgaWYgKHJhbV9zaXplX2luX2J5dGUgKyB2bnZkaW1tc19zaXpl IDwgcmFtX3NpemVfaW5fYnl0ZSkgeworICAgICAgICAgICAgTE9HKEVSUk9SLAorICAgICAgICAg ICAgICAgICJ0b3RhbCBzaXplIG9mIFJBTSAoJSJQUkl1NjQiKSBhbmQgTlZESU1NICglIlBSSXU2 NCIpIG92ZXJmbG93IiwKKyAgICAgICAgICAgICAgICByYW1fc2l6ZV9pbl9ieXRlLCB2bnZkaW1t c19zaXplKTsKKyAgICAgICAgICAgIHJldHVybiBFUlJPUl9JTlZBTDsKKyAgICAgICAgfQorICAg IH0KICAgICBmbGV4YXJyYXlfYXBwZW5kKGRtX2FyZ3MsICItbSIpOwotICAgIGZsZXhhcnJheV9h cHBlbmQoZG1fYXJncywgR0NTUFJJTlRGKCIlIlBSSWQ2NCwgcmFtX3NpemUpKTsKKyAgICBmbGV4 YXJyYXlfYXBwZW5kKGRtX2FyZ3MsCisgICAgICAgICAgICAgICAgICAgICB2bnZkaW1tc19zaXpl ID8KKyAgICAgICAgICAgICAgICAgICAgIEdDU1BSSU5URigiJSJQUklkNjQiLHNsb3RzPSVkLG1h eG1lbT0lIlBSSWQ2NCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByYW1fc2l6ZSwg bnVtX3ZudmRpbW1zICsgMSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBST1VORFVQ KHJhbV9zaXplX2luX2J5dGUsIDEyKSArIHZudmRpbW1zX3NpemUpIDoKKyAgICAgICAgICAgICAg ICAgICAgIEdDU1BSSU5URigiJSJQUklkNjQsIHJhbV9zaXplKSk7CiAKICAgICBpZiAoYl9pbmZv LT50eXBlID09IExJQlhMX0RPTUFJTl9UWVBFX0hWTSkgewogICAgICAgICBpZiAoYl9pbmZvLT51 Lmh2bS5oZHR5cGUgPT0gTElCWExfSERUWVBFX0FIQ0kpCi0tIAoyLjE0LjEKCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBs aXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2 ZWwK