From: Juergen Gross Subject: [PATCH v3 4/7] xenstore: enhance control command support Date: Wed, 22 Feb 2017 16:28:48 +0100 Message-ID: <20170222152851.20099-5-jgross@suse.com> References: <20170222152851.20099-1-jgross@suse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgYqe-0006Jp-Gr for xen-devel@lists.xenproject.org; Wed, 22 Feb 2017 15:28:56 +0000 In-Reply-To: <20170222152851.20099-1-jgross@suse.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: Juergen Gross , wei.liu2@citrix.com, ian.jackson@eu.citrix.com List-Id: xen-devel@lists.xenproject.org VGhlIFhlbnN0b3JlIHByb3RvY29sIHN1cHBvcnRzIHRoZSBYU19DT05UUk9MIGNvbW1hbmQgZm9y IHRyaWdnZXJpbmcKdmFyaW91cyBhY3Rpb25zIGluIHRoZSBYZW5zdG9yZSBkYWVtb24uIEVuaGFu Y2UgdGhhdCBzdXBwb3J0IGJ5IHVzaW5nCmEgY29tbWFuZCB0YWJsZSBhbmQgYWRkaW5nIGEgaGVs cCBmdW5jdGlvbi4KClN1cHBvcnQgbXVsdGlwbGUgY29udHJvbCBjb21tYW5kcyBpbiB0aGUgYXNz b2NpYXRlZCB4ZW5zdG9yZS1jb250cm9sCnByb2dyYW0gdXNlZCB0byBpc3N1ZSBYU19DT05UUk9M IGNvbW1hbmRzLgoKU2lnbmVkLW9mZi1ieTogSnVlcmdlbiBHcm9zcyA8amdyb3NzQHN1c2UuY29t PgotLS0KIHRvb2xzL3hlbnN0b3JlL3hlbnN0b3JlX2NvbnRyb2wuYyAgfCAgNjUgKysrKysrKysr KysrKysrKystLS0tLS0tCiB0b29scy94ZW5zdG9yZS94ZW5zdG9yZWRfY29udHJvbC5jIHwgMTAw ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0KIDIgZmlsZXMgY2hhbmdlZCwg MTM1IGluc2VydGlvbnMoKyksIDMwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Rvb2xzL3hl bnN0b3JlL3hlbnN0b3JlX2NvbnRyb2wuYyBiL3Rvb2xzL3hlbnN0b3JlL3hlbnN0b3JlX2NvbnRy b2wuYwppbmRleCAwYTEwOGRmLi5lNDJkNDc4IDEwMDY0NAotLS0gYS90b29scy94ZW5zdG9yZS94 ZW5zdG9yZV9jb250cm9sLmMKKysrIGIvdG9vbHMveGVuc3RvcmUveGVuc3RvcmVfY29udHJvbC5j CkBAIC03LDI5ICs3LDU2IEBACiAKIGludCBtYWluKGludCBhcmdjLCBjaGFyICoqYXJndikKIHsK LSAgc3RydWN0IHhzX2hhbmRsZSAqIHhzaDsKKyAgICBzdHJ1Y3QgeHNfaGFuZGxlICp4c2g7Cisg ICAgY2hhciAqcGFyID0gTlVMTDsKKyAgICBjaGFyICpyZXQ7CisgICAgdW5zaWduZWQgaW50IHAs IGxlbiA9IDA7CisgICAgaW50IHJjID0gMDsKIAotICBpZiAoYXJnYyA8IDIgfHwKLSAgICAgIHN0 cmNtcChhcmd2WzFdLCAiY2hlY2siKSkKLSAgewotICAgIGZwcmludGYoc3RkZXJyLAotICAgICAg ICAgICAgIlVzYWdlOlxuIgotICAgICAgICAgICAgIlxuIgotICAgICAgICAgICAgIiAgICAgICAl cyBjaGVja1xuIgotICAgICAgICAgICAgIlxuIiwgYXJndlswXSk7Ci0gICAgcmV0dXJuIDI7Ci0g IH0KKyAgICBpZiAoYXJnYyA8IDIpIHsKKyAgICAgICAgZnByaW50ZihzdGRlcnIsICJVc2FnZTpc biIKKyAgICAgICAgICAgICAgICAiJXMgPGNvbW1hbmQ+IFs8YXJnPi4uLl1cbiIsIGFyZ3ZbMF0p OworICAgICAgICByZXR1cm4gMjsKKyAgICB9CiAKLSAgeHNoID0geHNfZGFlbW9uX29wZW4oKTsK KyAgICBmb3IgKHAgPSAyOyBwIDwgYXJnYzsgcCsrKQorICAgICAgICBsZW4gKz0gc3RybGVuKGFy Z3ZbcF0pICsgMTsKKyAgICBpZiAobGVuKSB7CisgICAgICAgIHBhciA9IG1hbGxvYyhsZW4pOwor ICAgICAgICBpZiAoIXBhcikgeworICAgICAgICAgICAgZnByaW50ZihzdGRlcnIsICJBbGxvY2F0 aW9uIGVycm9yLlxuIik7CisgICAgICAgICAgICByZXR1cm4gMTsKKyAgICAgICAgfQorICAgICAg ICBsZW4gPSAwOworICAgICAgICBmb3IgKHAgPSAyOyBwIDwgYXJnYzsgcCsrKSB7CisgICAgICAg ICAgICBtZW1jcHkocGFyICsgbGVuLCBhcmd2W3BdLCBzdHJsZW4oYXJndltwXSkgKyAxKTsKKyAg ICAgICAgICAgIGxlbiArPSBzdHJsZW4oYXJndltwXSkgKyAxOworICAgICAgICB9CisgICAgfQog Ci0gIGlmICh4c2ggPT0gTlVMTCkgewotICAgIGZwcmludGYoc3RkZXJyLCAiRmFpbGVkIHRvIGNv bnRhY3QgWGVuc3RvcmVkLlxuIik7Ci0gICAgcmV0dXJuIDE7Ci0gIH0KKyAgICB4c2ggPSB4c19v cGVuKDApOworICAgIGlmICh4c2ggPT0gTlVMTCkgeworICAgICAgICBmcHJpbnRmKHN0ZGVyciwg IkZhaWxlZCB0byBjb250YWN0IFhlbnN0b3JlZC5cbiIpOworICAgICAgICByZXR1cm4gMTsKKyAg ICB9CiAKLSAgeHNfZGVidWdfY29tbWFuZCh4c2gsIGFyZ3ZbMV0sIE5VTEwsIDApOworICAgIHJl dCA9IHhzX2RlYnVnX2NvbW1hbmQoeHNoLCBhcmd2WzFdLCBwYXIsIGxlbik7CisgICAgaWYgKCFy ZXQpIHsKKyAgICAgICAgcmMgPSAzOworICAgICAgICBpZiAoZXJybm8gPT0gRUlOVkFMKSB7Cisg ICAgICAgICAgICByZXQgPSB4c19kZWJ1Z19jb21tYW5kKHhzaCwgImhlbHAiLCBOVUxMLCAwKTsK KyAgICAgICAgICAgIGlmIChyZXQpCisgICAgICAgICAgICAgICAgZnByaW50ZihzdGRlcnIsICJD b21tYW5kIG5vdCBzdXBwb3J0ZWQuIFZhbGlkIGNvbW1hbmRzIGFyZTpcbiIKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIiVzXG4iLCByZXQpOworICAgICAgICAgICAgZWxzZQorICAg ICAgICAgICAgICAgIGZwcmludGYoc3RkZXJyLCAiRXJyb3Igd2hlbiBleGVjdXRpbmcgY29tbWFu ZC5cbiIpOworICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgIGZwcmludGYoc3RkZXJyLCAiRXJy b3IgJWQgd2hlbiB0cnlpbmcgdG8gZXhlY3V0ZSBjb21tYW5kLlxuIiwKKyAgICAgICAgICAgICAg ICAgICAgZXJybm8pOworICAgIH0gZWxzZSBpZiAoc3RybGVuKHJldCkgPiAwKQorICAgICAgICBw cmludGYoIiVzXG4iLCByZXQpOwogCi0gIHhzX2RhZW1vbl9jbG9zZSh4c2gpOworICAgIHhzX2Ns b3NlKHhzaCk7CiAKLSAgcmV0dXJuIDA7CisgICAgcmV0dXJuIHJjOwogfQpkaWZmIC0tZ2l0IGEv dG9vbHMveGVuc3RvcmUveGVuc3RvcmVkX2NvbnRyb2wuYyBiL3Rvb2xzL3hlbnN0b3JlL3hlbnN0 b3JlZF9jb250cm9sLmMKaW5kZXggZjE2OWQyMy4uMzA4MGU0NyAxMDA2NDQKLS0tIGEvdG9vbHMv eGVuc3RvcmUveGVuc3RvcmVkX2NvbnRyb2wuYworKysgYi90b29scy94ZW5zdG9yZS94ZW5zdG9y ZWRfY29udHJvbC5jCkBAIC0xNywzMCArMTcsMTA4IEBACiAqLwogCiAjaW5jbHVkZSA8ZXJybm8u aD4KKyNpbmNsdWRlIDxzdGRhcmcuaD4KKyNpbmNsdWRlIDxzdGRpby5oPgorI2luY2x1ZGUgPHN0 cmluZy5oPgogCiAjaW5jbHVkZSAidXRpbHMuaCIKKyNpbmNsdWRlICJ0YWxsb2MuaCIKICNpbmNs dWRlICJ4ZW5zdG9yZWRfY29yZS5oIgogI2luY2x1ZGUgInhlbnN0b3JlZF9jb250cm9sLmgiCiAK K3N0cnVjdCBjbWRfcyB7CisJY2hhciAqY21kOworCWludCAoKmZ1bmMpKHZvaWQgKiwgc3RydWN0 IGNvbm5lY3Rpb24gKiwgY2hhciAqKiwgaW50KTsKKwljaGFyICpwYXJzOworfTsKKworc3RhdGlj IGludCBkb19jb250cm9sX2NoZWNrKHZvaWQgKmN0eCwgc3RydWN0IGNvbm5lY3Rpb24gKmNvbm4s CisJCQkgICAgY2hhciAqKnZlYywgaW50IG51bSkKK3sKKwlpZiAobnVtKQorCQlyZXR1cm4gRUlO VkFMOworCisJY2hlY2tfc3RvcmUoKTsKKworCXNlbmRfYWNrKGNvbm4sIFhTX0NPTlRST0wpOwor CXJldHVybiAwOworfQorCitzdGF0aWMgaW50IGRvX2NvbnRyb2xfcHJpbnQodm9pZCAqY3R4LCBz dHJ1Y3QgY29ubmVjdGlvbiAqY29ubiwKKwkJCSAgICBjaGFyICoqdmVjLCBpbnQgbnVtKQorewor CWlmIChudW0gIT0gMSkKKwkJcmV0dXJuIEVJTlZBTDsKKworCXhwcmludGYoImNvbnRyb2w6ICVz IiwgdmVjWzBdKTsKKworCXNlbmRfYWNrKGNvbm4sIFhTX0NPTlRST0wpOworCXJldHVybiAwOwor fQorCitzdGF0aWMgaW50IGRvX2NvbnRyb2xfaGVscCh2b2lkICosIHN0cnVjdCBjb25uZWN0aW9u ICosIGNoYXIgKiosIGludCk7CisKK3N0YXRpYyBzdHJ1Y3QgY21kX3MgY21kc1tdID0geworCXsg ImNoZWNrIiwgZG9fY29udHJvbF9jaGVjaywgIiIgfSwKKwl7ICJwcmludCIsIGRvX2NvbnRyb2xf cHJpbnQsICI8c3RyaW5nPiIgfSwKKwl7ICJoZWxwIiwgZG9fY29udHJvbF9oZWxwLCAiIiB9LAor fTsKKworc3RhdGljIGludCBkb19jb250cm9sX2hlbHAodm9pZCAqY3R4LCBzdHJ1Y3QgY29ubmVj dGlvbiAqY29ubiwKKwkJCSAgIGNoYXIgKip2ZWMsIGludCBudW0pCit7CisJaW50IGNtZCwgbGVu ID0gMDsKKwljaGFyICpyZXNwOworCisJaWYgKG51bSkKKwkJcmV0dXJuIEVJTlZBTDsKKworCWZv ciAoY21kID0gMDsgY21kIDwgQVJSQVlfU0laRShjbWRzKTsgY21kKyspIHsKKwkJbGVuICs9IHN0 cmxlbihjbWRzW2NtZF0uY21kKSArIDE7CisJCWxlbiArPSBzdHJsZW4oY21kc1tjbWRdLnBhcnMp ICsgMTsKKwl9CisJbGVuKys7CisKKwlyZXNwID0gdGFsbG9jX2FycmF5KGN0eCwgY2hhciwgbGVu KTsKKwlpZiAoIXJlc3ApCisJCXJldHVybiBFTk9NRU07CisKKwlsZW4gPSAwOworCWZvciAoY21k ID0gMDsgY21kIDwgQVJSQVlfU0laRShjbWRzKTsgY21kKyspIHsKKwkJc3RyY3B5KHJlc3AgKyBs ZW4sIGNtZHNbY21kXS5jbWQpOworCQlsZW4gKz0gc3RybGVuKGNtZHNbY21kXS5jbWQpOworCQly ZXNwW2xlbl0gPSAnXHQnOworCQlsZW4rKzsKKwkJc3RyY3B5KHJlc3AgKyBsZW4sIGNtZHNbY21k XS5wYXJzKTsKKwkJbGVuICs9IHN0cmxlbihjbWRzW2NtZF0ucGFycyk7CisJCXJlc3BbbGVuXSA9 ICdcbic7CisJCWxlbisrOworCX0KKwlyZXNwW2xlbl0gPSAwOworCisJc2VuZF9yZXBseShjb25u LCBYU19DT05UUk9MLCByZXNwLCBsZW4pOworCXJldHVybiAwOworfQorCiBpbnQgZG9fY29udHJv bChzdHJ1Y3QgY29ubmVjdGlvbiAqY29ubiwgc3RydWN0IGJ1ZmZlcmVkX2RhdGEgKmluKQogewog CWludCBudW07CisJaW50IGNtZDsKKwljaGFyICoqdmVjOwogCiAJaWYgKGNvbm4tPmlkICE9IDAp CiAJCXJldHVybiBFQUNDRVM7CiAKIAludW0gPSB4c19jb3VudF9zdHJpbmdzKGluLT5idWZmZXIs IGluLT51c2VkKTsKKwl2ZWMgPSB0YWxsb2NfYXJyYXkoaW4sIGNoYXIgKiwgbnVtKTsKKwlpZiAo IXZlYykKKwkJcmV0dXJuIEVOT01FTTsKKwlpZiAoZ2V0X3N0cmluZ3MoaW4sIHZlYywgbnVtKSAh PSBudW0pCisJCXJldHVybiBFSU87CiAKLQlpZiAoc3RyZXEoaW4tPmJ1ZmZlciwgInByaW50Iikp IHsKLQkJaWYgKG51bSA8IDIpCi0JCQlyZXR1cm4gRUlOVkFMOwotCQl4cHJpbnRmKCJjb250cm9s OiAlcyIsIGluLT5idWZmZXIgKyBzdHJsZW4oaW4tPmJ1ZmZlcikgKyAxKTsKLQl9CisJZm9yIChj bWQgPSAwOyBjbWQgPCBBUlJBWV9TSVpFKGNtZHMpOyBjbWQrKykKKwkJaWYgKHN0cmVxKHZlY1sw XSwgY21kc1tjbWRdLmNtZCkpCisJCQlyZXR1cm4gY21kc1tjbWRdLmZ1bmMoaW4sIGNvbm4sIHZl YyArIDEsIG51bSAtIDEpOwogCi0JaWYgKHN0cmVxKGluLT5idWZmZXIsICJjaGVjayIpKQotCQlj aGVja19zdG9yZSgpOwotCi0Jc2VuZF9hY2soY29ubiwgWFNfQ09OVFJPTCk7Ci0KLQlyZXR1cm4g MDsKKwlyZXR1cm4gRUlOVkFMOwogfQotLSAKMi4xMC4yCgoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2 ZWxAbGlzdHMueGVuLm9yZwpodHRwczovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg==