From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paulina Szubarczyk Subject: [PATCH v2 08/10] libxl: improve main_tmem_* return codes Date: Wed, 6 Apr 2016 13:46:01 +0200 Message-ID: <1459943163-18697-9-git-send-email-paulinaszubarczyk@gmail.com> References: <1459943163-18697-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 1anlvn-000444-To for xen-devel@lists.xenproject.org; Wed, 06 Apr 2016 11:47:32 +0000 Received: by mail-lf0-f67.google.com with SMTP id p81so4085720lfb.3 for ; Wed, 06 Apr 2016 04:47:29 -0700 (PDT) In-Reply-To: <1459943163-18697-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 enV0ZWsgV2lsayA8a29ucmFkLndpbGtAb3JhY2xlLmNvbT4KQWNrZWQtYnk6IFJvZ2VyIFBhdSBN b25uw6kgPHJvZ2VyLnBhdUBjaXRyaXguY29tPgotLS0KIHRvb2xzL2xpYnhsL3hsX2NtZGltcGwu YyB8IDUxICsrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLQog MSBmaWxlIGNoYW5nZWQsIDMwIGluc2VydGlvbnMoKyksIDIxIGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL3Rvb2xzL2xpYnhsL3hsX2NtZGltcGwuYyBiL3Rvb2xzL2xpYnhsL3hsX2NtZGltcGwu YwppbmRleCAwYmM3YWQ5Li40YjIyNTQ4IDEwMDY0NAotLS0gYS90b29scy9saWJ4bC94bF9jbWRp bXBsLmMKKysrIGIvdG9vbHMvbGlieGwveGxfY21kaW1wbC5jCkBAIC03NTI5LDExICs3NTI5LDEx IEBAIGludCBtYWluX3RtZW1fbGlzdChpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAKICAgICBidWYg PSBsaWJ4bF90bWVtX2xpc3QoY3R4LCBkb21pZCwgdXNlX2xvbmcpOwogICAgIGlmIChidWYgPT0g TlVMTCkKLSAgICAgICAgcmV0dXJuIC0xOworICAgICAgICByZXR1cm4gRVhJVF9GQUlMVVJFOwog CiAgICAgcHJpbnRmKCIlc1xuIiwgYnVmKTsKICAgICBmcmVlKGJ1Zik7Ci0gICAgcmV0dXJuIDA7 CisgICAgcmV0dXJuIEVYSVRfU1VDQ0VTUzsKIH0KIAogaW50IG1haW5fdG1lbV9mcmVlemUoaW50 IGFyZ2MsIGNoYXIgKiphcmd2KQpAQCAtNzU1Myw3ICs3NTUzLDcgQEAgaW50IG1haW5fdG1lbV9m cmVlemUoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogICAgIGlmICghZG9tICYmIGFsbCA9PSAwKSB7 CiAgICAgICAgIGZwcmludGYoc3RkZXJyLCAiWW91IG11c3Qgc3BlY2lmeSAtYSBvciBhIGRvbWFp biBpZC5cblxuIik7CiAgICAgICAgIGhlbHAoInRtZW0tZnJlZXplIik7Ci0gICAgICAgIHJldHVy biAxOworICAgICAgICByZXR1cm4gRVhJVF9GQUlMVVJFOwogICAgIH0KIAogICAgIGlmIChhbGwp CkBAIC03NTYxLDggKzc1NjEsMTAgQEAgaW50IG1haW5fdG1lbV9mcmVlemUoaW50IGFyZ2MsIGNo YXIgKiphcmd2KQogICAgIGVsc2UKICAgICAgICAgZG9taWQgPSBmaW5kX2RvbWFpbihkb20pOwog Ci0gICAgbGlieGxfdG1lbV9mcmVlemUoY3R4LCBkb21pZCk7Ci0gICAgcmV0dXJuIDA7CisgICAg aWYgKGxpYnhsX3RtZW1fZnJlZXplKGN0eCwgZG9taWQpIDwgMCkKKyAgICAgICAgcmV0dXJuIEVY SVRfRkFJTFVSRTsKKworICAgIHJldHVybiBFWElUX1NVQ0NFU1M7CiB9CiAKIGludCBtYWluX3Rt ZW1fdGhhdyhpbnQgYXJnYywgY2hhciAqKmFyZ3YpCkBAIC03NTgyLDcgKzc1ODQsNyBAQCBpbnQg bWFpbl90bWVtX3RoYXcoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogICAgIGlmICghZG9tICYmIGFs bCA9PSAwKSB7CiAgICAgICAgIGZwcmludGYoc3RkZXJyLCAiWW91IG11c3Qgc3BlY2lmeSAtYSBv ciBhIGRvbWFpbiBpZC5cblxuIik7CiAgICAgICAgIGhlbHAoInRtZW0tdGhhdyIpOwotICAgICAg ICByZXR1cm4gMTsKKyAgICAgICAgcmV0dXJuIEVYSVRfRkFJTFVSRTsKICAgICB9CiAKICAgICBp ZiAoYWxsKQpAQCAtNzU5MCw4ICs3NTkyLDEwIEBAIGludCBtYWluX3RtZW1fdGhhdyhpbnQgYXJn YywgY2hhciAqKmFyZ3YpCiAgICAgZWxzZQogICAgICAgICBkb21pZCA9IGZpbmRfZG9tYWluKGRv bSk7CiAKLSAgICBsaWJ4bF90bWVtX3RoYXcoY3R4LCBkb21pZCk7Ci0gICAgcmV0dXJuIDA7Cisg ICAgaWYgKGxpYnhsX3RtZW1fdGhhdyhjdHgsIGRvbWlkKSA8IDApCisgICAgICAgIHJldHVybiBF WElUX0ZBSUxVUkU7CisKKyAgICByZXR1cm4gRVhJVF9TVUNDRVNTOwogfQogCiBpbnQgbWFpbl90 bWVtX3NldChpbnQgYXJnYywgY2hhciAqKmFyZ3YpCkBAIC03NjAyLDYgKzc2MDYsNyBAQCBpbnQg bWFpbl90bWVtX3NldChpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAgICAgaW50IG9wdF93ID0gMCwg b3B0X2MgPSAwLCBvcHRfcCA9IDA7CiAgICAgaW50IGFsbCA9IDA7CiAgICAgaW50IG9wdDsKKyAg ICBpbnQgcmMgPSAwOwogCiAgICAgU1dJVENIX0ZPUkVBQ0hfT1BUKG9wdCwgImF3OmM6cDoiLCBO VUxMLCAidG1lbS1zZXQiLCAwKSB7CiAgICAgY2FzZSAnYSc6CkBAIC03NjI1LDcgKzc2MzAsNyBA QCBpbnQgbWFpbl90bWVtX3NldChpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAgICAgaWYgKCFkb20g JiYgYWxsID09IDApIHsKICAgICAgICAgZnByaW50ZihzdGRlcnIsICJZb3UgbXVzdCBzcGVjaWZ5 IC1hIG9yIGEgZG9tYWluIGlkLlxuXG4iKTsKICAgICAgICAgaGVscCgidG1lbS1zZXQiKTsKLSAg ICAgICAgcmV0dXJuIDE7CisgICAgICAgIHJldHVybiBFWElUX0ZBSUxVUkU7CiAgICAgfQogCiAg ICAgaWYgKGFsbCkKQEAgLTc2MzYsMTcgKzc2NDEsMjAgQEAgaW50IG1haW5fdG1lbV9zZXQoaW50 IGFyZ2MsIGNoYXIgKiphcmd2KQogICAgIGlmICghb3B0X3cgJiYgIW9wdF9jICYmICFvcHRfcCkg ewogICAgICAgICBmcHJpbnRmKHN0ZGVyciwgIk5vIHNldCB2YWx1ZSBzcGVjaWZpZWQuXG5cbiIp OwogICAgICAgICBoZWxwKCJ0bWVtLXNldCIpOwotICAgICAgICByZXR1cm4gMTsKKyAgICAgICAg cmV0dXJuIEVYSVRfRkFJTFVSRTsKICAgICB9CiAKICAgICBpZiAob3B0X3cpCi0gICAgICAgIGxp YnhsX3RtZW1fc2V0KGN0eCwgZG9taWQsICJ3ZWlnaHQiLCB3ZWlnaHQpOworICAgICAgICByYyA9 IGxpYnhsX3RtZW1fc2V0KGN0eCwgZG9taWQsICJ3ZWlnaHQiLCB3ZWlnaHQpOwogICAgIGlmIChv cHRfYykKLSAgICAgICAgbGlieGxfdG1lbV9zZXQoY3R4LCBkb21pZCwgImNhcCIsIGNhcCk7Cisg ICAgICAgIHJjID0gbGlieGxfdG1lbV9zZXQoY3R4LCBkb21pZCwgImNhcCIsIGNhcCk7CiAgICAg aWYgKG9wdF9wKQotICAgICAgICBsaWJ4bF90bWVtX3NldChjdHgsIGRvbWlkLCAiY29tcHJlc3Mi LCBjb21wcmVzcyk7CisgICAgICAgIHJjID0gbGlieGxfdG1lbV9zZXQoY3R4LCBkb21pZCwgImNv bXByZXNzIiwgY29tcHJlc3MpOwogCi0gICAgcmV0dXJuIDA7CisgICAgaWYgKHJjIDwgMCkKKyAg ICAgICAgcmV0dXJuIEVYSVRfRkFJTFVSRTsKKworICAgIHJldHVybiBFWElUX1NVQ0NFU1M7CiB9 CiAKIGludCBtYWluX3RtZW1fc2hhcmVkX2F1dGgoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQpAQCAt NzY3Niw3ICs3Njg0LDcgQEAgaW50IG1haW5fdG1lbV9zaGFyZWRfYXV0aChpbnQgYXJnYywgY2hh ciAqKmFyZ3YpCiAgICAgaWYgKCFkb20gJiYgYWxsID09IDApIHsKICAgICAgICAgZnByaW50Zihz dGRlcnIsICJZb3UgbXVzdCBzcGVjaWZ5IC1hIG9yIGEgZG9tYWluIGlkLlxuXG4iKTsKICAgICAg ICAgaGVscCgidG1lbS1zaGFyZWQtYXV0aCIpOwotICAgICAgICByZXR1cm4gMTsKKyAgICAgICAg cmV0dXJuIEVYSVRfRkFJTFVSRTsKICAgICB9CiAKICAgICBpZiAoYWxsKQpAQCAtNzY4NywxOCAr NzY5NSwxOSBAQCBpbnQgbWFpbl90bWVtX3NoYXJlZF9hdXRoKGludCBhcmdjLCBjaGFyICoqYXJn dikKICAgICBpZiAodXVpZCA9PSBOVUxMIHx8IGF1dGhhcmcgPT0gTlVMTCkgewogICAgICAgICBm cHJpbnRmKHN0ZGVyciwgIk5vIHV1aWQgb3IgYXV0aCBzcGVjaWZpZWQuXG5cbiIpOwogICAgICAg ICBoZWxwKCJ0bWVtLXNoYXJlZC1hdXRoIik7Ci0gICAgICAgIHJldHVybiAxOworICAgICAgICBy ZXR1cm4gRVhJVF9GQUlMVVJFOwogICAgIH0KIAogICAgIGF1dGggPSBzdHJ0b2woYXV0aGFyZywg JmVuZHB0ciwgMTApOwogICAgIGlmICgqZW5kcHRyICE9ICdcMCcpIHsKICAgICAgICAgZnByaW50 ZihzdGRlcnIsICJJbnZhbGlkIGF1dGgsIHZhbGlkIGF1dGggYXJlIDwwfDE+LlxuXG4iKTsKLSAg ICAgICAgcmV0dXJuIDE7CisgICAgICAgIHJldHVybiBFWElUX0ZBSUxVUkU7CiAgICAgfQogCi0g ICAgbGlieGxfdG1lbV9zaGFyZWRfYXV0aChjdHgsIGRvbWlkLCB1dWlkLCBhdXRoKTsKKyAgICBp ZiAobGlieGxfdG1lbV9zaGFyZWRfYXV0aChjdHgsIGRvbWlkLCB1dWlkLCBhdXRoKSA8IDApCisg ICAgICAgIHJldHVybiBFWElUX0ZBSUxVUkU7CiAKLSAgICByZXR1cm4gMDsKKyAgICByZXR1cm4g RVhJVF9TVUNDRVNTOwogfQogCiBpbnQgbWFpbl90bWVtX2ZyZWVhYmxlKGludCBhcmdjLCBjaGFy ICoqYXJndikKQEAgLTc3MTIsMTAgKzc3MjEsMTAgQEAgaW50IG1haW5fdG1lbV9mcmVlYWJsZShp bnQgYXJnYywgY2hhciAqKmFyZ3YpCiAKICAgICBtYiA9IGxpYnhsX3RtZW1fZnJlZWFibGUoY3R4 KTsKICAgICBpZiAobWIgPT0gLTEpCi0gICAgICAgIHJldHVybiAtMTsKKyAgICAgICAgcmV0dXJu IEVYSVRfRkFJTFVSRTsKIAogICAgIHByaW50ZigiJWRcbiIsIG1iKTsKLSAgICByZXR1cm4gMDsK KyAgICByZXR1cm4gRVhJVF9TVUNDRVNTOwogfQogCiBpbnQgbWFpbl9jcHVwb29sY3JlYXRlKGlu dCBhcmdjLCBjaGFyICoqYXJndikKLS0gCjEuOS4xCgoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxA bGlzdHMueGVuLm9yZwpodHRwOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK