From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Stabellini Subject: [PULL 07/13] xen: Move xenstore cleanup and mkdir functions Date: Fri, 28 Oct 2016 18:10:07 -0700 Message-ID: <1477703413-18852-7-git-send-email-sstabellini@kernel.org> References: <1477703413-18852-1-git-send-email-sstabellini@kernel.org> 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 1c0IAJ-0003yl-0G for xen-devel@lists.xenproject.org; Sat, 29 Oct 2016 01:10:31 +0000 In-Reply-To: <1477703413-18852-1-git-send-email-sstabellini@kernel.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: peter.maydell@linaro.org Cc: Quan Xu , sstabellini@kernel.org, qemu-devel@nongnu.org, anthony.perard@citrix.com, xen-devel@lists.xenproject.org, Emil Condrea List-Id: xen-devel@lists.xenproject.org RnJvbTogRW1pbCBDb25kcmVhIDxlbWlsY29uZHJlYUBnbWFpbC5jb20+CgpUaGUgbmFtZSBvZiB0 aGUgZnVuY3Rpb25zIG1vdmVkIHRvIHhlbl9wdmRldi5jOgogKiB4ZW5zdG9yZV9jbGVhbnVwX2Rp cgogKiB4ZW5fY29uZmlnX2NsZWFudXAKICogeGVuc3RvcmVfbWtkaXIKClNpZ25lZC1vZmYtYnk6 IEVtaWwgQ29uZHJlYSA8ZW1pbGNvbmRyZWFAZ21haWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBTdGVm YW5vIFN0YWJlbGxpbmkgPHNzdGFiZWxsaW5pQGtlcm5lbC5vcmc+ClNpZ25lZC1vZmYtYnk6IFF1 YW4gWHUgPHh1cXVhbjhAaHVhd2VpLmNvbT4KQWNrZWQtYnk6IEFudGhvbnkgUEVSQVJEIDxhbnRo b255LnBlcmFyZEBjaXRyaXguY29tPgotLS0KIGh3L3hlbi94ZW5fYmFja2VuZC5jIHwgNDkgLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogaHcveGVuL3hl bl9wdmRldi5jICAgfCA1MSArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysKIDIgZmlsZXMgY2hhbmdlZCwgNTEgaW5zZXJ0aW9ucygrKSwgNDkgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvaHcveGVuL3hlbl9iYWNrZW5kLmMgYi9ody94ZW4veGVuX2Jh Y2tlbmQuYwppbmRleCAyODc1ZTdjLi4yMTYwNzJkIDEwMDY0NAotLS0gYS9ody94ZW4veGVuX2Jh Y2tlbmQuYworKysgYi9ody94ZW4veGVuX2JhY2tlbmQuYwpAQCAtNDcsNTcgKzQ3LDggQEAgc3Ry dWN0IHhzX2hhbmRsZSAqeGVuc3RvcmUgPSBOVUxMOwogY29uc3QgY2hhciAqeGVuX3Byb3RvY29s OwogCiAvKiBwcml2YXRlICovCi1zdHJ1Y3QgeHNfZGlycyB7Ci0gICAgY2hhciAqeHNfZGlyOwot ICAgIFFUQUlMUV9FTlRSWSh4c19kaXJzKSBsaXN0OwotfTsKLXN0YXRpYyBRVEFJTFFfSEVBRCh4 c19kaXJzX2hlYWQsIHhzX2RpcnMpIHhzX2NsZWFudXAgPQotICAgIFFUQUlMUV9IRUFEX0lOSVRJ QUxJWkVSKHhzX2NsZWFudXApOwotCiBzdGF0aWMgaW50IGRlYnVnOwogCi1zdGF0aWMgdm9pZCB4 ZW5zdG9yZV9jbGVhbnVwX2RpcihjaGFyICpkaXIpCi17Ci0gICAgc3RydWN0IHhzX2RpcnMgKmQ7 Ci0KLSAgICBkID0gZ19tYWxsb2Moc2l6ZW9mKCpkKSk7Ci0gICAgZC0+eHNfZGlyID0gZGlyOwot ICAgIFFUQUlMUV9JTlNFUlRfVEFJTCgmeHNfY2xlYW51cCwgZCwgbGlzdCk7Ci19Ci0KLXZvaWQg eGVuX2NvbmZpZ19jbGVhbnVwKHZvaWQpCi17Ci0gICAgc3RydWN0IHhzX2RpcnMgKmQ7Ci0KLSAg ICBRVEFJTFFfRk9SRUFDSChkLCAmeHNfY2xlYW51cCwgbGlzdCkgewotICAgICAgICB4c19ybSh4 ZW5zdG9yZSwgMCwgZC0+eHNfZGlyKTsKLSAgICB9Ci19Ci0KLWludCB4ZW5zdG9yZV9ta2Rpcihj aGFyICpwYXRoLCBpbnQgcCkKLXsKLSAgICBzdHJ1Y3QgeHNfcGVybWlzc2lvbnMgcGVybXNbMl0g PSB7Ci0gICAgICAgIHsKLSAgICAgICAgICAgIC5pZCAgICA9IDAsIC8qIHNldCBvd25lcjogZG9t MCAqLwotICAgICAgICB9LCB7Ci0gICAgICAgICAgICAuaWQgICAgPSB4ZW5fZG9taWQsCi0gICAg ICAgICAgICAucGVybXMgPSBwLAotICAgICAgICB9Ci0gICAgfTsKLQotICAgIGlmICgheHNfbWtk aXIoeGVuc3RvcmUsIDAsIHBhdGgpKSB7Ci0gICAgICAgIHhlbl9iZV9wcmludGYoTlVMTCwgMCwg InhzX21rZGlyICVzOiBmYWlsZWRcbiIsIHBhdGgpOwotICAgICAgICByZXR1cm4gLTE7Ci0gICAg fQotICAgIHhlbnN0b3JlX2NsZWFudXBfZGlyKGdfc3RyZHVwKHBhdGgpKTsKLQotICAgIGlmICgh eHNfc2V0X3Blcm1pc3Npb25zKHhlbnN0b3JlLCAwLCBwYXRoLCBwZXJtcywgMikpIHsKLSAgICAg ICAgeGVuX2JlX3ByaW50ZihOVUxMLCAwLCAieHNfc2V0X3Blcm1pc3Npb25zICVzOiBmYWlsZWRc biIsIHBhdGgpOwotICAgICAgICByZXR1cm4gLTE7Ci0gICAgfQotICAgIHJldHVybiAwOwotfQot CiBpbnQgeGVuc3RvcmVfd3JpdGVfYmVfc3RyKHN0cnVjdCBYZW5EZXZpY2UgKnhlbmRldiwgY29u c3QgY2hhciAqbm9kZSwgY29uc3QgY2hhciAqdmFsKQogewogICAgIHJldHVybiB4ZW5zdG9yZV93 cml0ZV9zdHIoeGVuZGV2LT5iZSwgbm9kZSwgdmFsKTsKZGlmZiAtLWdpdCBhL2h3L3hlbi94ZW5f cHZkZXYuYyBiL2h3L3hlbi94ZW5fcHZkZXYuYwppbmRleCA5NmVkMmEzLi5lNDMyZDMwIDEwMDY0 NAotLS0gYS9ody94ZW4veGVuX3B2ZGV2LmMKKysrIGIvaHcveGVuL3hlbl9wdmRldi5jCkBAIC0y NCwxMSArMjQsNjIgQEAKIAogLyogcHJpdmF0ZSAqLwogc3RhdGljIGludCBkZWJ1ZzsKKworc3Ry dWN0IHhzX2RpcnMgeworICAgIGNoYXIgKnhzX2RpcjsKKyAgICBRVEFJTFFfRU5UUlkoeHNfZGly cykgbGlzdDsKK307CisKK3N0YXRpYyBRVEFJTFFfSEVBRCh4c19kaXJzX2hlYWQsIHhzX2RpcnMp IHhzX2NsZWFudXAgPQorICAgIFFUQUlMUV9IRUFEX0lOSVRJQUxJWkVSKHhzX2NsZWFudXApOwor CiBzdGF0aWMgUVRBSUxRX0hFQUQoWGVuRGV2aWNlSGVhZCwgWGVuRGV2aWNlKSB4ZW5kZXZzID0K ICAgICBRVEFJTFFfSEVBRF9JTklUSUFMSVpFUih4ZW5kZXZzKTsKIAogLyogLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSAqLwogCitz dGF0aWMgdm9pZCB4ZW5zdG9yZV9jbGVhbnVwX2RpcihjaGFyICpkaXIpCit7CisgICAgc3RydWN0 IHhzX2RpcnMgKmQ7CisKKyAgICBkID0gZ19tYWxsb2Moc2l6ZW9mKCpkKSk7CisgICAgZC0+eHNf ZGlyID0gZGlyOworICAgIFFUQUlMUV9JTlNFUlRfVEFJTCgmeHNfY2xlYW51cCwgZCwgbGlzdCk7 Cit9CisKK3ZvaWQgeGVuX2NvbmZpZ19jbGVhbnVwKHZvaWQpCit7CisgICAgc3RydWN0IHhzX2Rp cnMgKmQ7CisKKyAgICBRVEFJTFFfRk9SRUFDSChkLCAmeHNfY2xlYW51cCwgbGlzdCkgeworICAg ICAgICB4c19ybSh4ZW5zdG9yZSwgMCwgZC0+eHNfZGlyKTsKKyAgICB9Cit9CisKK2ludCB4ZW5z dG9yZV9ta2RpcihjaGFyICpwYXRoLCBpbnQgcCkKK3sKKyAgICBzdHJ1Y3QgeHNfcGVybWlzc2lv bnMgcGVybXNbMl0gPSB7CisgICAgICAgIHsKKyAgICAgICAgICAgIC5pZCAgICA9IDAsIC8qIHNl dCBvd25lcjogZG9tMCAqLworICAgICAgICB9LCB7CisgICAgICAgICAgICAuaWQgICAgPSB4ZW5f ZG9taWQsCisgICAgICAgICAgICAucGVybXMgPSBwLAorICAgICAgICB9CisgICAgfTsKKworICAg IGlmICgheHNfbWtkaXIoeGVuc3RvcmUsIDAsIHBhdGgpKSB7CisgICAgICAgIHhlbl9iZV9wcmlu dGYoTlVMTCwgMCwgInhzX21rZGlyICVzOiBmYWlsZWRcbiIsIHBhdGgpOworICAgICAgICByZXR1 cm4gLTE7CisgICAgfQorICAgIHhlbnN0b3JlX2NsZWFudXBfZGlyKGdfc3RyZHVwKHBhdGgpKTsK KworICAgIGlmICgheHNfc2V0X3Blcm1pc3Npb25zKHhlbnN0b3JlLCAwLCBwYXRoLCBwZXJtcywg MikpIHsKKyAgICAgICAgeGVuX2JlX3ByaW50ZihOVUxMLCAwLCAieHNfc2V0X3Blcm1pc3Npb25z ICVzOiBmYWlsZWRcbiIsIHBhdGgpOworICAgICAgICByZXR1cm4gLTE7CisgICAgfQorICAgIHJl dHVybiAwOworfQorCiBpbnQgeGVuc3RvcmVfd3JpdGVfc3RyKGNvbnN0IGNoYXIgKmJhc2UsIGNv bnN0IGNoYXIgKm5vZGUsIGNvbnN0IGNoYXIgKnZhbCkKIHsKICAgICBjaGFyIGFic3BhdGhbWEVO X0JVRlNJWkVdOwotLSAKMS45LjEKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4u b3JnCmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK