From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dario Faggioli Subject: [PATCH v3 6/6] xl: improve exit codes of domain creation related functions Date: Fri, 08 Apr 2016 04:24:17 +0200 Message-ID: <20160408022416.9058.81418.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.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1aoM5t-0005IG-Sn for xen-devel@lists.xenproject.org; Fri, 08 Apr 2016 02:24:21 +0000 Received: by mail-wm0-f68.google.com with SMTP id y144so964121wmd.0 for ; Thu, 07 Apr 2016 19:24:19 -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 YnkgbWFraW5nIHRoZW0gbW9yZSBjb25zaXN0ZW50IHdpdGggb3RoZXIgZXhhbXBsZXMgaW4geGwu CgpTaWduZWQtb2ZmLWJ5OiBEYXJpbyBGYWdnaW9saSA8ZGFyaW8uZmFnZ2lvbGlAY2l0cml4LmNv bT4KU2lnbmVkLW9mZi1ieTogSGFybWFuZGVlcCBLYXVyIDx3cml0ZS5oYXJtYW5kZWVwQGdtYWls LmNvbT4KLS0tCkNjOiBJYW4gSmFja3NvbiA8aWFuLmphY2tzb25AZXUuY2l0cml4LmNvbT4KQ2M6 IFdlaSBMaXUgPHdlaS5saXUyQGNpdHJpeC5jb20+Ci0tLQp2MzogSW4gY3JlYXRlX2RvbWFpbigp LCBvbmx5IGRlYWwgd2l0aCBleGl0IGNvZGVzLCBpbnRlcm5hbCByZXR1cm5zCiAgICBuZWVkIG1v cmUgd29yayB0aGFuIHdoYXQgd2FzIGJlaW5nIGRvbmUgaW4gdGhlIG9yaWdpbmFsIHBhdGNoLgog ICAgU2hvcnRlbiBjaGFuZ2Vsb2cuCgp2MjogQWRkIGNyZWF0ZV9kb21haW4oKQogICAgUmVtb3Zl IG1haW5fc2hhcmluZygpCi0tLQogdG9vbHMvbGlieGwveGxfY21kaW1wbC5jIHwgICAzMiArKysr KysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE2IGluc2VydGlv bnMoKyksIDE2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Rvb2xzL2xpYnhsL3hsX2NtZGlt cGwuYyBiL3Rvb2xzL2xpYnhsL3hsX2NtZGltcGwuYwppbmRleCBkMmFkOGM4Li4zMWUyZjMwIDEw MDY0NAotLS0gYS90b29scy9saWJ4bC94bF9jbWRpbXBsLmMKKysrIGIvdG9vbHMvbGlieGwveGxf Y21kaW1wbC5jCkBAIC0yOTY0LDcgKzI5NjQsNyBAQCBzdGF0aWMgaW50IGNyZWF0ZV9kb21haW4o c3RydWN0IGRvbWFpbl9jcmVhdGUgKmRvbV9pbmZvKQogICAgICAgICAgICAgaWYgKCFqc29uKSB7 CiAgICAgICAgICAgICAgICAgZnByaW50ZihzdGRlcnIsCiAgICAgICAgICAgICAgICAgICAgICAg ICAiRmFpbGVkIHRvIGNvbnZlcnQgZG9tYWluIGNvbmZpZ3VyYXRpb24gdG8gSlNPTlxuIik7Ci0g ICAgICAgICAgICAgICAgZXhpdCgxKTsKKyAgICAgICAgICAgICAgICBleGl0KEVYSVRfRkFJTFVS RSk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBmcHV0cyhqc29uLCBjZmdfcHJpbnRfZmgp OwogICAgICAgICAgICAgZnJlZShqc29uKTsKQEAgLTMyMTIsNyArMzIxMiw3IEBAIG91dDoKICAg ICAgKiBhbHJlYWR5IGhhcHBlbmVkIGluIHRoZSBwYXJlbnQuCiAgICAgICovCiAgICAgaWYgKCBk YWVtb25pemUgJiYgIW5lZWRfZGFlbW9uICkKLSAgICAgICAgZXhpdChyZXQpOworICAgICAgICBl eGl0KEVYSVRfU1VDQ0VTUyk7CiAKICAgICByZXR1cm4gcmV0OwogfQpAQCAtNTM0NSw3ICs1MzQ1 LDcgQEAgc3RhdGljIHZvaWQgc3RyaW5nX3JlYWxsb2NfYXBwZW5kKGNoYXIgKiphY2N1bXVsYXRl LCBjb25zdCBjaGFyICptb3JlKQogICAgIHNpemVfdCBtb3JlbGVuID0gc3RybGVuKG1vcmUpICsg MS8qbnVsKi87CiAgICAgaWYgKG9sZGxlbiA+IFNTSVpFX01BWCB8fCBtb3JlbGVuID4gU1NJWkVf TUFYIC0gb2xkbGVuKSB7CiAgICAgICAgIGZwcmludGYoc3RkZXJyLCJBZGRpdGlvbmFsIGNvbmZp ZyBkYXRhIGZhciB0b28gbGFyZ2VcbiIpOwotICAgICAgICBleGl0KC1FUlJPUl9GQUlMKTsKKyAg ICAgICAgZXhpdChFWElUX0ZBSUxVUkUpOwogICAgIH0KIAogICAgICphY2N1bXVsYXRlID0geHJl YWxsb2MoKmFjY3VtdWxhdGUsIG9sZGxlbiArIG1vcmVsZW4pOwpAQCAtNTQyMCw3ICs1NDIwLDcg QEAgaW50IG1haW5fY3JlYXRlKGludCBhcmdjLCBjaGFyICoqYXJndikKICAgICAgICAgfSBlbHNl IHsKICAgICAgICAgICAgIGhlbHAoImNyZWF0ZSIpOwogICAgICAgICAgICAgZnJlZShkb21faW5m by5leHRyYV9jb25maWcpOwotICAgICAgICAgICAgcmV0dXJuIDI7CisgICAgICAgICAgICByZXR1 cm4gRVhJVF9GQUlMVVJFOwogICAgICAgICB9CiAgICAgfQogCkBAIC01NDQwLDExICs1NDQwLDEx IEBAIGludCBtYWluX2NyZWF0ZShpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAgICAgcmMgPSBjcmVh dGVfZG9tYWluKCZkb21faW5mbyk7CiAgICAgaWYgKHJjIDwgMCkgewogICAgICAgICBmcmVlKGRv bV9pbmZvLmV4dHJhX2NvbmZpZyk7Ci0gICAgICAgIHJldHVybiAtcmM7CisgICAgICAgIHJldHVy biBFWElUX0ZBSUxVUkU7CiAgICAgfQogCiAgICAgZnJlZShkb21faW5mby5leHRyYV9jb25maWcp OwotICAgIHJldHVybiAwOworICAgIHJldHVybiBFWElUX1NVQ0NFU1M7CiB9CiAKIGludCBtYWlu X2NvbmZpZ191cGRhdGUoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQpAQCAtNTQ2NSw3ICs1NDY1LDcg QEAgaW50IG1haW5fY29uZmlnX3VwZGF0ZShpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAgICAgaWYg KGFyZ2MgPCAyKSB7CiAgICAgICAgIGZwcmludGYoc3RkZXJyLCAieGwgY29uZmlnLXVwZGF0ZSBy ZXF1aXJlcyBhIGRvbWFpbiBhcmd1bWVudFxuIik7CiAgICAgICAgIGhlbHAoImNvbmZpZy11cGRh dGUiKTsKLSAgICAgICAgZXhpdCgxKTsKKyAgICAgICAgZXhpdChFWElUX0ZBSUxVUkUpOwogICAg IH0KIAogICAgIGZwcmludGYoc3RkZXJyLCAiV0FSTklORzogeGwgbm93IGhhcyBiZXR0ZXIgY2Fw YWJpbGl0eSB0byBtYW5hZ2UgZG9tYWluIGNvbmZpZ3VyYXRpb24sICIKQEAgLTU0OTcsNyArNTQ5 Nyw3IEBAIGludCBtYWluX2NvbmZpZ191cGRhdGUoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogICAg ICAgICB9IGVsc2UgewogICAgICAgICAgICAgaGVscCgiY3JlYXRlIik7CiAgICAgICAgICAgICBm cmVlKGV4dHJhX2NvbmZpZyk7Ci0gICAgICAgICAgICByZXR1cm4gMjsKKyAgICAgICAgICAgIHJl dHVybiBFWElUX0ZBSUxVUkU7CiAgICAgICAgIH0KICAgICB9CiAgICAgaWYgKGZpbGVuYW1lKSB7 CkBAIC01NTA2LDI1ICs1NTA2LDI1IEBAIGludCBtYWluX2NvbmZpZ191cGRhdGUoaW50IGFyZ2Ms IGNoYXIgKiphcmd2KQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmY29u ZmlnX2RhdGEsICZjb25maWdfbGVuKTsKICAgICAgICAgaWYgKHJjKSB7IGZwcmludGYoc3RkZXJy LCAiRmFpbGVkIHRvIHJlYWQgY29uZmlnIGZpbGU6ICVzOiAlc1xuIiwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGZpbGVuYW1lLCBzdHJlcnJvcihlcnJubykpOwotICAgICAgICAgICAgICAg ICAgZnJlZShleHRyYV9jb25maWcpOyByZXR1cm4gRVJST1JfRkFJTDsgfQorICAgICAgICAgICAg ICAgICAgZnJlZShleHRyYV9jb25maWcpOyByZXR1cm4gRVhJVF9GQUlMVVJFOyB9CiAgICAgICAg IGlmIChleHRyYV9jb25maWcgJiYgc3RybGVuKGV4dHJhX2NvbmZpZykpIHsKICAgICAgICAgICAg IGlmIChjb25maWdfbGVuID4gSU5UX01BWCAtIChzdHJsZW4oZXh0cmFfY29uZmlnKSArIDIgKyAx KSkgewogICAgICAgICAgICAgICAgIGZwcmludGYoc3RkZXJyLCAiRmFpbGVkIHRvIGF0dGFjaCBl eHRyYSBjb25maWd1cmF0aW9uXG4iKTsKLSAgICAgICAgICAgICAgICBleGl0KDEpOworICAgICAg ICAgICAgICAgIGV4aXQoRVhJVF9GQUlMVVJFKTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAg IC8qIGFsbG9jYXRlIHNwYWNlIGZvciB0aGUgZXh0cmEgY29uZmlnIHBsdXMgdHdvIEVPTHMgcGx1 cyBcMCAqLwogICAgICAgICAgICAgY29uZmlnX2RhdGEgPSByZWFsbG9jKGNvbmZpZ19kYXRhLCBj b25maWdfbGVuCiAgICAgICAgICAgICAgICAgKyBzdHJsZW4oZXh0cmFfY29uZmlnKSArIDIgKyAx KTsKICAgICAgICAgICAgIGlmICghY29uZmlnX2RhdGEpIHsKICAgICAgICAgICAgICAgICBmcHJp bnRmKHN0ZGVyciwgIkZhaWxlZCB0byByZWFsbG9jIGNvbmZpZ19kYXRhXG4iKTsKLSAgICAgICAg ICAgICAgICBleGl0KDEpOworICAgICAgICAgICAgICAgIGV4aXQoRVhJVF9GQUlMVVJFKTsKICAg ICAgICAgICAgIH0KICAgICAgICAgICAgIGNvbmZpZ19sZW4gKz0gc3ByaW50Zihjb25maWdfZGF0 YSArIGNvbmZpZ19sZW4sICJcbiVzXG4iLAogICAgICAgICAgICAgICAgIGV4dHJhX2NvbmZpZyk7 CiAgICAgICAgIH0KICAgICB9IGVsc2UgewogICAgICAgICBmcHJpbnRmKHN0ZGVyciwgIkNvbmZp ZyBmaWxlIG5vdCBzcGVjaWZpZWRcbiIpOwotICAgICAgICBleGl0KDEpOworICAgICAgICBleGl0 KEVYSVRfRkFJTFVSRSk7CiAgICAgfQogCiAgICAgbGlieGxfZG9tYWluX2NvbmZpZ19pbml0KCZk X2NvbmZpZyk7CkBAIC01NTQwLDcgKzU1NDAsNyBAQCBpbnQgbWFpbl9jb25maWdfdXBkYXRlKGlu dCBhcmdjLCBjaGFyICoqYXJndikKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Y29uZmlnX2RhdGEsIGNvbmZpZ19sZW4pOwogICAgICAgICBpZiAocmMpIHsKICAgICAgICAgICAg IGZwcmludGYoc3RkZXJyLCAiZmFpbGVkIHRvIHVwZGF0ZSBjb25maWd1cmF0aW9uXG4iKTsKLSAg ICAgICAgICAgIGV4aXQoMSk7CisgICAgICAgICAgICBleGl0KEVYSVRfRkFJTFVSRSk7CiAgICAg ICAgIH0KICAgICB9CiAKQEAgLTU1NDgsNyArNTU0OCw3IEBAIGludCBtYWluX2NvbmZpZ191cGRh dGUoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogCiAgICAgZnJlZShjb25maWdfZGF0YSk7CiAgICAg ZnJlZShleHRyYV9jb25maWcpOwotICAgIHJldHVybiAwOworICAgIHJldHVybiBFWElUX1NVQ0NF U1M7CiB9CiAKIHN0YXRpYyB2b2lkIGJ1dHRvbl9wcmVzcyh1aW50MzJfdCBkb21pZCwgY29uc3Qg Y2hhciAqYikKQEAgLTcwMzQsMTAgKzcwMzQsMTAgQEAgaW50IG1haW5fcmVuYW1lKGludCBhcmdj LCBjaGFyICoqYXJndikKICAgICBkb21pZCA9IGZpbmRfZG9tYWluKGRvbSk7CiAgICAgaWYgKGxp YnhsX2RvbWFpbl9yZW5hbWUoY3R4LCBkb21pZCwgY29tbW9uX2RvbW5hbWUsIG5ld19uYW1lKSkg ewogICAgICAgICBmcHJpbnRmKHN0ZGVyciwgIkNhbid0IHJlbmFtZSBkb21haW4gJyVzJy5cbiIs IGRvbSk7Ci0gICAgICAgIHJldHVybiAxOworICAgICAgICByZXR1cm4gRVhJVF9GQUlMVVJFOwog ICAgIH0KIAotICAgIHJldHVybiAwOworICAgIHJldHVybiBFWElUX1NVQ0NFU1M7CiB9CiAKIGlu dCBtYWluX3RyaWdnZXIoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQoKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVu LWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cDovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg==