From mboxrd@z Thu Jan 1 00:00:00 1970 From: George Dunlap Subject: [PATCH v5 2/3] xl: Make set_memory_target return an error code on failure Date: Thu, 24 Mar 2016 17:17:23 +0000 Message-ID: <1458839844-26238-3-git-send-email-george.dunlap@citrix.com> References: <1458839844-26238-1-git-send-email-george.dunlap@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1458839844-26238-1-git-send-email-george.dunlap@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xen.org Cc: George Dunlap , Ian Jackson , Wei Liu List-Id: xen-devel@lists.xenproject.org RnJvbTogR2VvcmdlIER1bmxhcCA8Z2VvcmdlLmR1bmxhcEBldS5jaXRyaXguY29tPgoKQWxzbyBt b3ZlIHRoZSByYyAtPiBzaGVsbCBjb2RlIHRyYW5zbGF0aW9uIGludG8gc2V0X21lbW9yeV9tYXgo KSB0bwptYWtlIHRoZSB0d28gZnVuY3Rpb25zIGNvbnNpc3RlbnQgd2l0aCBlYWNoIG90aGVyLCBh bmQgd2l0aCBvdGhlcgpzaW1pbGFyIGV4YW1wbGVzIGluIHhsX2NtZGltcGwuYwoKQ2hhbmdlIGEg J2xvbmcgbG9uZycgdG8gImludDY0X3QiIHdoaWxlIHdlJ3JlIGF0IGl0LgoKU2lnbmVkLW9mZi1i eTogR2VvcmdlIER1bmxhcCA8Z2VvcmdlLmR1bmxhcEBldS5jaXRyaXguY29tPgpBY2tlZC1ieTog SWFuIEphY2tzb24gPGlhbi5qYWNrc29uQGV1LmNpdHJpeC5jb20+Ci0tLQp2NDoKIC0gTW92ZSBy YyAtPiBzaGVsbCByZXR1cm4gY29kZSB0cmFuc2xhdGlvbiBpbnRvIHNldF9tZW1vcnlfe21heCx0 YXJnZXR9CiAtIFVzZSBFWElUX3tTVUNDRVNTLEZBSUxVUkV9IHJhdGhlciB0aGFuIG1hZ2ljIGNv bnN0YW50cwogLSBOb3RlIGluY2lkZW50YWwgdHlwZSBjaGFuZ2UgaW4gY2hhbmdlbG9nCgpDQzog SWFuIEphY2tzb24gPGlhbi5qYWNrc29uQGNpdHJpeC5jb20+CkNDOiBXZWkgTGl1IDx3ZWkubGl1 MkBjaXRyaXguY29tPgpDQzogS29ucmFkIFdpbGsgPGtvbnJhZC53aWxrQG9yYWNsZS5jb20+Ci0t LQogdG9vbHMvbGlieGwveGxfY21kaW1wbC5jIHwgMzEgKysrKysrKysrKysrKysrLS0tLS0tLS0t LS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE1IGluc2VydGlvbnMoKyksIDE2IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL3Rvb2xzL2xpYnhsL3hsX2NtZGltcGwuYyBiL3Rvb2xzL2xpYnhsL3hs X2NtZGltcGwuYwppbmRleCBhMzYxMGZjLi42MDA0ZjE0IDEwMDY0NAotLS0gYS90b29scy9saWJ4 bC94bF9jbWRpbXBsLmMKKysrIGIvdG9vbHMvbGlieGwveGxfY21kaW1wbC5jCkBAIC0zMzgwLDcg KzMzODAsNiBAQCBzdGF0aWMgaW50IGRlZl9nZXRvcHQoaW50IGFyZ2MsIGNoYXIgKiBjb25zdCBh cmd2W10sCiBzdGF0aWMgaW50IHNldF9tZW1vcnlfbWF4KHVpbnQzMl90IGRvbWlkLCBjb25zdCBj aGFyICptZW0pCiB7CiAgICAgaW50NjRfdCBtZW1vcnlrYjsKLSAgICBpbnQgcmM7CiAKICAgICBt ZW1vcnlrYiA9IHBhcnNlX21lbV9zaXplX2tiKG1lbSk7CiAgICAgaWYgKG1lbW9yeWtiID09IC0x KSB7CkBAIC0zMzg4LDkgKzMzODcsMTIgQEAgc3RhdGljIGludCBzZXRfbWVtb3J5X21heCh1aW50 MzJfdCBkb21pZCwgY29uc3QgY2hhciAqbWVtKQogICAgICAgICBleGl0KDMpOwogICAgIH0KIAot ICAgIHJjID0gbGlieGxfZG9tYWluX3NldG1heG1lbShjdHgsIGRvbWlkLCBtZW1vcnlrYik7Cisg ICAgaWYgKGxpYnhsX2RvbWFpbl9zZXRtYXhtZW0oY3R4LCBkb21pZCwgbWVtb3J5a2IpKSB7Cisg ICAgICAgIGZwcmludGYoc3RkZXJyLCAiY2Fubm90IHNldCBkb21pZCAlZCBzdGF0aWMgbWF4IG1l bW9yeSB0byA6ICVzXG4iLCBkb21pZCwgbWVtKTsKKyAgICAgICAgcmV0dXJuIEVYSVRfRkFJTFVS RTsKKyAgICB9CiAKLSAgICByZXR1cm4gcmM7CisgICAgcmV0dXJuIEVYSVRfU1VDQ0VTUzsKIH0K IAogaW50IG1haW5fbWVtbWF4KGludCBhcmdjLCBjaGFyICoqYXJndikKQEAgLTMzOTgsNyArMzQw MCw2IEBAIGludCBtYWluX21lbW1heChpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAgICAgdWludDMy X3QgZG9taWQ7CiAgICAgaW50IG9wdCA9IDA7CiAgICAgY2hhciAqbWVtOwotICAgIGludCByYzsK IAogICAgIFNXSVRDSF9GT1JFQUNIX09QVChvcHQsICIiLCBOVUxMLCAibWVtLW1heCIsIDIpIHsK ICAgICAgICAgLyogTm8gb3B0aW9ucyAqLwpAQCAtMzQwNywxOCArMzQwOCwxMiBAQCBpbnQgbWFp bl9tZW1tYXgoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogICAgIGRvbWlkID0gZmluZF9kb21haW4o YXJndltvcHRpbmRdKTsKICAgICBtZW0gPSBhcmd2W29wdGluZCArIDFdOwogCi0gICAgcmMgPSBz ZXRfbWVtb3J5X21heChkb21pZCwgbWVtKTsKLSAgICBpZiAocmMpIHsKLSAgICAgICAgZnByaW50 ZihzdGRlcnIsICJjYW5ub3Qgc2V0IGRvbWlkICVkIHN0YXRpYyBtYXggbWVtb3J5IHRvIDogJXNc biIsIGRvbWlkLCBtZW0pOwotICAgICAgICByZXR1cm4gMTsKLSAgICB9Ci0KLSAgICByZXR1cm4g MDsKKyAgICByZXR1cm4gc2V0X21lbW9yeV9tYXgoZG9taWQsIG1lbSk7CiB9CiAKLXN0YXRpYyB2 b2lkIHNldF9tZW1vcnlfdGFyZ2V0KHVpbnQzMl90IGRvbWlkLCBjb25zdCBjaGFyICptZW0pCitz dGF0aWMgaW50IHNldF9tZW1vcnlfdGFyZ2V0KHVpbnQzMl90IGRvbWlkLCBjb25zdCBjaGFyICpt ZW0pCiB7Ci0gICAgbG9uZyBsb25nIGludCBtZW1vcnlrYjsKKyAgICBpbnQ2NF90IG1lbW9yeWti OwogCiAgICAgbWVtb3J5a2IgPSBwYXJzZV9tZW1fc2l6ZV9rYihtZW0pOwogICAgIGlmIChtZW1v cnlrYiA9PSAtMSkgIHsKQEAgLTM0MjYsNyArMzQyMSwxMiBAQCBzdGF0aWMgdm9pZCBzZXRfbWVt b3J5X3RhcmdldCh1aW50MzJfdCBkb21pZCwgY29uc3QgY2hhciAqbWVtKQogICAgICAgICBleGl0 KDMpOwogICAgIH0KIAotICAgIGxpYnhsX3NldF9tZW1vcnlfdGFyZ2V0KGN0eCwgZG9taWQsIG1l bW9yeWtiLCAwLCAvKiBlbmZvcmNlICovIDEpOworICAgIGlmIChsaWJ4bF9zZXRfbWVtb3J5X3Rh cmdldChjdHgsIGRvbWlkLCBtZW1vcnlrYiwgMCwgLyogZW5mb3JjZSAqLyAxKSkgeworICAgICAg ICBmcHJpbnRmKHN0ZGVyciwgImNhbm5vdCBzZXQgZG9taWQgJWQgZHluYW1pYyBtYXggbWVtb3J5 IHRvIDogJXNcbiIsIGRvbWlkLCBtZW0pOworICAgICAgICByZXR1cm4gRVhJVF9GQUlMVVJFOwor ICAgIH0KKworICAgIHJldHVybiBFWElUX1NVQ0NFU1M7CiB9CiAKIGludCBtYWluX21lbXNldChp bnQgYXJnYywgY2hhciAqKmFyZ3YpCkBAIC0zNDQyLDggKzM0NDIsNyBAQCBpbnQgbWFpbl9tZW1z ZXQoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogICAgIGRvbWlkID0gZmluZF9kb21haW4oYXJndltv cHRpbmRdKTsKICAgICBtZW0gPSBhcmd2W29wdGluZCArIDFdOwogCi0gICAgc2V0X21lbW9yeV90 YXJnZXQoZG9taWQsIG1lbSk7Ci0gICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIHNldF9tZW1vcnlf dGFyZ2V0KGRvbWlkLCBtZW0pOwogfQogCiBzdGF0aWMgaW50IGNkX2luc2VydCh1aW50MzJfdCBk b21pZCwgY29uc3QgY2hhciAqdmlydGRldiwgY2hhciAqcGh5cykKLS0gCjIuMS40CgoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxp bmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwOi8vbGlzdHMueGVuLm9yZy94ZW4t ZGV2ZWwK