From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paulina Szubarczyk Subject: [PATCH v3 5/7] xl: improve main_tmem_* return codes Date: Wed, 20 Apr 2016 10:04:02 +0200 Message-ID: <1461139444-12342-6-git-send-email-paulinaszubarczyk@gmail.com> References: <1461139444-12342-1-git-send-email-paulinaszubarczyk@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1asn8c-0006Ij-5j for xen-devel@lists.xenproject.org; Wed, 20 Apr 2016 08:05:30 +0000 Received: by mail-lf0-f48.google.com with SMTP id c126so35989613lfb.2 for ; Wed, 20 Apr 2016 01:05:28 -0700 (PDT) In-Reply-To: <1461139444-12342-1-git-send-email-paulinaszubarczyk@gmail.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, roger.pau@citrix.com, George.Dunlap@eu.citrix.com Cc: ian.jackson@eu.citrix.com, dario.faggioli@citrix.com, wei.liu2@citrix.com, ian.campbell@citrix.com, Paulina Szubarczyk List-Id: xen-devel@lists.xenproject.org RnVuY3Rpb25zIGxpYnhsX3RtZW1fZnJlZXplKCksIGxpYnhsX3RtZW1fdGhhdygpLCBsaWJ4bF90 bWVtX3NldCgpIGFuZApsaWJ4bF90bWVtX3NoYXJlZF9hdXRoKCkgbG9jYXRlZCBpbiBsaWJ4bC5j IGZpbGUgcmV0dXJuCkVSUk9SX0ZBSUwvRVJST1JfSU5WQUwgb3IgaW50ZXJuYWwgZXJyb3IgY29k ZXMgZnJvbSBsaWJ4YyBsaWJyYXJ5CmltcHJvdmUgbWFpbl90bWVtXyogcmV0dXJuIGNvZGVzIGJ5 IHJldHVybmluZyBFWElUX3tTVUNDRVNTL0ZBSUxVUkV9CmFjY29yZGluZ2x5IHRvIHJldHVybiBj b2RlcyBvZiB0aG9zZSBmdW5jdGlvbnMuCgpTaWduZWQtb2ZmLWJ5OiBQYXVsaW5hIFN6dWJhcmN6 eWsgPHBhdWxpbmFzenViYXJjenlrQGdtYWlsLmNvbT4KUmV2aWV3ZWQtYnk6IEtvbnJhZCBSemVz enV0ZWsgV2lsayA8a29ucmFkLndpbGtAb3JhY2xlLmNvbT4KUmV2aWV3ZWQtYnk6IERhcmlvIEZh Z2dpb2xpIDxkYXJpby5mYWdnaW9saUBjaXRyaXguY29tPgpBY2tlZC1ieTogUm9nZXIgUGF1IE1v bm7DqSA8cm9nZXIucGF1QGNpdHJpeC5jb20+Ci0tLQogdG9vbHMvbGlieGwveGxfY21kaW1wbC5j IHwgNTEgKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tCiAx IGZpbGUgY2hhbmdlZCwgMzAgaW5zZXJ0aW9ucygrKSwgMjEgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvdG9vbHMvbGlieGwveGxfY21kaW1wbC5jIGIvdG9vbHMvbGlieGwveGxfY21kaW1wbC5j CmluZGV4IDZiZWYyMDEuLmQ2NDY5MjcgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2xpYnhsL3hsX2NtZGlt cGwuYworKysgYi90b29scy9saWJ4bC94bF9jbWRpbXBsLmMKQEAgLTc4MTcsMTEgKzc4MTcsMTEg QEAgaW50IG1haW5fdG1lbV9saXN0KGludCBhcmdjLCBjaGFyICoqYXJndikKIAogICAgIGJ1ZiA9 IGxpYnhsX3RtZW1fbGlzdChjdHgsIGRvbWlkLCB1c2VfbG9uZyk7CiAgICAgaWYgKGJ1ZiA9PSBO VUxMKQotICAgICAgICByZXR1cm4gLTE7CisgICAgICAgIHJldHVybiBFWElUX0ZBSUxVUkU7CiAK ICAgICBwcmludGYoIiVzXG4iLCBidWYpOwogICAgIGZyZWUoYnVmKTsKLSAgICByZXR1cm4gMDsK KyAgICByZXR1cm4gRVhJVF9TVUNDRVNTOwogfQogCiBpbnQgbWFpbl90bWVtX2ZyZWV6ZShpbnQg YXJnYywgY2hhciAqKmFyZ3YpCkBAIC03ODQxLDcgKzc4NDEsNyBAQCBpbnQgbWFpbl90bWVtX2Zy ZWV6ZShpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAgICAgaWYgKCFkb20gJiYgYWxsID09IDApIHsK ICAgICAgICAgZnByaW50ZihzdGRlcnIsICJZb3UgbXVzdCBzcGVjaWZ5IC1hIG9yIGEgZG9tYWlu IGlkLlxuXG4iKTsKICAgICAgICAgaGVscCgidG1lbS1mcmVlemUiKTsKLSAgICAgICAgcmV0dXJu IDE7CisgICAgICAgIHJldHVybiBFWElUX0ZBSUxVUkU7CiAgICAgfQogCiAgICAgaWYgKGFsbCkK QEAgLTc4NDksOCArNzg0OSwxMCBAQCBpbnQgbWFpbl90bWVtX2ZyZWV6ZShpbnQgYXJnYywgY2hh ciAqKmFyZ3YpCiAgICAgZWxzZQogICAgICAgICBkb21pZCA9IGZpbmRfZG9tYWluKGRvbSk7CiAK LSAgICBsaWJ4bF90bWVtX2ZyZWV6ZShjdHgsIGRvbWlkKTsKLSAgICByZXR1cm4gMDsKKyAgICBp ZiAobGlieGxfdG1lbV9mcmVlemUoY3R4LCBkb21pZCkgPCAwKQorICAgICAgICByZXR1cm4gRVhJ VF9GQUlMVVJFOworCisgICAgcmV0dXJuIEVYSVRfU1VDQ0VTUzsKIH0KIAogaW50IG1haW5fdG1l bV90aGF3KGludCBhcmdjLCBjaGFyICoqYXJndikKQEAgLTc4NzAsNyArNzg3Miw3IEBAIGludCBt YWluX3RtZW1fdGhhdyhpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAgICAgaWYgKCFkb20gJiYgYWxs ID09IDApIHsKICAgICAgICAgZnByaW50ZihzdGRlcnIsICJZb3UgbXVzdCBzcGVjaWZ5IC1hIG9y IGEgZG9tYWluIGlkLlxuXG4iKTsKICAgICAgICAgaGVscCgidG1lbS10aGF3Iik7Ci0gICAgICAg IHJldHVybiAxOworICAgICAgICByZXR1cm4gRVhJVF9GQUlMVVJFOwogICAgIH0KIAogICAgIGlm IChhbGwpCkBAIC03ODc4LDggKzc4ODAsMTAgQEAgaW50IG1haW5fdG1lbV90aGF3KGludCBhcmdj LCBjaGFyICoqYXJndikKICAgICBlbHNlCiAgICAgICAgIGRvbWlkID0gZmluZF9kb21haW4oZG9t KTsKIAotICAgIGxpYnhsX3RtZW1fdGhhdyhjdHgsIGRvbWlkKTsKLSAgICByZXR1cm4gMDsKKyAg ICBpZiAobGlieGxfdG1lbV90aGF3KGN0eCwgZG9taWQpIDwgMCkKKyAgICAgICAgcmV0dXJuIEVY SVRfRkFJTFVSRTsKKworICAgIHJldHVybiBFWElUX1NVQ0NFU1M7CiB9CiAKIGludCBtYWluX3Rt ZW1fc2V0KGludCBhcmdjLCBjaGFyICoqYXJndikKQEAgLTc4OTAsNiArNzg5NCw3IEBAIGludCBt YWluX3RtZW1fc2V0KGludCBhcmdjLCBjaGFyICoqYXJndikKICAgICBpbnQgb3B0X3cgPSAwLCBv cHRfYyA9IDAsIG9wdF9wID0gMDsKICAgICBpbnQgYWxsID0gMDsKICAgICBpbnQgb3B0OworICAg IGludCByYyA9IDA7CiAKICAgICBTV0lUQ0hfRk9SRUFDSF9PUFQob3B0LCAiYXc6YzpwOiIsIE5V TEwsICJ0bWVtLXNldCIsIDApIHsKICAgICBjYXNlICdhJzoKQEAgLTc5MTMsNyArNzkxOCw3IEBA IGludCBtYWluX3RtZW1fc2V0KGludCBhcmdjLCBjaGFyICoqYXJndikKICAgICBpZiAoIWRvbSAm JiBhbGwgPT0gMCkgewogICAgICAgICBmcHJpbnRmKHN0ZGVyciwgIllvdSBtdXN0IHNwZWNpZnkg LWEgb3IgYSBkb21haW4gaWQuXG5cbiIpOwogICAgICAgICBoZWxwKCJ0bWVtLXNldCIpOwotICAg ICAgICByZXR1cm4gMTsKKyAgICAgICAgcmV0dXJuIEVYSVRfRkFJTFVSRTsKICAgICB9CiAKICAg ICBpZiAoYWxsKQpAQCAtNzkyNCwxNyArNzkyOSwyMCBAQCBpbnQgbWFpbl90bWVtX3NldChpbnQg YXJnYywgY2hhciAqKmFyZ3YpCiAgICAgaWYgKCFvcHRfdyAmJiAhb3B0X2MgJiYgIW9wdF9wKSB7 CiAgICAgICAgIGZwcmludGYoc3RkZXJyLCAiTm8gc2V0IHZhbHVlIHNwZWNpZmllZC5cblxuIik7 CiAgICAgICAgIGhlbHAoInRtZW0tc2V0Iik7Ci0gICAgICAgIHJldHVybiAxOworICAgICAgICBy ZXR1cm4gRVhJVF9GQUlMVVJFOwogICAgIH0KIAogICAgIGlmIChvcHRfdykKLSAgICAgICAgbGli eGxfdG1lbV9zZXQoY3R4LCBkb21pZCwgIndlaWdodCIsIHdlaWdodCk7CisgICAgICAgIHJjID0g bGlieGxfdG1lbV9zZXQoY3R4LCBkb21pZCwgIndlaWdodCIsIHdlaWdodCk7CiAgICAgaWYgKG9w dF9jKQotICAgICAgICBsaWJ4bF90bWVtX3NldChjdHgsIGRvbWlkLCAiY2FwIiwgY2FwKTsKKyAg ICAgICAgcmMgPSBsaWJ4bF90bWVtX3NldChjdHgsIGRvbWlkLCAiY2FwIiwgY2FwKTsKICAgICBp ZiAob3B0X3ApCi0gICAgICAgIGxpYnhsX3RtZW1fc2V0KGN0eCwgZG9taWQsICJjb21wcmVzcyIs IGNvbXByZXNzKTsKKyAgICAgICAgcmMgPSBsaWJ4bF90bWVtX3NldChjdHgsIGRvbWlkLCAiY29t cHJlc3MiLCBjb21wcmVzcyk7CiAKLSAgICByZXR1cm4gMDsKKyAgICBpZiAocmMgPCAwKQorICAg ICAgICByZXR1cm4gRVhJVF9GQUlMVVJFOworCisgICAgcmV0dXJuIEVYSVRfU1VDQ0VTUzsKIH0K IAogaW50IG1haW5fdG1lbV9zaGFyZWRfYXV0aChpbnQgYXJnYywgY2hhciAqKmFyZ3YpCkBAIC03 OTY0LDcgKzc5NzIsNyBAQCBpbnQgbWFpbl90bWVtX3NoYXJlZF9hdXRoKGludCBhcmdjLCBjaGFy ICoqYXJndikKICAgICBpZiAoIWRvbSAmJiBhbGwgPT0gMCkgewogICAgICAgICBmcHJpbnRmKHN0 ZGVyciwgIllvdSBtdXN0IHNwZWNpZnkgLWEgb3IgYSBkb21haW4gaWQuXG5cbiIpOwogICAgICAg ICBoZWxwKCJ0bWVtLXNoYXJlZC1hdXRoIik7Ci0gICAgICAgIHJldHVybiAxOworICAgICAgICBy ZXR1cm4gRVhJVF9GQUlMVVJFOwogICAgIH0KIAogICAgIGlmIChhbGwpCkBAIC03OTc1LDE4ICs3 OTgzLDE5IEBAIGludCBtYWluX3RtZW1fc2hhcmVkX2F1dGgoaW50IGFyZ2MsIGNoYXIgKiphcmd2 KQogICAgIGlmICh1dWlkID09IE5VTEwgfHwgYXV0aGFyZyA9PSBOVUxMKSB7CiAgICAgICAgIGZw cmludGYoc3RkZXJyLCAiTm8gdXVpZCBvciBhdXRoIHNwZWNpZmllZC5cblxuIik7CiAgICAgICAg IGhlbHAoInRtZW0tc2hhcmVkLWF1dGgiKTsKLSAgICAgICAgcmV0dXJuIDE7CisgICAgICAgIHJl dHVybiBFWElUX0ZBSUxVUkU7CiAgICAgfQogCiAgICAgYXV0aCA9IHN0cnRvbChhdXRoYXJnLCAm ZW5kcHRyLCAxMCk7CiAgICAgaWYgKCplbmRwdHIgIT0gJ1wwJykgewogICAgICAgICBmcHJpbnRm KHN0ZGVyciwgIkludmFsaWQgYXV0aCwgdmFsaWQgYXV0aCBhcmUgPDB8MT4uXG5cbiIpOwotICAg ICAgICByZXR1cm4gMTsKKyAgICAgICAgcmV0dXJuIEVYSVRfRkFJTFVSRTsKICAgICB9CiAKLSAg ICBsaWJ4bF90bWVtX3NoYXJlZF9hdXRoKGN0eCwgZG9taWQsIHV1aWQsIGF1dGgpOworICAgIGlm IChsaWJ4bF90bWVtX3NoYXJlZF9hdXRoKGN0eCwgZG9taWQsIHV1aWQsIGF1dGgpIDwgMCkKKyAg ICAgICAgcmV0dXJuIEVYSVRfRkFJTFVSRTsKIAotICAgIHJldHVybiAwOworICAgIHJldHVybiBF WElUX1NVQ0NFU1M7CiB9CiAKIGludCBtYWluX3RtZW1fZnJlZWFibGUoaW50IGFyZ2MsIGNoYXIg Kiphcmd2KQpAQCAtODAwMCwxMCArODAwOSwxMCBAQCBpbnQgbWFpbl90bWVtX2ZyZWVhYmxlKGlu dCBhcmdjLCBjaGFyICoqYXJndikKIAogICAgIG1iID0gbGlieGxfdG1lbV9mcmVlYWJsZShjdHgp OwogICAgIGlmIChtYiA9PSAtMSkKLSAgICAgICAgcmV0dXJuIC0xOworICAgICAgICByZXR1cm4g RVhJVF9GQUlMVVJFOwogCiAgICAgcHJpbnRmKCIlZFxuIiwgbWIpOwotICAgIHJldHVybiAwOwor ICAgIHJldHVybiBFWElUX1NVQ0NFU1M7CiB9CiAKIGludCBtYWluX2NwdXBvb2xjcmVhdGUoaW50 IGFyZ2MsIGNoYXIgKiphcmd2KQotLSAKMS45LjEKCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBs aXN0cy54ZW4ub3JnCmh0dHA6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=