From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yi Sun Subject: [RFC 11/16] tools: refactor codes to make get val be more general. Date: Tue, 10 Jan 2017 15:42:30 +0800 Message-ID: <1484034155-4521-12-git-send-email-yi.y.sun@linux.intel.com> References: <1484034155-4521-1-git-send-email-yi.y.sun@linux.intel.com> 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 1cQr5x-00044Y-TJ for xen-devel@lists.xenproject.org; Tue, 10 Jan 2017 07:43:50 +0000 In-Reply-To: <1484034155-4521-1-git-send-email-yi.y.sun@linux.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.xenproject.org Cc: wei.liu2@citrix.com, he.chen@linux.intel.com, andrew.cooper3@citrix.com, ian.jackson@eu.citrix.com, Yi Sun , jbeulich@suse.com, chao.p.peng@linux.intel.com List-Id: xen-devel@lists.xenproject.org VGhpcyBwYXRjaCByZWZhY3RvcnMgc29tZSBjb2RlcyBpbiB0b29scy8gdG8gbWFrZSBnZXQgdmFs dWUKYmUgbW9yZSBnZW5lcmFsLgoKU2lnbmVkLW9mZi1ieTogWWkgU3VuIDx5aS55LnN1bkBsaW51 eC5pbnRlbC5jb20+Ci0tLQogdG9vbHMvbGlieGMvaW5jbHVkZS94ZW5jdHJsLmggfCAxMiArKyst LS0tCiB0b29scy9saWJ4Yy94Y19wc3IuYyAgICAgICAgICB8ICA4ICsrLS0tCiB0b29scy9saWJ4 bC9saWJ4bF9wc3IuYyAgICAgICB8IDgwICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgNzUgaW5zZXJ0aW9ucygrKSwgMjUgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvdG9vbHMvbGlieGMvaW5jbHVkZS94ZW5jdHJsLmggYi90b29s cy9saWJ4Yy9pbmNsdWRlL3hlbmN0cmwuaAppbmRleCBmYTYyZTJhLi42OWY5MzQzIDEwMDY0NAot LS0gYS90b29scy9saWJ4Yy9pbmNsdWRlL3hlbmN0cmwuaAorKysgYi90b29scy9saWJ4Yy9pbmNs dWRlL3hlbmN0cmwuaApAQCAtMjU5OCwxMyArMjU5OCwxMyBAQCBlbnVtIHhjX3Bzcl9jbXRfdHlw ZSB7CiB9OwogdHlwZWRlZiBlbnVtIHhjX3Bzcl9jbXRfdHlwZSB4Y19wc3JfY210X3R5cGU7CiAK LWVudW0geGNfcHNyX2NhdF90eXBlIHsKK2VudW0geGNfcHNyX3ZhbF90eXBlIHsKICAgICBYQ19Q U1JfQ0FUX0wzX0NCTSAgICAgID0gMSwKICAgICBYQ19QU1JfQ0FUX0wzX0NCTV9DT0RFID0gMiwK ICAgICBYQ19QU1JfQ0FUX0wzX0NCTV9EQVRBID0gMywKICAgICBYQ19QU1JfQ0FUX0wyX0NCTSAg ICAgID0gNCwKIH07Ci10eXBlZGVmIGVudW0geGNfcHNyX2NhdF90eXBlIHhjX3Bzcl9jYXRfdHlw ZTsKK3R5cGVkZWYgZW51bSB4Y19wc3JfdmFsX3R5cGUgeGNfcHNyX3ZhbF90eXBlOwogCiBlbnVt IHhjX3Bzcl9mZWF0X3R5cGUgewogICAgIFhDX1BTUl9GRUFUX1VOS05PV04gICAgPSAwLApAQCAt MjY0MCwxMSArMjY0MCwxMSBAQCBpbnQgeGNfcHNyX2NtdF9nZXRfZGF0YSh4Y19pbnRlcmZhY2Ug KnhjaCwgdWludDMyX3Qgcm1pZCwgdWludDMyX3QgY3B1LAogaW50IHhjX3Bzcl9jbXRfZW5hYmxl ZCh4Y19pbnRlcmZhY2UgKnhjaCk7CiAKIGludCB4Y19wc3JfY2F0X3NldF9kb21haW5fZGF0YSh4 Y19pbnRlcmZhY2UgKnhjaCwgdWludDMyX3QgZG9taWQsCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgeGNfcHNyX2NhdF90eXBlIHR5cGUsIHVpbnQzMl90IHRhcmdldCwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICB4Y19wc3JfdmFsX3R5cGUgdHlwZSwgdWludDMyX3QgdGFy Z2V0LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQ2NF90IGRhdGEpOwotaW50 IHhjX3Bzcl9jYXRfZ2V0X2RvbWFpbl9kYXRhKHhjX2ludGVyZmFjZSAqeGNoLCB1aW50MzJfdCBk b21pZCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB4Y19wc3JfY2F0X3R5cGUgdHlw ZSwgdWludDMyX3QgdGFyZ2V0LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQ2 NF90ICpkYXRhKTsKK2ludCB4Y19wc3JfZ2V0X2RvbWFpbl9kYXRhKHhjX2ludGVyZmFjZSAqeGNo LCB1aW50MzJfdCBkb21pZCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIHhjX3Bzcl92YWxf dHlwZSB0eXBlLCB1aW50MzJfdCB0YXJnZXQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICB1 aW50NjRfdCAqZGF0YSk7CiBpbnQgeGNfcHNyX2dldF9od19pbmZvKHhjX2ludGVyZmFjZSAqeGNo LCB1aW50MzJfdCBzb2NrZXQsCiAgICAgICAgICAgICAgICAgICAgICAgIHhjX3Bzcl9mZWF0X3R5 cGUgdHlwZSwgeGNfcHNyX2h3X2luZm8gKmh3X2luZm8pOwogCmRpZmYgLS1naXQgYS90b29scy9s aWJ4Yy94Y19wc3IuYyBiL3Rvb2xzL2xpYnhjL3hjX3Bzci5jCmluZGV4IGFmNjQ4ZWIuLjRkYmI3 YzYgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2xpYnhjL3hjX3Bzci5jCisrKyBiL3Rvb2xzL2xpYnhjL3hj X3Bzci5jCkBAIC0yNDksNyArMjQ5LDcgQEAgaW50IHhjX3Bzcl9jbXRfZW5hYmxlZCh4Y19pbnRl cmZhY2UgKnhjaCkKICAgICByZXR1cm4gMDsKIH0KIGludCB4Y19wc3JfY2F0X3NldF9kb21haW5f ZGF0YSh4Y19pbnRlcmZhY2UgKnhjaCwgdWludDMyX3QgZG9taWQsCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgeGNfcHNyX2NhdF90eXBlIHR5cGUsIHVpbnQzMl90IHRhcmdldCwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICB4Y19wc3JfdmFsX3R5cGUgdHlwZSwgdWludDMy X3QgdGFyZ2V0LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQ2NF90IGRhdGEp CiB7CiAgICAgREVDTEFSRV9ET01DVEw7CkBAIC0yODMsOSArMjgzLDkgQEAgaW50IHhjX3Bzcl9j YXRfc2V0X2RvbWFpbl9kYXRhKHhjX2ludGVyZmFjZSAqeGNoLCB1aW50MzJfdCBkb21pZCwKICAg ICByZXR1cm4gZG9fZG9tY3RsKHhjaCwgJmRvbWN0bCk7CiB9CiAKLWludCB4Y19wc3JfY2F0X2dl dF9kb21haW5fZGF0YSh4Y19pbnRlcmZhY2UgKnhjaCwgdWludDMyX3QgZG9taWQsCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgeGNfcHNyX2NhdF90eXBlIHR5cGUsIHVpbnQzMl90IHRh cmdldCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1aW50NjRfdCAqZGF0YSkKK2lu dCB4Y19wc3JfZ2V0X2RvbWFpbl9kYXRhKHhjX2ludGVyZmFjZSAqeGNoLCB1aW50MzJfdCBkb21p ZCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIHhjX3Bzcl92YWxfdHlwZSB0eXBlLCB1aW50 MzJfdCB0YXJnZXQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICB1aW50NjRfdCAqZGF0YSkK IHsKICAgICBpbnQgcmM7CiAgICAgREVDTEFSRV9ET01DVEw7CmRpZmYgLS1naXQgYS90b29scy9s aWJ4bC9saWJ4bF9wc3IuYyBiL3Rvb2xzL2xpYnhsL2xpYnhsX3Bzci5jCmluZGV4IDJmZTQyYjcu LjA3YzRiYzQgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2xpYnhsL2xpYnhsX3Bzci5jCisrKyBiL3Rvb2xz L2xpYnhsL2xpYnhsX3Bzci5jCkBAIC03MSwxNiArNzEsMzUgQEAgc3RhdGljIHZvaWQgbGlieGxf X3Bzcl9jbXRfbG9nX2Vycl9tc2cobGlieGxfX2djICpnYywgaW50IGVycikKICAgICBMT0dFKEVS Uk9SLCAiJXMiLCBtc2cpOwogfQogCi1zdGF0aWMgdm9pZCBsaWJ4bF9fcHNyX2NhdF9sb2dfZXJy X21zZyhsaWJ4bF9fZ2MgKmdjLCBpbnQgZXJyKQorc3RhdGljIHZvaWQgbGlieGxfX3Bzcl9hbGxv Y19sb2dfZXJyX21zZyhsaWJ4bF9fZ2MgKmdjLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBsaWJ4bF9wc3JfY2JtX3R5cGUgdHlwZSwgaW50IGVycikKIHsKICAgICBj aGFyICptc2c7CisgICAgY2hhciAqZmVhdDsKKworICAgIHN3aXRjaCAodHlwZSkgeworICAgIGNh c2UgTElCWExfUFNSX0NCTV9UWVBFX0wzX0NCTToKKyAgICAgICAgZmVhdCA9ICJMMyBDQVQiOwor ICAgICAgICBicmVhazsKKyAgICBjYXNlIExJQlhMX1BTUl9DQk1fVFlQRV9MM19DQk1fQ09ERToK KyAgICBjYXNlIExJQlhMX1BTUl9DQk1fVFlQRV9MM19DQk1fREFUQToKKyAgICAgICAgZmVhdCA9 ICJMMyBDRFAiOworICAgICAgICBicmVhazsKKyAgICBjYXNlIExJQlhMX1BTUl9DQk1fVFlQRV9M Ml9DQk06CisgICAgICAgIGZlYXQgPSAiTDIgQ0FUIjsKKyAgICAgICAgYnJlYWs7CisgICAgZGVm YXVsdDoKKyAgICAgICAgTE9HRShFUlJPUiwgIklucHV0IHR5cGUgJWQgaXMgd3JvbmchXG4iLCB0 eXBlKTsKKyAgICAgICAgbGlieGxfX3Bzcl9sb2dfZXJyX21zZyhnYywgZXJyKTsKKyAgICAgICAg cmV0dXJuOworICAgIH0KIAogICAgIHN3aXRjaCAoZXJyKSB7CiAgICAgY2FzZSBFTk9ERVY6Ci0g ICAgICAgIG1zZyA9ICJDQVQgaXMgbm90IHN1cHBvcnRlZCBpbiB0aGlzIHN5c3RlbSI7CisgICAg ICAgIG1zZyA9ICJpcyBub3Qgc3VwcG9ydGVkIGluIHRoaXMgc3lzdGVtIjsKICAgICAgICAgYnJl YWs7CiAgICAgY2FzZSBFTk9FTlQ6Ci0gICAgICAgIG1zZyA9ICJDQVQgaXMgbm90IGVuYWJsZWQg b24gdGhlIHNvY2tldCI7CisgICAgICAgIG1zZyA9ICJpcyBub3QgZW5hYmxlZCBvbiB0aGUgc29j a2V0IjsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBFT1ZFUkZMT1c6CiAgICAgICAgIG1zZyA9 ICJubyBmcmVlIENPUyBhdmFpbGFibGUiOwpAQCAtOTcsNyArMTE2LDM4IEBAIHN0YXRpYyB2b2lk IGxpYnhsX19wc3JfY2F0X2xvZ19lcnJfbXNnKGxpYnhsX19nYyAqZ2MsIGludCBlcnIpCiAgICAg ICAgIHJldHVybjsKICAgICB9CiAKLSAgICBMT0dFKEVSUk9SLCAiJXMiLCBtc2cpOworICAgIExP R0UoRVJST1IsICIlczogJXMiLCBmZWF0LCBtc2cpOworfQorCitzdGF0aWMgdm9pZCBsaWJ4bF9f cHNyX2h3X2luZm9fbG9nX2Vycl9tc2cobGlieGxfX2djICpnYywgaW50IGx2bCwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGxpYnhsX3Bzcl9mZWF0X3R5cGUgdHlw ZSwgaW50IGVycikKK3sKKyAgICBjaGFyICptc2c7CisgICAgY2hhciAqZmVhdDsKKworICAgIHN3 aXRjaCAodHlwZSkgeworICAgIGNhc2UgTElCWExfUFNSX0ZFQVRfVFlQRV9DQVRfSU5GTzoKKyAg ICAgICAgaWYgKGx2bCA9PSAzKQorICAgICAgICAgICAgZmVhdCA9ICJMMyBDQVQiOworICAgICAg ICBlbHNlCisgICAgICAgICAgICBmZWF0ID0gIkwyIENBVCI7CisgICAgICAgIGJyZWFrOworICAg IGRlZmF1bHQ6CisgICAgICAgIExPR0UoRVJST1IsICJJbnB1dCB0eXBlICVkIGlzIHdyb25nIVxu IiwgdHlwZSk7CisgICAgICAgIGxpYnhsX19wc3JfbG9nX2Vycl9tc2coZ2MsIGVycik7CisgICAg ICAgIHJldHVybjsKKyAgICB9CisKKyAgICBzd2l0Y2ggKGVycikgeworICAgIGNhc2UgRU5PRU5U OgorICAgICAgICBtc2cgPSAiaXMgbm90IGVuYWJsZWQgb24gdGhlIHNvY2tldCI7CisgICAgICAg IGJyZWFrOworICAgIGRlZmF1bHQ6CisgICAgICAgIGxpYnhsX19wc3JfbG9nX2Vycl9tc2coZ2Ms IGVycik7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBMT0dFKEVSUk9SLCAiJXM6ICVz IiwgZmVhdCwgbXNnKTsKIH0KIAogc3RhdGljIGludCBsaWJ4bF9fcGlja19zb2NrZXRfY3B1KGxp YnhsX19nYyAqZ2MsIHVpbnQzMl90IHNvY2tldGlkKQpAQCAtMjk0LDExICszNDQsMTEgQEAgb3V0 OgogICAgIHJldHVybiByYzsKIH0KIAotc3RhdGljIGlubGluZSB4Y19wc3JfY2F0X3R5cGUgbGli eGxfX3Bzcl9jYm1fdHlwZV90b19saWJ4Y19wc3JfY2F0X3R5cGUoCitzdGF0aWMgaW5saW5lIHhj X3Bzcl92YWxfdHlwZSBsaWJ4bF9fcHNyX2NibV90eXBlX3RvX2xpYnhjX3Bzcl92YWxfdHlwZSgK ICAgICBsaWJ4bF9wc3JfY2JtX3R5cGUgdHlwZSkKIHsKLSAgICBCVUlMRF9CVUdfT04oc2l6ZW9m KGxpYnhsX3Bzcl9jYm1fdHlwZSkgIT0gc2l6ZW9mKHhjX3Bzcl9jYXRfdHlwZSkpOwotICAgIHJl dHVybiAoeGNfcHNyX2NhdF90eXBlKXR5cGU7CisgICAgQlVJTERfQlVHX09OKHNpemVvZihsaWJ4 bF9wc3JfY2JtX3R5cGUpICE9IHNpemVvZih4Y19wc3JfdmFsX3R5cGUpKTsKKyAgICByZXR1cm4g KHhjX3Bzcl92YWxfdHlwZSl0eXBlOwogfQogCiBpbnQgbGlieGxfcHNyX2NhdF9zZXRfY2JtKGxp YnhsX2N0eCAqY3R4LCB1aW50MzJfdCBkb21pZCwKQEAgLTMxNiwxNSArMzY2LDE1IEBAIGludCBs aWJ4bF9wc3JfY2F0X3NldF9jYm0obGlieGxfY3R4ICpjdHgsIHVpbnQzMl90IGRvbWlkLAogICAg IH0KIAogICAgIGxpYnhsX2Zvcl9lYWNoX3NldF9iaXQoc29ja2V0aWQsICp0YXJnZXRfbWFwKSB7 Ci0gICAgICAgIHhjX3Bzcl9jYXRfdHlwZSB4Y190eXBlOworICAgICAgICB4Y19wc3JfdmFsX3R5 cGUgeGNfdHlwZTsKIAogICAgICAgICBpZiAoc29ja2V0aWQgPj0gbnJfc29ja2V0cykKICAgICAg ICAgICAgIGJyZWFrOwogCi0gICAgICAgIHhjX3R5cGUgPSBsaWJ4bF9fcHNyX2NibV90eXBlX3Rv X2xpYnhjX3Bzcl9jYXRfdHlwZSh0eXBlKTsKKyAgICAgICAgeGNfdHlwZSA9IGxpYnhsX19wc3Jf Y2JtX3R5cGVfdG9fbGlieGNfcHNyX3ZhbF90eXBlKHR5cGUpOwogICAgICAgICBpZiAoeGNfcHNy X2NhdF9zZXRfZG9tYWluX2RhdGEoY3R4LT54Y2gsIGRvbWlkLCB4Y190eXBlLAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc29ja2V0aWQsIGNibSkpIHsKLSAgICAgICAg ICAgIGxpYnhsX19wc3JfY2F0X2xvZ19lcnJfbXNnKGdjLCBlcnJubyk7CisgICAgICAgICAgICBs aWJ4bF9fcHNyX2FsbG9jX2xvZ19lcnJfbXNnKGdjLCB0eXBlLCBlcnJubyk7CiAgICAgICAgICAg ICByYyA9IEVSUk9SX0ZBSUw7CiAgICAgICAgIH0KICAgICB9CkBAIC0zNDAsMTEgKzM5MCwxMSBA QCBpbnQgbGlieGxfcHNyX2NhdF9nZXRfY2JtKGxpYnhsX2N0eCAqY3R4LCB1aW50MzJfdCBkb21p ZCwKIHsKICAgICBHQ19JTklUKGN0eCk7CiAgICAgaW50IHJjID0gMDsKLSAgICB4Y19wc3JfY2F0 X3R5cGUgeGNfdHlwZSA9IGxpYnhsX19wc3JfY2JtX3R5cGVfdG9fbGlieGNfcHNyX2NhdF90eXBl KHR5cGUpOworICAgIHhjX3Bzcl92YWxfdHlwZSB4Y190eXBlID0gbGlieGxfX3Bzcl9jYm1fdHlw ZV90b19saWJ4Y19wc3JfdmFsX3R5cGUodHlwZSk7CiAKLSAgICBpZiAoeGNfcHNyX2NhdF9nZXRf ZG9tYWluX2RhdGEoY3R4LT54Y2gsIGRvbWlkLCB4Y190eXBlLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICB0YXJnZXQsIGNibV9yKSkgewotICAgICAgICBsaWJ4bF9fcHNyX2Nh dF9sb2dfZXJyX21zZyhnYywgZXJybm8pOworICAgIGlmICh4Y19wc3JfZ2V0X2RvbWFpbl9kYXRh KGN0eC0+eGNoLCBkb21pZCwgeGNfdHlwZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICB0YXJnZXQsIGNibV9yKSkgeworICAgICAgICBsaWJ4bF9fcHNyX2FsbG9jX2xvZ19lcnJfbXNn KGdjLCB0eXBlLCBlcnJubyk7CiAgICAgICAgIHJjID0gRVJST1JfRkFJTDsKICAgICB9CiAKQEAg LTQyOCw3ICs0NzgsNyBAQCBpbnQgbGlieGxfcHNyX2dldF9od19pbmZvKGxpYnhsX2N0eCAqY3R4 LCBsaWJ4bF9wc3JfaHdfaW5mbyAqKmluZm8sCiAgICAgbGlieGxfZm9yX2VhY2hfc2V0X2JpdChz b2NrZXRpZCwgc29ja2V0bWFwKSB7CiAgICAgICAgIHB0cltpXS5pZCA9IHNvY2tldGlkOwogICAg ICAgICBpZiAoeGNfcHNyX2dldF9od19pbmZvKGN0eC0+eGNoLCBzb2NrZXRpZCwgeGNfdHlwZSwg Jmh3X2luZm8pKSB7Ci0gICAgICAgICAgICBsaWJ4bF9fcHNyX2NhdF9sb2dfZXJyX21zZyhnYywg ZXJybm8pOworICAgICAgICAgICAgbGlieGxfX3Bzcl9od19pbmZvX2xvZ19lcnJfbXNnKGdjLCBs dmwsIHR5cGUsIGVycm5vKTsKICAgICAgICAgICAgIHJjID0gRVJST1JfRkFJTDsKICAgICAgICAg ICAgIGZyZWUocHRyKTsKICAgICAgICAgICAgIGdvdG8gb3V0OwotLSAKMS45LjEKCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGlu ZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4t ZGV2ZWwK