From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dario Faggioli Subject: [PATCH v3 2/6] xl: improve exit codes of save/restore and migration functions Date: Fri, 08 Apr 2016 04:23:39 +0200 Message-ID: <20160408022339.9058.13804.stgit@Solace.fritz.box> References: <20160408022241.9058.86808.stgit@Solace.fritz.box> 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 1aoM5L-00055F-Ge for xen-devel@lists.xenproject.org; Fri, 08 Apr 2016 02:23:47 +0000 Received: by mail-wm0-f68.google.com with SMTP id a140so946847wma.2 for ; Thu, 07 Apr 2016 19:23:45 -0700 (PDT) In-Reply-To: <20160408022241.9058.86808.stgit@Solace.fritz.box> 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 Liu , Ian Jackson , Harmandeep Kaur List-Id: xen-devel@lists.xenproject.org RnJvbTogSGFybWFuZGVlcCBLYXVyIDx3cml0ZS5oYXJtYW5kZWVwQGdtYWlsLmNvbT4KCmJ5IG1h a2luZyB0aGVtIG1vcmUgY29uc2lzdGVudCB3aXRoIG90aGVyIGV4YW1wbGVzIGluIHhsLgoKTWFj cm9zIENIS19FUlJOT1ZBTCwgQ0hLX1NZU0NBTEwsIE1VU1QgYXJlIGFsc28gdXBkYXRlZC4KClNp Z25lZC1vZmYtYnk6IEhhcm1hbmRlZXAgS2F1ciA8d3JpdGUuaGFybWFuZGVlcEBnbWFpbC5jb20+ ClNpZ25lZC1vZmYtYnk6IERhcmlvIEZhZ2dpb2xpIDxkYXJpby5mYWdnaW9saUBjaXRyaXguY29t PgotLS0KQ2M6IElhbiBKYWNrc29uIDxpYW4uamFja3NvbkBldS5jaXRyaXguY29tPgpDYzogV2Vp IExpdSA8d2VpLmxpdTJAY2l0cml4LmNvbT4KLS0tCnYzOiBUaGlzIGlzIHBhdGNoZXMgMiBhbmQg MyBzcXVhc2hlZCB0b2dldGhlci4KICAgIFNob3J0ZW4gY2hhbmdlbG9nLgoKdjI6IEFkZCBtYWlu X3JlbXVzKCkuCiAgICBSZW1vdmUgY3JlYXRlX2RvbWFpbigpLgotLS0KIHRvb2xzL2xpYnhsL3hs X2NtZGltcGwuYyB8ICAgODAgKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0t LS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDQwIGluc2VydGlvbnMoKyksIDQwIGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL3Rvb2xzL2xpYnhsL3hsX2NtZGltcGwuYyBiL3Rvb2xzL2xpYnhsL3hs X2NtZGltcGwuYwppbmRleCA5NjEyYjAwLi45Y2QzMTQ0IDEwMDY0NAotLS0gYS90b29scy9saWJ4 bC94bF9jbWRpbXBsLmMKKysrIGIvdG9vbHMvbGlieGwveGxfY21kaW1wbC5jCkBAIC01MCw3ICs1 MCw3IEBACiAgICAgICAgIGVsc2UgaWYgKGNoa19lcnJub3ZhbCA+IDApIHsgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBcCiAgICAgICAgICAgICBmcHJpbnRmKHN0ZGVyciwieGw6 IGZhdGFsIGVycm9yOiAlczolZDogJXM6ICVzXG4iLCAgICAgICAgICBcCiAgICAgICAgICAgICAg ICAgICAgIF9fRklMRV9fLF9fTElORV9fLCBzdHJlcnJvcihjaGtfZXJybm92YWwpLCAjY2FsbCk7 ICBcCi0gICAgICAgICAgICBleGl0KC1FUlJPUl9GQUlMKTsgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBcCisgICAgICAgICAgICBleGl0KEVYSVRfRkFJTFVSRSk7ICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCiAgICAgICAgIH0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBc CiAgICAgfSkKIApAQCAtNTksNyArNTksNyBAQAogICAgICAgICBpZiAoKGNhbGwpID09IC0xKSB7 ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAogICAgICAgICAg ICAgZnByaW50ZihzdGRlcnIsInhsOiBmYXRhbCBlcnJvcjogJXM6JWQ6ICVzOiAlc1xuIiwgICAg ICAgICAgXAogICAgICAgICAgICAgICAgICAgICBfX0ZJTEVfXyxfX0xJTkVfXywgc3RyZXJyb3Io ZXJybm8pLCAjY2FsbCk7ICAgICAgICAgXAotICAgICAgICAgICAgZXhpdCgtRVJST1JfRkFJTCk7 ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAorICAgICAgICAgICAg ZXhpdChFWElUX0ZBSUxVUkUpOyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgXAogICAgICAgICB9ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgXAogICAgIH0pCiAKQEAgLTY4LDcgKzY4LDcgQEAKICAgICAg ICAgaWYgKG11c3RfcmMgPCAwKSB7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBcCiAgICAgICAgICAgICBmcHJpbnRmKHN0ZGVyciwieGw6IGZhdGFsIGVy cm9yOiAlczolZCwgcmM9JWQ6ICVzXG4iLCAgICAgICBcCiAgICAgICAgICAgICAgICAgICAgIF9f RklMRV9fLF9fTElORV9fLCBtdXN0X3JjLCAjY2FsbCk7ICAgICAgICAgICAgICAgICBcCi0gICAg ICAgICAgICBleGl0KC1tdXN0X3JjKTsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBcCisgICAgICAgICAgICBleGl0KEVYSVRfRkFJTFVSRSk7ICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCiAgICAgICAgIH0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCiAgICAgfSkK IApAQCAtMzc2LDcgKzM3Niw3IEBAIHN0YXRpYyB2b2lkIHh2YXNwcmludGYoY2hhciAqKnN0cnAs IGNvbnN0IGNoYXIgKmZtdCwgdmFfbGlzdCBhcCkKICAgICBpbnQgciA9IHZhc3ByaW50ZihzdHJw LCBmbXQsIGFwKTsKICAgICBpZiAociA9PSAtMSkgewogICAgICAgICBwZXJyb3IoImFzcHJpbnRm IGZhaWxlZCIpOwotICAgICAgICBleGl0KC1FUlJPUl9GQUlMKTsKKyAgICAgICAgZXhpdChFWElU X0ZBSUxVUkUpOwogICAgIH0KIH0KIApAQCAtNDM1MCw3ICs0MzUwLDcgQEAgc3RhdGljIHZvaWQg c2F2ZV9kb21haW5fY29yZV9iZWdpbih1aW50MzJfdCBkb21pZCwKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgJmNvbmZpZ192LCBjb25maWdfbGVuX3IpOwogICAgICAgICBp ZiAocmMpIHsKICAgICAgICAgICAgIGZwcmludGYoc3RkZXJyLCAidW5hYmxlIHRvIHJlYWQgb3Zl cnJpZGRlbiBjb25maWcgZmlsZVxuIik7Ci0gICAgICAgICAgICBleGl0KDIpOworICAgICAgICAg ICAgZXhpdChFWElUX0ZBSUxVUkUpOwogICAgICAgICB9CiAgICAgICAgIHBhcnNlX2NvbmZpZ19k YXRhKG92ZXJyaWRlX2NvbmZpZ19maWxlLCBjb25maWdfdiwgKmNvbmZpZ19sZW5fciwKICAgICAg ICAgICAgICAgICAgICAgICAgICAgJmRfY29uZmlnKTsKQEAgLTQzNTksMTQgKzQzNTksMTQgQEAg c3RhdGljIHZvaWQgc2F2ZV9kb21haW5fY29yZV9iZWdpbih1aW50MzJfdCBkb21pZCwKICAgICAg ICAgcmMgPSBsaWJ4bF9yZXRyaWV2ZV9kb21haW5fY29uZmlndXJhdGlvbihjdHgsIGRvbWlkLCAm ZF9jb25maWcpOwogICAgICAgICBpZiAocmMpIHsKICAgICAgICAgICAgIGZwcmludGYoc3RkZXJy LCAidW5hYmxlIHRvIHJldHJpZXZlIGRvbWFpbiBjb25maWd1cmF0aW9uXG4iKTsKLSAgICAgICAg ICAgIGV4aXQoMik7CisgICAgICAgICAgICBleGl0KEVYSVRfRkFJTFVSRSk7CiAgICAgICAgIH0K ICAgICB9CiAKICAgICBjb25maWdfYyA9IGxpYnhsX2RvbWFpbl9jb25maWdfdG9fanNvbihjdHgs ICZkX2NvbmZpZyk7CiAgICAgaWYgKCFjb25maWdfYykgewogICAgICAgICBmcHJpbnRmKHN0ZGVy ciwgInVuYWJsZSB0byBjb252ZXJ0IGNvbmZpZyBmaWxlIHRvIEpTT05cbiIpOwotICAgICAgICBl eGl0KDIpOworICAgICAgICBleGl0KEVYSVRfRkFJTFVSRSk7CiAgICAgfQogICAgICpjb25maWdf ZGF0YV9yID0gKHVpbnQ4X3QgKiljb25maWdfYzsKICAgICAqY29uZmlnX2xlbl9yID0gc3RybGVu KGNvbmZpZ19jKSArIDE7IC8qIGluY2x1ZGluZyB0cmFpbGluZyAnXDAnICovCkBAIC00NDM2LDcg KzQ0MzYsNyBAQCBzdGF0aWMgaW50IHNhdmVfZG9tYWluKHVpbnQzMl90IGRvbWlkLCBjb25zdCBj aGFyICpmaWxlbmFtZSwgaW50IGNoZWNrcG9pbnQsCiAgICAgZmQgPSBvcGVuKGZpbGVuYW1lLCBP X1dST05MWXxPX0NSRUFUfE9fVFJVTkMsIDA2NDQpOwogICAgIGlmIChmZCA8IDApIHsKICAgICAg ICAgZnByaW50ZihzdGRlcnIsICJGYWlsZWQgdG8gb3BlbiB0ZW1wIGZpbGUgJXMgZm9yIHdyaXRp bmdcbiIsIGZpbGVuYW1lKTsKLSAgICAgICAgZXhpdCgyKTsKKyAgICAgICAgZXhpdChFWElUX0ZB SUxVUkUpOwogICAgIH0KIAogICAgIHNhdmVfZG9tYWluX2NvcmVfd3JpdGVjb25maWcoZmQsIGZp bGVuYW1lLCBjb25maWdfZGF0YSwgY29uZmlnX2xlbik7CkBAIC00NDU2LDcgKzQ0NTYsNyBAQCBz dGF0aWMgaW50IHNhdmVfZG9tYWluKHVpbnQzMl90IGRvbWlkLCBjb25zdCBjaGFyICpmaWxlbmFt ZSwgaW50IGNoZWNrcG9pbnQsCiAgICAgZWxzZQogICAgICAgICBsaWJ4bF9kb21haW5fZGVzdHJv eShjdHgsIGRvbWlkLCAwKTsKIAotICAgIGV4aXQocmMgPCAwID8gMSA6IDApOworICAgIGV4aXQo cmMgPCAwID8gRVhJVF9GQUlMVVJFIDogRVhJVF9TVUNDRVNTKTsKIH0KIAogc3RhdGljIHBpZF90 IGNyZWF0ZV9taWdyYXRpb25fY2hpbGQoY29uc3QgY2hhciAqcnVuZSwgaW50ICpzZW5kX2ZkLApA QCAtNDQ4MCw3ICs0NDgwLDcgQEAgc3RhdGljIHBpZF90IGNyZWF0ZV9taWdyYXRpb25fY2hpbGQo Y29uc3QgY2hhciAqcnVuZSwgaW50ICpzZW5kX2ZkLAogICAgICAgICBjbG9zZShyZWN2cGlwZVsw XSk7IGNsb3NlKHJlY3ZwaXBlWzFdKTsKICAgICAgICAgZXhlY2xwKCJzaCIsInNoIiwiLWMiLHJ1 bmUsKGNoYXIqKTApOwogICAgICAgICBwZXJyb3IoImZhaWxlZCB0byBleGVjIHNoIik7Ci0gICAg ICAgIGV4aXQoLTEpOworICAgICAgICBleGl0KEVYSVRfRkFJTFVSRSk7CiAgICAgfQogCiAgICAg Y2xvc2Uoc2VuZHBpcGVbMF0pOwpAQCAtNDUwMywxNCArNDUwMywxNCBAQCBzdGF0aWMgaW50IG1p Z3JhdGVfcmVhZF9maXhlZG1lc3NhZ2UoaW50IGZkLCBjb25zdCB2b2lkICptc2csIGludCBtc2dz eiwKIAogICAgIHN0cmVhbSA9IHJ1bmUgPyAibWlncmF0aW9uIHJlY2VpdmVyIHN0cmVhbSIgOiAi bWlncmF0aW9uIHN0cmVhbSI7CiAgICAgcmMgPSBsaWJ4bF9yZWFkX2V4YWN0bHkoY3R4LCBmZCwg YnVmLCBtc2dzeiwgc3RyZWFtLCB3aGF0KTsKLSAgICBpZiAocmMpIHJldHVybiBFUlJPUl9GQUlM OworICAgIGlmIChyYykgcmV0dXJuIDE7CiAKICAgICBpZiAobWVtY21wKGJ1ZiwgbXNnLCBtc2dz eikpIHsKICAgICAgICAgZnByaW50ZihzdGRlcnIsICIlcyBjb250YWluZWQgdW5leHBlY3RlZCBk YXRhIGluc3RlYWQgb2YgJXNcbiIsCiAgICAgICAgICAgICAgICAgc3RyZWFtLCB3aGF0KTsKICAg ICAgICAgaWYgKHJ1bmUpCiAgICAgICAgICAgICBmcHJpbnRmKHN0ZGVyciwgIihjb21tYW5kIHJ1 biB3YXM6ICVzIClcbiIsIHJ1bmUpOwotICAgICAgICByZXR1cm4gRVJST1JfRkFJTDsKKyAgICAg ICAgcmV0dXJuIDE7CiAgICAgfQogICAgIHJldHVybiAwOwogfQpAQCAtNDU4Niw3ICs0NTg2LDcg QEAgc3RhdGljIHZvaWQgbWlncmF0ZV9kb19wcmVhbWJsZShpbnQgc2VuZF9mZCwgaW50IHJlY3Zf ZmQsIHBpZF90IGNoaWxkLAogCiAgICAgaWYgKHNlbmRfZmQgPCAwIHx8IHJlY3ZfZmQgPCAwKSB7 CiAgICAgICAgIGZwcmludGYoc3RkZXJyLCAibWlncmF0ZV9kb19wcmVhbWJsZTogaW52YWxpZCBm aWxlIGRlc2NyaXB0b3JzXG4iKTsKLSAgICAgICAgZXhpdCgxKTsKKyAgICAgICAgZXhpdChFWElU X0ZBSUxVUkUpOwogICAgIH0KIAogICAgIHJjID0gbWlncmF0ZV9yZWFkX2ZpeGVkbWVzc2FnZShy ZWN2X2ZkLCBtaWdyYXRlX3JlY2VpdmVyX2Jhbm5lciwKQEAgLTQ1OTUsNyArNDU5NSw3IEBAIHN0 YXRpYyB2b2lkIG1pZ3JhdGVfZG9fcHJlYW1ibGUoaW50IHNlbmRfZmQsIGludCByZWN2X2ZkLCBw aWRfdCBjaGlsZCwKICAgICBpZiAocmMpIHsKICAgICAgICAgY2xvc2Uoc2VuZF9mZCk7CiAgICAg ICAgIG1pZ3JhdGlvbl9jaGlsZF9yZXBvcnQocmVjdl9mZCk7Ci0gICAgICAgIGV4aXQoLXJjKTsK KyAgICAgICAgZXhpdChFWElUX0ZBSUxVUkUpOwogICAgIH0KIAogICAgIHNhdmVfZG9tYWluX2Nv cmVfd3JpdGVjb25maWcoc2VuZF9mZCwgIm1pZ3JhdGlvbiBzdHJlYW0iLApAQCAtNDYyMCw3ICs0 NjIwLDcgQEAgc3RhdGljIHZvaWQgbWlncmF0ZV9kb21haW4odWludDMyX3QgZG9taWQsIGNvbnN0 IGNoYXIgKnJ1bmUsIGludCBkZWJ1ZywKICAgICBpZiAoIWNvbmZpZ19sZW4pIHsKICAgICAgICAg ZnByaW50ZihzdGRlcnIsICJObyBjb25maWcgZmlsZSBzdG9yZWQgZm9yIHJ1bm5pbmcgZG9tYWlu IGFuZCAiCiAgICAgICAgICAgICAgICAgIm5vbmUgc3VwcGxpZWQgLSBjYW5ub3QgbWlncmF0ZS5c biIpOwotICAgICAgICBleGl0KDEpOworICAgICAgICBleGl0KEVYSVRfRkFJTFVSRSk7CiAgICAg fQogCiAgICAgY2hpbGQgPSBjcmVhdGVfbWlncmF0aW9uX2NoaWxkKHJ1bmUsICZzZW5kX2ZkLCAm cmVjdl9mZCk7CkBAIC00NzA3LDI2ICs0NzA3LDI2IEBAIHN0YXRpYyB2b2lkIG1pZ3JhdGVfZG9t YWluKHVpbnQzMl90IGRvbWlkLCBjb25zdCBjaGFyICpydW5lLCBpbnQgZGVidWcsCiAgICAgICAg IGlmICghcmMpIGZwcmludGYoc3RkZXJyLCAibWlncmF0aW9uIHNlbmRlcjogUmVzdW1lZCBPSy5c biIpOwogCiAgICAgICAgIGZwcmludGYoc3RkZXJyLCAiTWlncmF0aW9uIGZhaWxlZCBkdWUgdG8g cHJvYmxlbXMgYXQgdGFyZ2V0LlxuIik7Ci0gICAgICAgIGV4aXQoLUVSUk9SX0ZBSUwpOworICAg ICAgICBleGl0KEVYSVRfRkFJTFVSRSk7CiAgICAgfQogCiAgICAgZnByaW50ZihzdGRlcnIsICJt aWdyYXRpb24gc2VuZGVyOiBUYXJnZXQgcmVwb3J0cyBzdWNjZXNzZnVsIHN0YXJ0dXAuXG4iKTsK ICAgICBsaWJ4bF9kb21haW5fZGVzdHJveShjdHgsIGRvbWlkLCAwKTsgLyogYmFuZyEgKi8KICAg ICBmcHJpbnRmKHN0ZGVyciwgIk1pZ3JhdGlvbiBzdWNjZXNzZnVsLlxuIik7Ci0gICAgZXhpdCgw KTsKKyAgICBleGl0KEVYSVRfU1VDQ0VTUyk7CiAKICBmYWlsZWRfc3VzcGVuZDoKICAgICBjbG9z ZShzZW5kX2ZkKTsKICAgICBtaWdyYXRpb25fY2hpbGRfcmVwb3J0KHJlY3ZfZmQpOwogICAgIGZw cmludGYoc3RkZXJyLCAiTWlncmF0aW9uIGZhaWxlZCwgZmFpbGVkIHRvIHN1c3BlbmQgYXQgc2Vu ZGVyLlxuIik7Ci0gICAgZXhpdCgtRVJST1JfRkFJTCk7CisgICAgZXhpdChFWElUX0ZBSUxVUkUp OwogCiAgZmFpbGVkX3Jlc3VtZToKICAgICBjbG9zZShzZW5kX2ZkKTsKICAgICBtaWdyYXRpb25f Y2hpbGRfcmVwb3J0KHJlY3ZfZmQpOwogICAgIGZwcmludGYoc3RkZXJyLCAiTWlncmF0aW9uIGZh aWxlZCwgcmVzdW1pbmcgYXQgc2VuZGVyLlxuIik7CiAgICAgbGlieGxfZG9tYWluX3Jlc3VtZShj dHgsIGRvbWlkLCAxLCAwKTsKLSAgICBleGl0KC1FUlJPUl9GQUlMKTsKKyAgICBleGl0KEVYSVRf RkFJTFVSRSk7CiAKICBmYWlsZWRfYmFkbHk6CiAgICAgZnByaW50ZihzdGRlcnIsCkBAIC00NzM5 LDcgKzQ3MzksNyBAQCBzdGF0aWMgdm9pZCBtaWdyYXRlX2RvbWFpbih1aW50MzJfdCBkb21pZCwg Y29uc3QgY2hhciAqcnVuZSwgaW50IGRlYnVnLAogCiAgICAgY2xvc2Uoc2VuZF9mZCk7CiAgICAg bWlncmF0aW9uX2NoaWxkX3JlcG9ydChyZWN2X2ZkKTsKLSAgICBleGl0KC1FUlJPUl9CQURGQUlM KTsKKyAgICBleGl0KEVYSVRfRkFJTFVSRSk7CiB9CiAKIHN0YXRpYyB2b2lkIG1pZ3JhdGVfcmVj ZWl2ZShpbnQgZGVidWcsIGludCBkYWVtb25pemUsIGludCBtb25pdG9yLApAQCAtNDc4MCw3ICs0 NzgwLDcgQEAgc3RhdGljIHZvaWQgbWlncmF0ZV9yZWNlaXZlKGludCBkZWJ1ZywgaW50IGRhZW1v bml6ZSwgaW50IG1vbml0b3IsCiAgICAgaWYgKHJjIDwgMCkgewogICAgICAgICBmcHJpbnRmKHN0 ZGVyciwgIm1pZ3JhdGlvbiB0YXJnZXQ6IERvbWFpbiBjcmVhdGlvbiBmYWlsZWQiCiAgICAgICAg ICAgICAgICAgIiAoY29kZSAlZCkuXG4iLCByYyk7Ci0gICAgICAgIGV4aXQoLXJjKTsKKyAgICAg ICAgZXhpdChFWElUX0ZBSUxVUkUpOwogICAgIH0KIAogICAgIGRvbWlkID0gcmM7CkBAIC00ODIz LDcgKzQ4MjMsNyBAQCBzdGF0aWMgdm9pZCBtaWdyYXRlX3JlY2VpdmUoaW50IGRlYnVnLCBpbnQg ZGFlbW9uaXplLCBpbnQgbW9uaXRvciwKICAgICAgICAgICAgICAgICAgICAgIkZhaWxlZCB0byB1 bnBhdXNlIGRvbWFpbiAlcyAoaWQ6ICV1KTolZFxuIiwKICAgICAgICAgICAgICAgICAgICAgaGEs IGNvbW1vbl9kb21uYW1lLCBkb21pZCwgcmMpOwogCi0gICAgICAgIGV4aXQocmMgPyAtRVJST1Jf RkFJTDogMCk7CisgICAgICAgIGV4aXQocmMgPyBFWElUX0ZBSUxVUkUgOiBFWElUX1NVQ0NFU1Mp OwogICAgIGRlZmF1bHQ6CiAgICAgICAgIC8qIGRvIG5vdGhpbmcgKi8KICAgICAgICAgYnJlYWs7 CkBAIC00ODM2LDcgKzQ4MzYsNyBAQCBzdGF0aWMgdm9pZCBtaWdyYXRlX3JlY2VpdmUoaW50IGRl YnVnLCBpbnQgZGFlbW9uaXplLCBpbnQgbW9uaXRvciwKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgbWlncmF0ZV9yZWNlaXZlcl9yZWFkeSwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgc2l6ZW9mKG1pZ3JhdGVfcmVjZWl2ZXJfcmVhZHkpLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAibWlncmF0aW9uIGFjayBzdHJlYW0iLCAicmVhZHkgbWVzc2FnZSIpOwotICAgIGlm IChyYykgZXhpdCgtcmMpOworICAgIGlmIChyYykgZXhpdChFWElUX0ZBSUxVUkUpOwogCiAgICAg cmMgPSBtaWdyYXRlX3JlYWRfZml4ZWRtZXNzYWdlKHJlY3ZfZmQsIG1pZ3JhdGVfcGVybWlzc2lv bl90b19nbywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2l6ZW9mKG1pZ3Jh dGVfcGVybWlzc2lvbl90b19nbyksCkBAIC00ODYxLDE0ICs0ODYxLDE0IEBAIHN0YXRpYyB2b2lk IG1pZ3JhdGVfcmVjZWl2ZShpbnQgZGVidWcsIGludCBkYWVtb25pemUsIGludCBtb25pdG9yLAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbWlncmF0ZV9yZXBvcnQsIHNpemVvZihtaWdy YXRlX3JlcG9ydCksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAibWlncmF0aW9uIGFj ayBzdHJlYW0iLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgInN1Y2Nlc3MvZmFpbHVy ZSByZXBvcnQiKTsKLSAgICBpZiAocmMyKSBleGl0KC1FUlJPUl9CQURGQUlMKTsKKyAgICBpZiAo cmMyKSBleGl0KEVYSVRfRkFJTFVSRSk7CiAKICAgICByY19idWYgPSAtcmM7CiAgICAgYXNzZXJ0 KCEhcmNfYnVmID09ICEhcmMpOwogICAgIHJjMiA9IGxpYnhsX3dyaXRlX2V4YWN0bHkoY3R4LCBz ZW5kX2ZkLCAmcmNfYnVmLCAxLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIm1pZ3Jh dGlvbiBhY2sgc3RyZWFtIiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJzdWNjZXNz L2ZhaWx1cmUgY29kZSIpOwotICAgIGlmIChyYzIpIGV4aXQoLUVSUk9SX0JBREZBSUwpOworICAg IGlmIChyYzIpIGV4aXQoRVhJVF9GQUlMVVJFKTsKIAogICAgIGlmIChyYykgewogICAgICAgICBm cHJpbnRmKHN0ZGVyciwgIm1pZ3JhdGlvbiB0YXJnZXQ6IEZhaWx1cmUsIGRlc3Ryb3lpbmcgb3Vy IGNvcHkuXG4iKTsKQEAgLTQ4NzcsNyArNDg3Nyw3IEBAIHN0YXRpYyB2b2lkIG1pZ3JhdGVfcmVj ZWl2ZShpbnQgZGVidWcsIGludCBkYWVtb25pemUsIGludCBtb25pdG9yLAogICAgICAgICBpZiAo cmMyKSB7CiAgICAgICAgICAgICBmcHJpbnRmKHN0ZGVyciwgIm1pZ3JhdGlvbiB0YXJnZXQ6IEZh aWxlZCB0byBkZXN0cm95IG91ciBjb3B5IgogICAgICAgICAgICAgICAgICAgICAiIChjb2RlICVk KS5cbiIsIHJjMik7Ci0gICAgICAgICAgICBleGl0KC1FUlJPUl9CQURGQUlMKTsKKyAgICAgICAg ICAgIGV4aXQoRVhJVF9GQUlMVVJFKTsKICAgICAgICAgfQogCiAgICAgICAgIGZwcmludGYoc3Rk ZXJyLCAibWlncmF0aW9uIHRhcmdldDogQ2xlYW51cCBPSywgZ3JhbnRpbmcgc2VuZGVyIgpAQCAt NDg4OCwxMCArNDg4OCwxMCBAQCBzdGF0aWMgdm9pZCBtaWdyYXRlX3JlY2VpdmUoaW50IGRlYnVn LCBpbnQgZGFlbW9uaXplLCBpbnQgbW9uaXRvciwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBzaXplb2YobWlncmF0ZV9wZXJtaXNzaW9uX3RvX2dvKSwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAibWlncmF0aW9uIGFjayBzdHJlYW0iLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICJwZXJtaXNzaW9uIHRvIHNlbmRlciB0byBoYXZlIGRvbWFp biBiYWNrIik7Ci0gICAgICAgIGlmIChyYzIpIGV4aXQoLUVSUk9SX0JBREZBSUwpOworICAgICAg ICBpZiAocmMyKSBleGl0KEVYSVRfRkFJTFVSRSk7CiAgICAgfQogCi0gICAgZXhpdCgwKTsKKyAg ICBleGl0KEVYSVRfU1VDQ0VTUyk7CiB9CiAKIGludCBtYWluX3Jlc3RvcmUoaW50IGFyZ2MsIGNo YXIgKiphcmd2KQpAQCAtNDk0MCw3ICs0OTQwLDcgQEAgaW50IG1haW5fcmVzdG9yZShpbnQgYXJn YywgY2hhciAqKmFyZ3YpCiAgICAgICAgIGNoZWNrcG9pbnRfZmlsZSA9IGFyZ3Zbb3B0aW5kICsg MV07CiAgICAgfSBlbHNlIHsKICAgICAgICAgaGVscCgicmVzdG9yZSIpOwotICAgICAgICByZXR1 cm4gMjsKKyAgICAgICAgcmV0dXJuIEVYSVRfRkFJTFVSRTsKICAgICB9CiAKICAgICBtZW1zZXQo JmRvbV9pbmZvLCAwLCBzaXplb2YoZG9tX2luZm8pKTsKQEAgLTQ5NTgsOSArNDk1OCw5IEBAIGlu dCBtYWluX3Jlc3RvcmUoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogCiAgICAgcmMgPSBjcmVhdGVf ZG9tYWluKCZkb21faW5mbyk7CiAgICAgaWYgKHJjIDwgMCkKLSAgICAgICAgcmV0dXJuIC1yYzsK KyAgICAgICAgcmV0dXJuIEVYSVRfRkFJTFVSRTsKIAotICAgIHJldHVybiAwOworICAgIHJldHVy biBFWElUX1NVQ0NFU1M7CiB9CiAKIGludCBtYWluX21pZ3JhdGVfcmVjZWl2ZShpbnQgYXJnYywg Y2hhciAqKmFyZ3YpCkBAIC01MDAwLDEzICs1MDAwLDEzIEBAIGludCBtYWluX21pZ3JhdGVfcmVj ZWl2ZShpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAKICAgICBpZiAoYXJnYy1vcHRpbmQgIT0gMCkg ewogICAgICAgICBoZWxwKCJtaWdyYXRlLXJlY2VpdmUiKTsKLSAgICAgICAgcmV0dXJuIDI7Cisg ICAgICAgIHJldHVybiBFWElUX0ZBSUxVUkU7CiAgICAgfQogICAgIG1pZ3JhdGVfcmVjZWl2ZShk ZWJ1ZywgZGFlbW9uaXplLCBtb25pdG9yLAogICAgICAgICAgICAgICAgICAgICBTVERPVVRfRklM RU5PLCBTVERJTl9GSUxFTk8sCiAgICAgICAgICAgICAgICAgICAgIGNoZWNrcG9pbnRlZCwgc2Ny aXB0KTsKIAotICAgIHJldHVybiAwOworICAgIHJldHVybiBFWElUX1NVQ0NFU1M7CiB9CiAKIGlu dCBtYWluX3NhdmUoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQpAQCAtNTAyOSw3ICs1MDI5LDcgQEAg aW50IG1haW5fc2F2ZShpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAKICAgICBpZiAoYXJnYy1vcHRp bmQgPiAzKSB7CiAgICAgICAgIGhlbHAoInNhdmUiKTsKLSAgICAgICAgcmV0dXJuIDI7CisgICAg ICAgIHJldHVybiBFWElUX0ZBSUxVUkU7CiAgICAgfQogCiAgICAgZG9taWQgPSBmaW5kX2RvbWFp bihhcmd2W29wdGluZF0pOwpAQCAtNTAzOCw3ICs1MDM4LDcgQEAgaW50IG1haW5fc2F2ZShpbnQg YXJnYywgY2hhciAqKmFyZ3YpCiAgICAgICAgIGNvbmZpZ19maWxlbmFtZSA9IGFyZ3Zbb3B0aW5k ICsgMl07CiAKICAgICBzYXZlX2RvbWFpbihkb21pZCwgZmlsZW5hbWUsIGNoZWNrcG9pbnQsIGxl YXZlcGF1c2VkLCBjb25maWdfZmlsZW5hbWUpOwotICAgIHJldHVybiAwOworICAgIHJldHVybiBF WElUX1NVQ0NFU1M7CiB9CiAKIGludCBtYWluX21pZ3JhdGUoaW50IGFyZ2MsIGNoYXIgKiphcmd2 KQpAQCAtNTEwNSw3ICs1MTA1LDcgQEAgaW50IG1haW5fbWlncmF0ZShpbnQgYXJnYywgY2hhciAq KmFyZ3YpCiAgICAgfQogCiAgICAgbWlncmF0ZV9kb21haW4oZG9taWQsIHJ1bmUsIGRlYnVnLCBj b25maWdfZmlsZW5hbWUpOwotICAgIHJldHVybiAwOworICAgIHJldHVybiBFWElUX1NVQ0NFU1M7 CiB9CiAjZW5kaWYKIApAQCAtODc1Niw3ICs4NzU2LDcgQEAgaW50IG1haW5fcmVtdXMoaW50IGFy Z2MsIGNoYXIgKiphcmd2KQogICAgICAgICBzZW5kX2ZkID0gb3BlbigiL2Rldi9udWxsIiwgT19S RFdSLCAwNjQ0KTsKICAgICAgICAgaWYgKHNlbmRfZmQgPCAwKSB7CiAgICAgICAgICAgICBwZXJy b3IoImZhaWxlZCB0byBvcGVuIC9kZXYvbnVsbCIpOwotICAgICAgICAgICAgZXhpdCgtMSk7Cisg ICAgICAgICAgICBleGl0KEVYSVRfRkFJTFVSRSk7CiAgICAgICAgIH0KICAgICB9IGVsc2Ugewog CkBAIC04NzgzLDcgKzg3ODMsNyBAQCBpbnQgbWFpbl9yZW11cyhpbnQgYXJnYywgY2hhciAqKmFy Z3YpCiAgICAgICAgIGlmICghY29uZmlnX2xlbikgewogICAgICAgICAgICAgZnByaW50ZihzdGRl cnIsICJObyBjb25maWcgZmlsZSBzdG9yZWQgZm9yIHJ1bm5pbmcgZG9tYWluIGFuZCAiCiAgICAg ICAgICAgICAgICAgICAgICJub25lIHN1cHBsaWVkIC0gY2Fubm90IHN0YXJ0IHJlbXVzLlxuIik7 Ci0gICAgICAgICAgICBleGl0KDEpOworICAgICAgICAgICAgZXhpdChFWElUX0ZBSUxVUkUpOwog ICAgICAgICB9CiAKICAgICAgICAgY2hpbGQgPSBjcmVhdGVfbWlncmF0aW9uX2NoaWxkKHJ1bmUs ICZzZW5kX2ZkLCAmcmVjdl9mZCk7CkBAIC04ODA1LDcgKzg4MDUsNyBAQCBpbnQgbWFpbl9yZW11 cyhpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAgICAgICAgIGZwcmludGYoc3RkZXJyLCAiJXM6IFBy aW1hcnkgZG9tYWluIGhhcyBiZWVuIGRlc3Ryb3llZC5cbiIsCiAgICAgICAgICAgICAgICAgbGli eGxfZGVmYm9vbF92YWwocl9pbmZvLmNvbG8pID8gIkNPTE8iIDogIlJlbXVzIik7CiAgICAgICAg IGNsb3NlKHNlbmRfZmQpOwotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIEVYSVRf U1VDQ0VTUzsKICAgICB9CiAKICAgICAvKiBJZiB3ZSBhcmUgaGVyZSwgaXQgbWVhbnMgcmVtdXMg c2V0dXAvZG9tYWluIHN1c3BlbmQvYmFja3VwIGhhcwpAQCAtODgyMSw3ICs4ODIxLDcgQEAgaW50 IG1haW5fcmVtdXMoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogICAgIH0KIAogICAgIGNsb3NlKHNl bmRfZmQpOwotICAgIHJldHVybiAtRVJST1JfRkFJTDsKKyAgICByZXR1cm4gRVhJVF9GQUlMVVJF OwogfQogI2VuZGlmCiAKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0 dHA6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=