From mboxrd@z Thu Jan 1 00:00:00 1970 From: Roger Pau Monne Subject: [PATCH v2 for-4.6 1/2] libxl: fix devd removal path Date: Wed, 23 Sep 2015 12:06:55 +0200 Message-ID: <1443002816-95720-2-git-send-email-roger.pau@citrix.com> References: <1443002816-95720-1-git-send-email-roger.pau@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zegx6-0004Rb-3x for xen-devel@lists.xenproject.org; Wed, 23 Sep 2015 10:07:04 +0000 In-Reply-To: <1443002816-95720-1-git-send-email-roger.pau@citrix.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: Alex Velazquez , Wei Liu , Ian Jackson , Ian Campbell , Roger Pau Monne List-Id: xen-devel@lists.xenproject.org VGhlIGN1cnJlbnQgZmxvdyBvZiB0aGUgZGV2ZCBoZWxwZXIgKGluIGNoYXJnZSBvZiBsYXVuY2hp bmcgaG90cGx1ZyBzY3JpcHRzCmluc2lkZSBvZiBkcml2ZXIgZG9tYWlucykgaXMgdG8gd2FpdCBm b3IgdGhlIGRldmljZSBiYWNrZW5kIHRvIHN3aXRjaCB0bwpzdGF0ZSA2ICAoWGVuYnVzU3RhdGVD bG9zZWQpIGFuZCB0aGVuIHJlbW92ZSBpdC4gVGhpcyBpcyBub3QgY29ycmVjdCwgc2luY2UKYSBk b21haW4gY2FuIHJlY29ubmVjdCBpdCdzIFBWIGRldmljZXMgYXMgbWFueSB0aW1lcyBhcyBpdCB3 YW50cy4KCkluIG9yZGVyIHRvIGZpeCB0aGlzLCBpbnRyb2R1Y2UgdGhlIGZvbGxvd2luZyBsb2dp YzogdGhlIGNvbnRyb2wgZG9tYWluIHdpbGwKc2V0IHRoZSAib25saW5lIiBiYWNrZW5kIG5vZGUg dG8gMCB3aGVuIGl0IHdhbnRzIHRoZSBkcml2ZXIgZG9tYWluIHRvCmRpc2Nvbm5lY3QgdGhlIGRl dmljZSwgc28gbm93IHRoZSBjb25kaXRpb24gYXBwbGllZCBpbiBkZXZkIGlzIHRoYXQgInN0YXRl IgptdXN0IGJlIDYgYW5kICJvbmxpbmUiIDAgaW4gb3JkZXIgdG8gcHJvY2VlZCB3aXRoIHRoZSBk aXNjb25uZWN0aW9uLgoKU2lnbmVkLW9mZi1ieTogUm9nZXIgUGF1IE1vbm7DqSA8cm9nZXIucGF1 QGNpdHJpeC5jb20+ClJlcG9ydGVkLWJ5OiBBbGV4IFZlbGF6cXVleiA8YWxleC5qLnZlbGF6cXVl ekBnbWFpbC5jb20+CkNjOiBBbGV4IFZlbGF6cXVleiA8YWxleC5qLnZlbGF6cXVlekBnbWFpbC5j b20+CkNjOiBJYW4gSmFja3NvbiA8aWFuLmphY2tzb25AZXUuY2l0cml4LmNvbT4KQ2M6IElhbiBD YW1wYmVsbCA8aWFuLmNhbXBiZWxsQGNpdHJpeC5jb20+CkNjOiBXZWkgTGl1IDx3ZWkubGl1MkBj aXRyaXguY29tPgotLS0KQ2hhbmdlcyBzaW5jZSB2MToKIC0gVXNlIHN0cnJjaHIgYW5kIHN0cmNt cCBpbiBvcmRlciB0byBjaGVjayB0aGUgZXZlbnQgcGF0aC4KIC0gUmVtb3ZlIHN1cGVyZmx1b3Vz IExPRyBpbiBjYXNlIG9mIGZhaWxlZCB4ZW5zdG9yZSB3cml0ZS4KIC0gUmVtb3ZlIHVuZWVkZWQg c3RybGVuIGNoZWNrcy4KLS0tCiB0b29scy9saWJ4bC9saWJ4bC5jICAgICAgICB8IDMyICsrKysr KysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tCiB0b29scy9saWJ4bC9saWJ4bF9kZXZpY2UuYyB8 ICA5ICsrKystLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAyMiBpbnNlcnRpb25zKCspLCAxOSBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS90b29scy9saWJ4bC9saWJ4bC5jIGIvdG9vbHMvbGlieGwv bGlieGwuYwppbmRleCAxMGQxOTA5Li42YzRlZjZkIDEwMDY0NAotLS0gYS90b29scy9saWJ4bC9s aWJ4bC5jCisrKyBiL3Rvb2xzL2xpYnhsL2xpYnhsLmMKQEAgLTQ0MTAsMzIgKzQ0MTAsMzYgQEAg c3RhdGljIHZvaWQgYmFja2VuZF93YXRjaF9jYWxsYmFjayhsaWJ4bF9fZWdjICplZ2MsIGxpYnhs X19ldl94c3dhdGNoICp3YXRjaCwKICAgICBsaWJ4bF9fYW8gKm5lc3RlZF9hbyA9IGxpYnhsX19u ZXN0ZWRfYW9fY3JlYXRlKGRkb21haW4tPmFvKTsKICAgICBTVEFURV9BT19HQyhuZXN0ZWRfYW8p OwogICAgIGNoYXIgKnAsICpwYXRoOwotICAgIGNvbnN0IGNoYXIgKnNzdGF0ZTsKLSAgICBpbnQg c3RhdGUsIHJjLCBudW1fZGV2czsKKyAgICBjb25zdCBjaGFyICpzc3RhdGUsICpzb25saW5lOwor ICAgIGludCBzdGF0ZSwgb25saW5lLCByYywgbnVtX2RldnM7CiAgICAgbGlieGxfX2RldmljZSAq ZGV2ID0gTlVMTDsKICAgICBsaWJ4bF9fZGRvbWFpbl9kZXZpY2UgKmRkZXYgPSBOVUxMOwogICAg IGxpYnhsX19kZG9tYWluX2d1ZXN0ICpkZ3Vlc3QgPSBOVUxMOwogICAgIGJvb2wgZnJlZV9hbyA9 IGZhbHNlOwogCi0gICAgLyogQ2hlY2sgaWYgZXZlbnRfcGF0aCBlbmRzIHdpdGggInN0YXRlIiBh bmQgdHJ1bmNhdGUgaXQgKi8KLSAgICBpZiAoc3RybGVuKGV2ZW50X3BhdGgpIDwgc3RybGVuKCJz dGF0ZSIpKQotICAgICAgICBnb3RvIHNraXA7Ci0KKyAgICAvKiBDaGVjayBpZiBldmVudF9wYXRo IGVuZHMgd2l0aCAic3RhdGUiIG9yICJvbmxpbmUiIGFuZCB0cnVuY2F0ZSBpdC4gKi8KICAgICBw YXRoID0gbGlieGxfX3N0cmR1cChnYywgZXZlbnRfcGF0aCk7Ci0gICAgcCA9IHBhdGggKyBzdHJs ZW4ocGF0aCkgLSBzdHJsZW4oInN0YXRlIikgLSAxOwotICAgIGlmICgqcCAhPSAnLycpCisgICAg cCA9IHN0cnJjaHIocGF0aCwgJy8nKTsKKyAgICBpZiAocCA9PSBOVUxMKQogICAgICAgICBnb3Rv IHNraXA7Ci0gICAgKnAgPSAnXDAnOwotICAgIHArKzsKLSAgICBpZiAoc3RyY21wKHAsICJzdGF0 ZSIpICE9IDApCisgICAgaWYgKHN0cmNtcChwLCAiL3N0YXRlIikgIT0gMCAmJiBzdHJjbXAocCwg Ii9vbmxpbmUiKSAhPSAwKQogICAgICAgICBnb3RvIHNraXA7CisgICAgLyogVHJ1bmNhdGUgdGhl IHN0cmluZyBzbyBpdCBwb2ludHMgdG8gdGhlIGJhY2tlbmQgZGlyZWN0b3J5LiAqLworICAgICpw ID0gJ1wwJzsKIAotICAgIC8qIENoZWNrIGlmIHRoZSBzdGF0ZSBpcyAxIChYZW5idXNTdGF0ZUlu aXRpYWxpc2luZykgb3IgZ3JlYXRlciAqLwotICAgIHJjID0gbGlieGxfX3hzX3JlYWRfY2hlY2tl ZChnYywgWEJUX05VTEwsIGV2ZW50X3BhdGgsICZzc3RhdGUpOworICAgIC8qIEZldGNoIHRoZSB2 YWx1ZSBvZiB0aGUgc3RhdGUgYW5kIG9ubGluZSBub2Rlcy4gKi8KKyAgICByYyA9IGxpYnhsX194 c19yZWFkX2NoZWNrZWQoZ2MsIFhCVF9OVUxMLCBHQ1NQUklOVEYoIiVzL3N0YXRlIiwgcGF0aCks CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICZzc3RhdGUpOwogICAgIGlmIChyYyB8 fCAhc3N0YXRlKQogICAgICAgICBnb3RvIHNraXA7CiAgICAgc3RhdGUgPSBhdG9pKHNzdGF0ZSk7 CiAKKyAgICByYyA9IGxpYnhsX194c19yZWFkX2NoZWNrZWQoZ2MsIFhCVF9OVUxMLCBHQ1NQUklO VEYoIiVzL29ubGluZSIsIHBhdGgpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAm c29ubGluZSk7CisgICAgaWYgKHJjIHx8ICFzb25saW5lKQorICAgICAgICBnb3RvIHNraXA7Cisg ICAgb25saW5lID0gYXRvaShzb25saW5lKTsKKwogICAgIGRldiA9IGxpYnhsX196YWxsb2MoTk9H Qywgc2l6ZW9mKCpkZXYpKTsKICAgICByYyA9IGxpYnhsX19wYXJzZV9iYWNrZW5kX3BhdGgoZ2Ms IHBhdGgsIGRldik7CiAgICAgaWYgKHJjKQpAQCAtNDQ3Nyw3ICs0NDgxLDcgQEAgc3RhdGljIHZv aWQgYmFja2VuZF93YXRjaF9jYWxsYmFjayhsaWJ4bF9fZWdjICplZ2MsIGxpYnhsX19ldl94c3dh dGNoICp3YXRjaCwKICAgICAgICAgcmMgPSBhZGRfZGV2aWNlKGVnYywgbmVzdGVkX2FvLCBkZ3Vl c3QsIGRkZXYpOwogICAgICAgICBpZiAocmMgPiAwKQogICAgICAgICAgICAgZnJlZV9hbyA9IHRy dWU7Ci0gICAgfSBlbHNlIGlmIChzdGF0ZSA9PSBYZW5idXNTdGF0ZUNsb3NlZCkgeworICAgIH0g ZWxzZSBpZiAoc3RhdGUgPT0gWGVuYnVzU3RhdGVDbG9zZWQgJiYgb25saW5lID09IDApIHsKICAg ICAgICAgLyoKICAgICAgICAgICogUmVtb3ZhbCBvZiBhbiBhY3RpdmUgZGV2aWNlLCByZW1vdmUg aXQgZnJvbSB0aGUgbGlzdCBhbmQKICAgICAgICAgICogZnJlZSBpdCdzIGRhdGEgc3RydWN0dXJl cyBpZiB0aGV5IGFyZSBubyBsb25nZXIgbmVlZGVkLgpkaWZmIC0tZ2l0IGEvdG9vbHMvbGlieGwv bGlieGxfZGV2aWNlLmMgYi90b29scy9saWJ4bC9saWJ4bF9kZXZpY2UuYwppbmRleCBiZWU1ZWQ1 Li44NWEzNjYyIDEwMDY0NAotLS0gYS90b29scy9saWJ4bC9saWJ4bF9kZXZpY2UuYworKysgYi90 b29scy9saWJ4bC9saWJ4bF9kZXZpY2UuYwpAQCAtODM3LDE2ICs4MzcsMTUgQEAgdm9pZCBsaWJ4 bF9faW5pdGlhdGVfZGV2aWNlX3JlbW92ZShsaWJ4bF9fZWdjICplZ2MsCiAgICAgICAgICAgICBn b3RvIG91dDsKICAgICAgICAgfQogCisgICAgICAgIHJjID0gbGlieGxfX3hzX3dyaXRlX2NoZWNr ZWQoZ2MsIHQsIG9ubGluZV9wYXRoLCAiMCIpOworICAgICAgICBpZiAocmMpCisgICAgICAgICAg ICBnb3RvIG91dDsKKwogICAgICAgICAvKgogICAgICAgICAgKiBDaGVjayBpZiBkZXZpY2UgaXMg YWxyZWFkeSBpbiAiY2xvc2VkIiBzdGF0ZSwgaW4gd2hpY2ggY2FzZQogICAgICAgICAgKiBpdCBz aG91bGQgbm90IGJlIGNoYW5nZWQuCiAgICAgICAgICAqLwogICAgICAgICAgaWYgKHN0YXRlICYm IGF0b2koc3RhdGUpICE9IFhlbmJ1c1N0YXRlQ2xvc2VkKSB7Ci0gICAgICAgICAgICByYyA9IGxp YnhsX194c193cml0ZV9jaGVja2VkKGdjLCB0LCBvbmxpbmVfcGF0aCwgIjAiKTsKLSAgICAgICAg ICAgIGlmIChyYykgewotICAgICAgICAgICAgICAgIExPRyhFUlJPUiwgInVuYWJsZSB0byB3cml0 ZSB0byB4ZW5zdG9yZSBwYXRoICVzIiwgb25saW5lX3BhdGgpOwotICAgICAgICAgICAgICAgIGdv dG8gb3V0OwotICAgICAgICAgICAgfQogICAgICAgICAgICAgcmMgPSBsaWJ4bF9feHNfd3JpdGVf Y2hlY2tlZChnYywgdCwgc3RhdGVfcGF0aCwgR0NTUFJJTlRGKCIlZCIsIFhlbmJ1c1N0YXRlQ2xv c2luZykpOwogICAgICAgICAgICAgaWYgKHJjKSB7CiAgICAgICAgICAgICAgICAgTE9HKEVSUk9S LCAidW5hYmxlIHRvIHdyaXRlIHRvIHhlbnN0b3JlIHBhdGggJXMiLCBzdGF0ZV9wYXRoKTsKLS0g CjEuOS41IChBcHBsZSBHaXQtNTAuMykKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54 ZW4ub3JnCmh0dHA6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=