From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Luis R. Rodriguez" Subject: [PATCH v5 07/14] tools/xendomains: do space cleanups Date: Tue, 20 May 2014 05:31:28 -0700 Message-ID: <1400589095-3872-8-git-send-email-mcgrof@do-not-panic.com> References: <1400589095-3872-1-git-send-email-mcgrof@do-not-panic.com> 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.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WmjDN-0006Kh-0G for xen-devel@lists.xenproject.org; Tue, 20 May 2014 12:32:17 +0000 Received: by mail-pa0-f53.google.com with SMTP id kp14so279629pab.40 for ; Tue, 20 May 2014 05:32:13 -0700 (PDT) In-Reply-To: <1400589095-3872-1-git-send-email-mcgrof@do-not-panic.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xenproject.org Cc: Ian Campbell , Stefano Stabellini , "Luis R. Rodriguez" , =?UTF-8?q?Jan=20R=C4=99korajski?= , Ian Jackson , Jacek Konieczny , M A Young List-Id: xen-devel@lists.xenproject.org RnJvbTogIkx1aXMgUi4gUm9kcmlndWV6IiA8bWNncm9mQHN1c2UuY29tPgoKVGhpcyBoYXMgbm8g ZnVuY3Rpb25hbCBjaGFuZ2VzLiBUaGlzIGlzIGp1c3QgdG8gcHJlcGFyZSB0aGUgZmlsZQp0byBi ZSBtb3ZlZCwgc28geW91IHdvbid0IGJsaW5kIHlvdXIgZXllcyBvciBnZXQgZ2l0IGFtIHRvIGNv bXBsYWluLgoKQ2M6IElhbiBKYWNrc29uIDxpYW4uamFja3NvbkBldS5jaXRyaXguY29tPgpDYzog U3RlZmFubyBTdGFiZWxsaW5pIDxzdGVmYW5vLnN0YWJlbGxpbmlAZXUuY2l0cml4LmNvbT4KQ2M6 IElhbiBDYW1wYmVsbCA8aWFuLmNhbXBiZWxsQGNpdHJpeC5jb20+CkNjOiBKYW4gUsSZa29yYWpz a2kgPGJhZ2dpbnNAcGxkLWxpbnV4Lm9yZz4KQ2M6IE0gQSBZb3VuZyA8bS5hLnlvdW5nQGR1cmhh bS5hYy51az4KQ2M6IEphY2VrIEtvbmllY3pueSA8amFqY3VzQGphamN1cy5uZXQ+CkNjOiB4ZW4t ZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKQWNrZWQtYnk6IElhbiBDYW1wYmVsbCA8aWFuLmNh bXBiZWxsQGNpdHJpeC5jb20+ClNpZ25lZC1vZmYtYnk6IEx1aXMgUi4gUm9kcmlndWV6IDxtY2dy b2ZAc3VzZS5jb20+Ci0tLQogdG9vbHMvaG90cGx1Zy9MaW51eC9pbml0LmQveGVuZG9tYWlucyB8 IDYyICsrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwg MzEgaW5zZXJ0aW9ucygrKSwgMzEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvdG9vbHMvaG90 cGx1Zy9MaW51eC9pbml0LmQveGVuZG9tYWlucyBiL3Rvb2xzL2hvdHBsdWcvTGludXgvaW5pdC5k L3hlbmRvbWFpbnMKaW5kZXggNmNiMTAzMi4uNTg3NTY4ZCAxMDA2NDQKLS0tIGEvdG9vbHMvaG90 cGx1Zy9MaW51eC9pbml0LmQveGVuZG9tYWlucworKysgYi90b29scy9ob3RwbHVnL0xpbnV4L2lu aXQuZC94ZW5kb21haW5zCkBAIC0yMyw3ICsyMyw3IEBACiAjIERlZmF1bHQtU3RhcnQ6ICAgICAy IDMgNQogIyBEZWZhdWx0LVN0b3A6ICAgICAgMCAxIDYKICMgU2hvcnQtRGVzY3JpcHRpb246IFN0 YXJ0L3N0b3Agc2Vjb25kYXJ5IHhlbiBkb21haW5zCi0jIERlc2NyaXB0aW9uOiAgICAgICBTdGFy dCAvIHN0b3AgZG9tYWlucyBhdXRvbWF0aWNhbGx5IHdoZW4gZG9tYWluIDAgCisjIERlc2NyaXB0 aW9uOiAgICAgICBTdGFydCAvIHN0b3AgZG9tYWlucyBhdXRvbWF0aWNhbGx5IHdoZW4gZG9tYWlu IDAKICMgICAgICAgICAgICAgICAgICAgIGJvb3RzIC8gc2h1dHMgZG93bi4KICMjIyBFTkQgSU5J VCBJTkZPCiAKQEAgLTQ0LDcgKzQ0LDcgQEAgdGhlbgogCWV4aXQgMDsKIGZpCiAKLSMgQ29ycmVj dCBleGl0IGNvZGUgd291bGQgcHJvYmFibHkgYmUgNSwgYnV0IGl0J3MgZW5vdWdoIAorIyBDb3Jy ZWN0IGV4aXQgY29kZSB3b3VsZCBwcm9iYWJseSBiZSA1LCBidXQgaXQncyBlbm91Z2gKICMgaWYg eGVuZCBjb21wbGFpbnMgaWYgd2UncmUgbm90IHJ1bm5pbmcgYXMgcHJpdmlsZWdlZCBkb21haW4K IGlmICEgWyAtZSAvcHJvYy94ZW4vcHJpdmNtZCBdOyB0aGVuCiAJZXhpdCAwCkBAIC03NCw3ICs3 NCw3IEBAIHRlc3QgLXIgJFhFTkRPTV9DT05GSUcgfHwgeyBlY2hvICIkWEVORE9NX0NPTkZJRyBu b3QgZXhpc3RpbmciOwogaWYgdGVzdCAtZSAvZXRjL3JjLnN0YXR1czsgdGhlbgogICAgICMgU1VT RSByYyBzY3JpcHQgbGlicmFyeQogICAgIC4gL2V0Yy9yYy5zdGF0dXMKLWVsc2UgICAgCitlbHNl CiAgICAgX2NtZD0kMQogICAgIGRlY2xhcmUgLWEgX1NNU0cKICAgICBpZiB0ZXN0ICIke19jbWR9 IiA9ICJzdGF0dXMiOyB0aGVuCkBAIC05Nyw3ICs5Nyw3IEBAIGVsc2UKIAkgICAgZmkKIAl9CiAg ICAgZWxpZiB0ZXN0IC1lIC9saWIvbHNiL2luaXQtZnVuY3Rpb25zOyB0aGVuCi0JIyBMU0IgICAg CisJIyBMU0IKICAgICAJLiAvbGliL2xzYi9pbml0LWZ1bmN0aW9ucwogICAgICAgICBpZiBhbGlh cyBsb2dfc3VjY2Vzc19tc2cgPi9kZXYvbnVsbCAyPi9kZXYvbnVsbDsgdGhlbgogCSAgZWNob19y YygpCkBAIC0xMTQsNyArMTE0LDcgQEAgZWxzZQogCSAgICBmaQogCSAgfQogICAgICAgICBmaQot ICAgIGVsc2UgICAgCisgICAgZWxzZQogCSMgZW11bGF0ZSBpdAogCWVjaG9fcmMoKQogCXsKQEAg LTEyNCwxNyArMTI0LDE3IEBAIGVsc2UKICAgICByY19yZXNldCgpIHsgX1JDX1JWPTA7IH0KICAg ICByY19mYWlsZWQoKQogICAgIHsKLQlpZiB0ZXN0IC16ICIkMSI7IHRoZW4gCisJaWYgdGVzdCAt eiAiJDEiOyB0aGVuCiAJICAgIF9SQ19SVj0xOwotCWVsaWYgdGVzdCAiJDEiICE9ICIwIjsgdGhl biAKLQkgICAgX1JDX1JWPSQxOyAKLSAgICAJZmkKKwllbGlmIHRlc3QgIiQxIiAhPSAiMCI7IHRo ZW4KKwkgICAgX1JDX1JWPSQxOworCWZpCiAJcmV0dXJuICR7X1JDX1JWfQogICAgIH0KICAgICBy Y19jaGVjaygpCiAgICAgewogCXJldHVybiByY19mYWlsZWQgJD8KLSAgICB9CQorICAgIH0KICAg ICByY19zdGF0dXMoKQogICAgIHsKIAlyY19mYWlsZWQgJD8KQEAgLTE0Niw3ICsxNDYsNyBAQCBl bHNlCiAJcmV0dXJuICR7X1JDX1JWfQogICAgIH0KICAgICByY19leGl0KCkgeyBleGl0ICR7X1JD X1JWfTsgfQotICAgIHJjX2FjdGl2ZSgpIAorICAgIHJjX2FjdGl2ZSgpCiAgICAgewogCWlmIHRl c3QgLXogIiRSVU5MRVZFTCI7IHRoZW4gcmVhZCBSVU5MRVZFTCBSRVNUIDwgPCgvc2Jpbi9ydW5s ZXZlbCk7IGZpCiAJaWYgdGVzdCAtZSAvZXRjL2luaXQuZC9TWzAtOV1bMC05XSR7MX07IHRoZW4g cmV0dXJuIDA7IGZpCkBAIC0xOTMsMTMgKzE5MywxMyBAQCByZG5hbWVzKCkKIHsKICAgICBOQU1F Uz0KICAgICBpZiAhIGNvbnRhaW5zX3NvbWV0aGluZyAiJFhFTkRPTUFJTlNfQVVUTyIKLSAgICB0 aGVuIAorICAgIHRoZW4KIAlyZXR1cm4KICAgICBmaQogICAgIGZvciBkb20gaW4gJFhFTkRPTUFJ TlNfQVVUTy8qOyBkbwogCXJkbmFtZSAkZG9tCi0JaWYgdGVzdCAteiAkTkFNRVM7IHRoZW4gCi0J ICAgIE5BTUVTPSROTTsgCisJaWYgdGVzdCAteiAkTkFNRVM7IHRoZW4KKwkgICAgTkFNRVM9JE5N OwogCWVsc2UKIAkgICAgTkFNRVM9IiROQU1FU3wkTk0iCiAJZmkKQEAgLTIzMiw3ICsyMzIsNyBA QCBpc19ydW5uaW5nKCkKICAgICB3aGlsZSByZWFkIExOOyBkbwogCXBhcnNlbG4gIiRMTiIgfHwg Y29udGludWUKIAlpZiB0ZXN0ICRpZCA9IDA7IHRoZW4gY29udGludWU7IGZpCi0JY2FzZSAkbmFt ZSBpbiAKKwljYXNlICRuYW1lIGluCiAJICAgICgkTk0pCiAJCVJDPTAKIAkJOzsKQEAgLTI0MSwx MSArMjQxLDExIEBAIGlzX3J1bm5pbmcoKQogICAgIHJldHVybiAkUkMKIH0KIAotc3RhcnQoKSAK K3N0YXJ0KCkKIHsKLSAgICBpZiBbIC1mICRMT0NLRklMRSBdOyB0aGVuIAorICAgIGlmIFsgLWYg JExPQ0tGSUxFIF07IHRoZW4KIAllY2hvIC1lICJ4ZW5kb21haW5zIGFscmVhZHkgcnVubmluZyAo bG9ja2ZpbGUgZXhpc3RzKSIKLQlyZXR1cm47IAorCXJldHVybjsKICAgICBmaQogCiAgICAgc2F2 ZWRfZG9tYWlucz0iICIKQEAgLTI4NSwxMCArMjg1LDEwIEBAIHN0YXJ0KCkKIAkjIFhFTkRPTUFJ TlNfQVVUTyAtIHRoZXkgY291bGQganVzdCBiZSBzeW1saW5rcyB0byBmaWxlcyBlbHNld2hlcmUK IAogCSMgQ3JlYXRlIGFsbCBkb21haW5zIHdpdGggY29uZmlnIGZpbGVzIGluIFhFTkRPTUFJTlNf QVVUTy4KLQkjIFRPRE86IFdlIHNob3VsZCByZWNvcmQgd2hpY2ggZG9tYWluIG5hbWUgYmVsb25n cyAKKwkjIFRPRE86IFdlIHNob3VsZCByZWNvcmQgd2hpY2ggZG9tYWluIG5hbWUgYmVsb25ncwog CSMgc28gd2UgaGF2ZSB0aGUgb3B0aW9uIHRvIHNlbGVjdGl2ZWx5IHNodXQgZG93biAvIG1pZ3Jh dGUgbGF0ZXIKIAkjIElmIGEgZG9tYWluIHN0YXRlZmlsZSBmcm9tICRYRU5ET01BSU5TX1NBVkUg bWF0Y2hlcyBhIGRvbWFpbiBuYW1lCi0JIyBpbiAkWEVORE9NQUlOU19BVVRPLCBkbyBub3QgdHJ5 IHRvIHN0YXJ0IHRoYXQgZG9tYWluOyBpZiBpdCBkaWRuJ3QgCisJIyBpbiAkWEVORE9NQUlOU19B VVRPLCBkbyBub3QgdHJ5IHRvIHN0YXJ0IHRoYXQgZG9tYWluOyBpZiBpdCBkaWRuJ3QKIAkjIHJl c3RvcmUgY29ycmVjdGx5IGl0IHJlcXVpcmVzIGFkbWluaXN0cmF0aXZlIGF0dGVudGlvbi4KIAlm b3IgZG9tIGluICRYRU5ET01BSU5TX0FVVE8vKjsgZG8KIAkgICAgZWNobyAtbiAiICR7ZG9tIyMq L30iCkBAIC0zNDksMTQgKzM0OSwxNCBAQCB3YXRjaGRvZ194ZW5jbWQoKQogICAgIHJlYWQgUFNG IFBTVUlEIFBTUElEIFBTUFBJRCA8IDwoZWNobyAiJFBTQVgiKQogICAgICMga2lsbCAkQ01EICQx CiAgICAga2lsbCAkUFNQSUQgPi9kZXYvbnVsbCAyPiYxCi0gICAgCisKICAgICBlY2hvIC1lIC4K IH0KIAogc3RvcCgpCiB7CiAgICAgZXhlYyAzPiYyIDI+IC9kZXYvbnVsbAotICAgIAorCiAgICAg IyBDb2xsZWN0IGxpc3Qgb2YgZG9tYWlucyB0byBzaHV0IGRvd24KICAgICBpZiB0ZXN0ICIkWEVO RE9NQUlOU19BVVRPX09OTFkiID0gInRydWUiOyB0aGVuCiAJcmRuYW1lcwpAQCAtMzgwLDcgKzM4 MCw3IEBAIHN0b3AoKQogCSAgICBlc2FjCiAJICAgICIKIAlmaQotCSMgWEVORE9NQUlOU19TWVNS USBjaG91bGQgYmUgc29tZXRoaW5nIGxpa2UganVzdCAicyIgCisJIyBYRU5ET01BSU5TX1NZU1JR IGNob3VsZCBiZSBzb21ldGhpbmcgbGlrZSBqdXN0ICJzIgogCSMgb3IgInMgZSBpIHUiIG9yIGV2 ZW4gInMgZSBzIGkgdSBvIgogCSMgZm9yIHRoZSBsYXR0ZXIsIHlvdSBzaG91bGQgc2V0IFhFTkRP TUFJTlNfVVNMRUVQIHRvIDEyMDAwMDAgb3Igc28KIAlpZiB0ZXN0IC1uICIkWEVORE9NQUlOU19T WVNSUSI7IHRoZW4KQEAgLTQxMyw3ICs0MTMsNyBAQCBzdG9wKCkKIAkJa2lsbCAkV0RPR19QSUQg Pi9kZXYvbnVsbCAyPiYxCiAJICAgIGVsc2UKIAkJa2lsbCAkV0RPR19QSUQgPi9kZXYvbnVsbCAy PiYxCi0JCQorCiAJCWVjaG8gLWUgLgogCQl1c2xlZXAgMTAwMAogCQljb250aW51ZQpAQCAtNDcy LDcgKzQ3Miw3IEBAIHN0b3AoKQogCiAgICAgIyBVbmNvbmRpdGlvbmFsbHkgZGVsZXRlIGxvY2sg ZmlsZQogICAgIHJtIC1mICRMT0NLRklMRQotICAgIAorCiAgICAgZXhlYyAyPiYzCiB9CiAKQEAg LTQ4Miw3ICs0ODIsNyBAQCBjaGVja19kb21haW5fdXAoKQogICAgIHdoaWxlIHJlYWQgTE47IGRv CiAJcGFyc2VsbiAiJExOIiB8fCBjb250aW51ZQogCWlmIHRlc3QgJGlkID0gMDsgdGhlbiBjb250 aW51ZTsgZmkKLQljYXNlICRuYW1lIGluIAorCWNhc2UgJG5hbWUgaW4KIAkgICAgKCQxKQogCQly ZXR1cm4gMAogCQk7OwpAQCAtNTAxLDkgKzUwMSw5IEBAIGNoZWNrX2FsbF9hdXRvX2RvbWFpbnNf dXAoKQogICAgIGZvciBubSBpbiAkWEVORE9NQUlOU19BVVRPLyo7IGRvCiAJcmRuYW1lICRubQog CWZvdW5kPTAKLQlpZiBjaGVja19kb21haW5fdXAgIiROTSI7IHRoZW4gCisJaWYgY2hlY2tfZG9t YWluX3VwICIkTk0iOyB0aGVuCiAJICAgIGVjaG8gLW4gIiAkbmFtZSIKLQllbHNlIAorCWVsc2UK IAkgICAgbWlzc2luZz0iJG1pc3NpbmcgJE5NIgogCWZpCiAgICAgZG9uZQpAQCAtNTE2LDcgKzUx Niw3IEBAIGNoZWNrX2FsbF9hdXRvX2RvbWFpbnNfdXAoKQogCiBjaGVja19hbGxfc2F2ZWRfZG9t YWluc191cCgpCiB7Ci0gICAgaWYgISBjb250YWluc19zb21ldGhpbmcgIiRYRU5ET01BSU5TX1NB VkUiIAorICAgIGlmICEgY29udGFpbnNfc29tZXRoaW5nICIkWEVORE9NQUlOU19TQVZFIgogICAg IHRoZW4KICAgICAgIHJldHVybiAwCiAgICAgZmkKQEAgLTU2Myw4ICs1NjMsOCBAQCBjYXNlICIk MSIgaW4KIAk7OwogCiAgICAgc3RhdHVzKQotCWVjaG8gLW4gIkNoZWNraW5nIGZvciB4ZW5kb21h aW5zOiIgCi0JaWYgdGVzdCAhIC1mICRMT0NLRklMRTsgdGhlbiAKKwllY2hvIC1uICJDaGVja2lu ZyBmb3IgeGVuZG9tYWluczoiCisJaWYgdGVzdCAhIC1mICRMT0NLRklMRTsgdGhlbgogCSAgICBy Y19mYWlsZWQgMwogCWVsc2UKIAkgICAgY2hlY2tfYWxsX2F1dG9fZG9tYWluc191cAotLSAKMi4w LjAucmMzLjE4LmcwMGE1Yjc5CgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9y ZwpodHRwOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK