From mboxrd@z Thu Jan  1 00:00:00 1970
From: Roger Pau Monne <roger.pau@citrix.com>
Subject: [PATCH for-4.6 1/2] libxl: fix devd removal path
Date: Tue, 22 Sep 2015 18:23:12 +0200
Message-ID: <1442938993-94328-2-git-send-email-roger.pau@citrix.com>
References: <1442938993-94328-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: <xen-devel-bounces@lists.xen.org>
Received: from mail6.bemta5.messagelabs.com ([195.245.231.135])
	by lists.xen.org with esmtp (Exim 4.72)
	(envelope-from <prvs=7002a29bc=roger.pau@citrix.com>)
	id 1ZeQLn-0005h1-Fv
	for xen-devel@lists.xenproject.org; Tue, 22 Sep 2015 16:23:27 +0000
In-Reply-To: <1442938993-94328-1-git-send-email-roger.pau@citrix.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=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 <alex.j.velazquez@gmail.com>, Wei Liu <wei.liu2@citrix.com>, Ian Jackson <ian.jackson@eu.citrix.com>, Ian Campbell <ian.campbell@citrix.com>, Roger Pau Monne <roger.pau@citrix.com>
List-Id: xen-devel@lists.xenproject.org

VGhlIGN1cnJlbnQgZmxvdyBvZiB0aGUgZGV2ZCBoZWxwZXIgKGluIGNoYXJnZSBvZiBsYXVuY2hp
bmcgaG90cGx1ZyBzY3JpcHRzCmluc2lkZSBvZiBkcml2ZXIgZG9tYWlucykgaXMgdG8gd2FpdCBm
b3IgdGhlIGRldmljZSBiYWNrZW5kIHRvIHN3aXRjaCB0bwpzdGF0ZSA2IChYZW5idXNTdGF0ZUNs
b3NlZCkgYW5kIHRoZW4gcmVtb3ZlIGl0LiBUaGlzIGlzIG5vdCBjb3JyZWN0LCBzaW5jZQphIGRv
bWFpbiBjYW4gcmVjb25uZWN0IGl0J3MgUFYgZGV2aWNlcyBhcyBtYW55IHRpbWVzIGFzIGl0IHdh
bnRzLgoKSW4gb3JkZXIgdG8gZml4IHRoaXMsIGludHJvZHVjZSB0aGUgZm9sbG93aW5nIGxvZ2lj
OiB0aGUgY29udHJvbCBkb21haW4gd2lsbApzZXQgdGhlICJvbmxpbmUiIGJhY2tlbmQgbm9kZSB0
byAwIHdoZW4gaXQgd2FudHMgdGhlIGRyaXZlciBkb21haW4gdG8KZGlzY29ubmVjdCB0aGUgZGV2
aWNlLCBzbyBub3cgdGhlIGNvbmRpdGlvbiBhcHBsaWVkIGluIGRldmQgaXMgdGhhdCAic3RhdGUi
Cm11c3QgYmUgNiBhbmQgIm9ubGluZSIgMCBpbiBvcmRlciB0byBwcm9jZWVkIHdpdGggdGhlIGRp
c2Nvbm5lY3Rpb24uCgpTaWduZWQtb2ZmLWJ5OiBSb2dlciBQYXUgTW9ubsOpIDxyb2dlci5wYXVA
Y2l0cml4LmNvbT4KUmVwb3J0ZWQtYnk6IEFsZXggVmVsYXpxdWV6IDxhbGV4LmoudmVsYXpxdWV6
QGdtYWlsLmNvbT4KQ2M6IEFsZXggVmVsYXpxdWV6IDxhbGV4LmoudmVsYXpxdWV6QGdtYWlsLmNv
bT4KQ2M6IElhbiBKYWNrc29uIDxpYW4uamFja3NvbkBldS5jaXRyaXguY29tPgpDYzogSWFuIENh
bXBiZWxsIDxpYW4uY2FtcGJlbGxAY2l0cml4LmNvbT4KQ2M6IFdlaSBMaXUgPHdlaS5saXUyQGNp
dHJpeC5jb20+Ci0tLQogdG9vbHMvbGlieGwvbGlieGwuYyAgICAgICAgfCAzOCArKysrKysrKysr
KysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLQogdG9vbHMvbGlieGwvbGlieGxfZGV2aWNlLmMg
fCAxMSArKysrKystLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAzMCBpbnNlcnRpb25zKCspLCAxOSBk
ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS90b29scy9saWJ4bC9saWJ4bC5jIGIvdG9vbHMvbGli
eGwvbGlieGwuYwppbmRleCAxMGQxOTA5Li4xZDE5MTdlIDEwMDY0NAotLS0gYS90b29scy9saWJ4
bC9saWJ4bC5jCisrKyBiL3Rvb2xzL2xpYnhsL2xpYnhsLmMKQEAgLTQ0MTAsMzIgKzQ0MTAsNDIg
QEAgc3RhdGljIHZvaWQgYmFja2VuZF93YXRjaF9jYWxsYmFjayhsaWJ4bF9fZWdjICplZ2MsIGxp
YnhsX19ldl94c3dhdGNoICp3YXRjaCwKICAgICBsaWJ4bF9fYW8gKm5lc3RlZF9hbyA9IGxpYnhs
X19uZXN0ZWRfYW9fY3JlYXRlKGRkb21haW4tPmFvKTsKICAgICBTVEFURV9BT19HQyhuZXN0ZWRf
YW8pOwogICAgIGNoYXIgKnAsICpwYXRoOwotICAgIGNvbnN0IGNoYXIgKnNzdGF0ZTsKLSAgICBp
bnQgc3RhdGUsIHJjLCBudW1fZGV2czsKKyAgICBjb25zdCBjaGFyICpzc3RhdGUsICpzb25saW5l
OworICAgIGludCBzdGF0ZSwgb25saW5lLCByYywgbnVtX2RldnM7CiAgICAgbGlieGxfX2Rldmlj
ZSAqZGV2ID0gTlVMTDsKICAgICBsaWJ4bF9fZGRvbWFpbl9kZXZpY2UgKmRkZXYgPSBOVUxMOwog
ICAgIGxpYnhsX19kZG9tYWluX2d1ZXN0ICpkZ3Vlc3QgPSBOVUxMOwogICAgIGJvb2wgZnJlZV9h
byA9IGZhbHNlOwogCi0gICAgLyogQ2hlY2sgaWYgZXZlbnRfcGF0aCBlbmRzIHdpdGggInN0YXRl
IiBhbmQgdHJ1bmNhdGUgaXQgKi8KLSAgICBpZiAoc3RybGVuKGV2ZW50X3BhdGgpIDwgc3RybGVu
KCJzdGF0ZSIpKQorICAgIC8qIENoZWNrIGlmIGV2ZW50X3BhdGggZW5kcyB3aXRoICJzdGF0ZSIg
b3IgIm9ubGluZSIgYW5kIHRydW5jYXRlIGl0LiAqLworICAgIGlmIChzdHJsZW4oZXZlbnRfcGF0
aCkgPCBzdHJsZW4oInN0YXRlIikgfHwKKyAgICAgICAgc3RybGVuKGV2ZW50X3BhdGgpIDwgc3Ry
bGVuKCJvbmxpbmUiKSkKICAgICAgICAgZ290byBza2lwOwogCiAgICAgcGF0aCA9IGxpYnhsX19z
dHJkdXAoZ2MsIGV2ZW50X3BhdGgpOwotICAgIHAgPSBwYXRoICsgc3RybGVuKHBhdGgpIC0gc3Ry
bGVuKCJzdGF0ZSIpIC0gMTsKLSAgICBpZiAoKnAgIT0gJy8nKQotICAgICAgICBnb3RvIHNraXA7
Ci0gICAgKnAgPSAnXDAnOwotICAgIHArKzsKLSAgICBpZiAoc3RyY21wKHAsICJzdGF0ZSIpICE9
IDApCi0gICAgICAgIGdvdG8gc2tpcDsKKyAgICBwID0gc3Ryc3RyKHBhdGgsICIvc3RhdGUiKTsK
KyAgICBpZiAocCAhPSBOVUxMKSB7CisgICAgICAgICpwID0gJ1wwJzsKKyAgICB9IGVsc2Ugewor
ICAgICAgICBwID0gc3Ryc3RyKHBhdGgsICIvb25saW5lIik7CisgICAgICAgIGlmIChwID09IE5V
TEwpCisgICAgICAgICAgICBnb3RvIHNraXA7CisgICAgICAgICpwID0gJ1wwJzsKKyAgICB9CiAK
LSAgICAvKiBDaGVjayBpZiB0aGUgc3RhdGUgaXMgMSAoWGVuYnVzU3RhdGVJbml0aWFsaXNpbmcp
IG9yIGdyZWF0ZXIgKi8KLSAgICByYyA9IGxpYnhsX194c19yZWFkX2NoZWNrZWQoZ2MsIFhCVF9O
VUxMLCBldmVudF9wYXRoLCAmc3N0YXRlKTsKKyAgICAvKiBGZXRjaCB0aGUgdmFsdWUgb2YgdGhl
IHN0YXRlIGFuZCBvbmxpbmUgbm9kZXMuICovCisgICAgcmMgPSBsaWJ4bF9feHNfcmVhZF9jaGVj
a2VkKGdjLCBYQlRfTlVMTCwgR0NTUFJJTlRGKCIlcy9zdGF0ZSIsIHBhdGgpLAorICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAmc3N0YXRlKTsKICAgICBpZiAocmMgfHwgIXNzdGF0ZSkK
ICAgICAgICAgZ290byBza2lwOwogICAgIHN0YXRlID0gYXRvaShzc3RhdGUpOwogCisgICAgcmMg
PSBsaWJ4bF9feHNfcmVhZF9jaGVja2VkKGdjLCBYQlRfTlVMTCwgR0NTUFJJTlRGKCIlcy9vbmxp
bmUiLCBwYXRoKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJnNvbmxpbmUpOwor
ICAgIGlmIChyYyB8fCAhc29ubGluZSkKKyAgICAgICAgZ290byBza2lwOworICAgIG9ubGluZSA9
IGF0b2koc29ubGluZSk7CisKICAgICBkZXYgPSBsaWJ4bF9femFsbG9jKE5PR0MsIHNpemVvZigq
ZGV2KSk7CiAgICAgcmMgPSBsaWJ4bF9fcGFyc2VfYmFja2VuZF9wYXRoKGdjLCBwYXRoLCBkZXYp
OwogICAgIGlmIChyYykKQEAgLTQ0NzcsNyArNDQ4Nyw3IEBAIHN0YXRpYyB2b2lkIGJhY2tlbmRf
d2F0Y2hfY2FsbGJhY2sobGlieGxfX2VnYyAqZWdjLCBsaWJ4bF9fZXZfeHN3YXRjaCAqd2F0Y2gs
CiAgICAgICAgIHJjID0gYWRkX2RldmljZShlZ2MsIG5lc3RlZF9hbywgZGd1ZXN0LCBkZGV2KTsK
ICAgICAgICAgaWYgKHJjID4gMCkKICAgICAgICAgICAgIGZyZWVfYW8gPSB0cnVlOwotICAgIH0g
ZWxzZSBpZiAoc3RhdGUgPT0gWGVuYnVzU3RhdGVDbG9zZWQpIHsKKyAgICB9IGVsc2UgaWYgKHN0
YXRlID09IFhlbmJ1c1N0YXRlQ2xvc2VkICYmIG9ubGluZSA9PSAwKSB7CiAgICAgICAgIC8qCiAg
ICAgICAgICAqIFJlbW92YWwgb2YgYW4gYWN0aXZlIGRldmljZSwgcmVtb3ZlIGl0IGZyb20gdGhl
IGxpc3QgYW5kCiAgICAgICAgICAqIGZyZWUgaXQncyBkYXRhIHN0cnVjdHVyZXMgaWYgdGhleSBh
cmUgbm8gbG9uZ2VyIG5lZWRlZC4KZGlmZiAtLWdpdCBhL3Rvb2xzL2xpYnhsL2xpYnhsX2Rldmlj
ZS5jIGIvdG9vbHMvbGlieGwvbGlieGxfZGV2aWNlLmMKaW5kZXggYmVlNWVkNS4uNTFkYTEwZSAx
MDA2NDQKLS0tIGEvdG9vbHMvbGlieGwvbGlieGxfZGV2aWNlLmMKKysrIGIvdG9vbHMvbGlieGwv
bGlieGxfZGV2aWNlLmMKQEAgLTgzNywxNiArODM3LDE3IEBAIHZvaWQgbGlieGxfX2luaXRpYXRl
X2RldmljZV9yZW1vdmUobGlieGxfX2VnYyAqZWdjLAogICAgICAgICAgICAgZ290byBvdXQ7CiAg
ICAgICAgIH0KIAorICAgICAgICByYyA9IGxpYnhsX194c193cml0ZV9jaGVja2VkKGdjLCB0LCBv
bmxpbmVfcGF0aCwgIjAiKTsKKyAgICAgICAgaWYgKHJjKSB7CisgICAgICAgICAgICBMT0coRVJS
T1IsICJ1bmFibGUgdG8gd3JpdGUgdG8geGVuc3RvcmUgcGF0aCAlcyIsIG9ubGluZV9wYXRoKTsK
KyAgICAgICAgICAgIGdvdG8gb3V0OworICAgICAgICB9CisKICAgICAgICAgLyoKICAgICAgICAg
ICogQ2hlY2sgaWYgZGV2aWNlIGlzIGFscmVhZHkgaW4gImNsb3NlZCIgc3RhdGUsIGluIHdoaWNo
IGNhc2UKICAgICAgICAgICogaXQgc2hvdWxkIG5vdCBiZSBjaGFuZ2VkLgogICAgICAgICAgKi8K
ICAgICAgICAgIGlmIChzdGF0ZSAmJiBhdG9pKHN0YXRlKSAhPSBYZW5idXNTdGF0ZUNsb3NlZCkg
ewotICAgICAgICAgICAgcmMgPSBsaWJ4bF9feHNfd3JpdGVfY2hlY2tlZChnYywgdCwgb25saW5l
X3BhdGgsICIwIik7Ci0gICAgICAgICAgICBpZiAocmMpIHsKLSAgICAgICAgICAgICAgICBMT0co
RVJST1IsICJ1bmFibGUgdG8gd3JpdGUgdG8geGVuc3RvcmUgcGF0aCAlcyIsIG9ubGluZV9wYXRo
KTsKLSAgICAgICAgICAgICAgICBnb3RvIG91dDsKLSAgICAgICAgICAgIH0KICAgICAgICAgICAg
IHJjID0gbGlieGxfX3hzX3dyaXRlX2NoZWNrZWQoZ2MsIHQsIHN0YXRlX3BhdGgsIEdDU1BSSU5U
RigiJWQiLCBYZW5idXNTdGF0ZUNsb3NpbmcpKTsKICAgICAgICAgICAgIGlmIChyYykgewogICAg
ICAgICAgICAgICAgIExPRyhFUlJPUiwgInVuYWJsZSB0byB3cml0ZSB0byB4ZW5zdG9yZSBwYXRo
ICVzIiwgc3RhdGVfcGF0aCk7Ci0tIAoxLjkuNSAoQXBwbGUgR2l0LTUwLjMpCgoKX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcg
bGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2
ZWwK