From mboxrd@z Thu Jan 1 00:00:00 1970 From: Roger Pau Monne Subject: [PATCH v2 6/7] libxl: add local attach support for new hotplug scripts Date: Mon, 18 Mar 2013 12:47:10 +0100 Message-ID: <1363607231-35228-7-git-send-email-roger.pau@citrix.com> References: <1363607231-35228-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: In-Reply-To: <1363607231-35228-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.xen.org Cc: Ian Jackson , Ian Campbell , Roger Pau Monne List-Id: xen-devel@lists.xenproject.org QWRkcyBzdXBwb3J0IGZvciBsb2NhbGx5IGF0dGFjaGluZyBkaXNrcyB0aGF0IHVzZSB0aGUgbmV3 IGhvdHBsdWcKc2NyaXB0IGludGVyZmFjZSwgYnkgY2FsbGluZyB0aGUgbG9jYWxhdHRhY2gvbG9j YWxkZXRhY2ggb3BlcmF0aW9ucwphbmQgcmV0dXJuaW5nIGEgYmxvY2sgZGV2aWNlIHRoYXQgY2Fu IGJlIHVzZWQgdG8gZXhlY3V0ZSBweWdydWIuCgpTaWduZWQtb2ZmLWJ5OiBSb2dlciBQYXUgTW9u bsOpIDxyb2dlci5wYXVAY2l0cml4LmNvbT4KQ2M6IElhbiBDYW1wYmVsbCA8aWFuLmNhbXBiZWxs QGNpdHJpeC5jb20+CkNjOiBJYW4gSmFja3NvbiA8aWFuLmphY2tzb25AY2l0cml4LmNvbT4KLS0t CiB0b29scy9saWJ4bC9saWJ4bC5jICAgICAgICAgICAgfCAgIDg2ICsrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKystLS0tLS0KIHRvb2xzL2xpYnhsL2xpYnhsX2Jvb3Rsb2FkZXIuYyB8 ICAgIDEgKwogdG9vbHMvbGlieGwvbGlieGxfaW50ZXJuYWwuaCAgIHwgICAgMSArCiAzIGZpbGVz IGNoYW5nZWQsIDc2IGluc2VydGlvbnMoKyksIDEyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L3Rvb2xzL2xpYnhsL2xpYnhsLmMgYi90b29scy9saWJ4bC9saWJ4bC5jCmluZGV4IDk4NzcyM2Iu LjlkMGQxNWEgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2xpYnhsL2xpYnhsLmMKKysrIGIvdG9vbHMvbGli eGwvbGlieGwuYwpAQCAtMjcxOCw2ICsyNzE4LDcgQEAgdm9pZCBsaWJ4bF9fZGV2aWNlX2Rpc2tf bG9jYWxfaW5pdGlhdGVfYXR0YWNoKGxpYnhsX19lZ2MgKmVnYywKICAgICBjb25zdCBsaWJ4bF9k ZXZpY2VfZGlzayAqaW5fZGlzayA9IGRscy0+aW5fZGlzazsKICAgICBsaWJ4bF9kZXZpY2VfZGlz ayAqZGlzayA9ICZkbHMtPmRpc2s7CiAgICAgY29uc3QgY2hhciAqYmxrZGV2X3N0YXJ0ID0gZGxz LT5ibGtkZXZfc3RhcnQ7CisgICAgdWludDMyX3QgZG9taWQgPSBkbHMtPmRvbWlkOwogCiAgICAg YXNzZXJ0KGluX2Rpc2stPnBkZXZfcGF0aCk7CiAKQEAgLTI3MzQsNiArMjczNSwyMyBAQCB2b2lk IGxpYnhsX19kZXZpY2VfZGlza19sb2NhbF9pbml0aWF0ZV9hdHRhY2gobGlieGxfX2VnYyAqZWdj LAogICAgICAgICBjYXNlIExJQlhMX0RJU0tfQkFDS0VORF9QSFk6CiAgICAgICAgICAgICBMSUJY TF9fTE9HKGN0eCwgTElCWExfX0xPR19ERUJVRywgImxvY2FsbHkgYXR0YWNoaW5nIFBIWSBkaXNr ICVzIiwKICAgICAgICAgICAgICAgICAgICAgICAgZGlzay0+cGRldl9wYXRoKTsKKyAgICAgICAg ICAgIGlmIChkaXNrLT5ob3RwbHVnX3ZlcnNpb24gPT0gMikgeworICAgICAgICAgICAgICAgIGRp c2stPnZkZXYgPSBsaWJ4bF9fc3RyZHVwKGdjLCBpbl9kaXNrLT52ZGV2KTsKKyAgICAgICAgICAg ICAgICBsaWJ4bF9fcHJlcGFyZV9hb19kZXZpY2UoYW8sICZkbHMtPmFvZGV2KTsKKyAgICAgICAg ICAgICAgICBHQ05FVyhkbHMtPmFvZGV2LmRldik7CisgICAgICAgICAgICAgICAgcmMgPSBsaWJ4 bF9fZGV2aWNlX2Zyb21fZGlzayhnYywgZG9taWQsIGRpc2ssCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBkbHMtPmFvZGV2LmRldik7CisgICAgICAgICAgICAg ICAgaWYgKHJjICE9IDApIHsKKyAgICAgICAgICAgICAgICAgICAgTE9HKEVSUk9SLCAiSW52YWxp ZCBvciB1bnN1cHBvcnRlZCB2aXJ0dWFsIGRpc2sgIgorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICJpZGVudGlmaWVyICVzIiwgZGlzay0+dmRldik7CisgICAgICAgICAgICAgICAgICAg IGdvdG8gb3V0OworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICBkbHMtPmFvZGV2 LmFjdGlvbiA9IExJQlhMX19ERVZJQ0VfQUNUSU9OX0xPQ0FMQVRUQUNIOworICAgICAgICAgICAg ICAgIGRscy0+YW9kZXYuaG90cGx1Zy52ZXJzaW9uID0gZGlzay0+aG90cGx1Z192ZXJzaW9uOwor ICAgICAgICAgICAgICAgIGRscy0+YW9kZXYuY2FsbGJhY2sgPSBsb2NhbF9kZXZpY2VfYXR0YWNo X2NiOworICAgICAgICAgICAgICAgIGxpYnhsX19kZXZpY2VfaG90cGx1ZyhlZ2MsICZkbHMtPmFv ZGV2KTsKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9CiAgICAgICAgICAg ICBkZXYgPSBkaXNrLT5wZGV2X3BhdGg7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2Fz ZSBMSUJYTF9ESVNLX0JBQ0tFTkRfVEFQOgpAQCAtMjc5Niw3ICsyODE0LDggQEAgc3RhdGljIHZv aWQgbG9jYWxfZGV2aWNlX2F0dGFjaF9jYihsaWJ4bF9fZWdjICplZ2MsIGxpYnhsX19hb19kZXZp Y2UgKmFvZGV2KQogewogICAgIFNUQVRFX0FPX0dDKGFvZGV2LT5hbyk7CiAgICAgbGlieGxfX2Rp c2tfbG9jYWxfc3RhdGUgKmRscyA9IENPTlRBSU5FUl9PRihhb2RldiwgKmRscywgYW9kZXYpOwot ICAgIGNoYXIgKmRldiA9IE5VTEwsICpiZV9wYXRoID0gTlVMTDsKKyAgICBjaGFyICpkZXYgPSBO VUxMLCAqYmVfcGF0aCA9IE5VTEwsICpob3RwbHVnX3BhdGg7CisgICAgY29uc3QgY2hhciAqcGRl diA9IE5VTEw7CiAgICAgaW50IHJjOwogICAgIGxpYnhsX19kZXZpY2UgZGV2aWNlOwogICAgIGxp YnhsX2RldmljZV9kaXNrICpkaXNrID0gJmRscy0+ZGlzazsKQEAgLTI4MDksMjAgKzI4MjgsNDUg QEAgc3RhdGljIHZvaWQgbG9jYWxfZGV2aWNlX2F0dGFjaF9jYihsaWJ4bF9fZWdjICplZ2MsIGxp YnhsX19hb19kZXZpY2UgKmFvZGV2KQogICAgICAgICAgICAgICAgICAgICBhb2Rldi0+ZGV2LT5k ZXZpZCk7CiAgICAgICAgIGdvdG8gb3V0OwogICAgIH0KKyAgICBzd2l0Y2ggKGRpc2stPmJhY2tl bmQpIHsKKyAgICBjYXNlIExJQlhMX0RJU0tfQkFDS0VORF9QSFk6CisgICAgICAgIC8qIEZldGNo IGhvdHBsdWcgb3V0cHV0IHRvIG9idGFpbiB0aGUgYmxvY2sgZGV2aWNlICovCisgICAgICAgIHJj ID0gbGlieGxfX2RldmljZV9mcm9tX2Rpc2soZ2MsIGRscy0+ZG9taWQsIGRpc2ssICZkZXZpY2Up OworICAgICAgICBpZiAocmMpCisgICAgICAgICAgICBnb3RvIG91dDsKKyAgICAgICAgaG90cGx1 Z19wYXRoID0gbGlieGxfX2RldmljZV94c19ob3RwbHVnX3BhdGgoZ2MsICZkZXZpY2UpOworICAg ICAgICByYyA9IGxpYnhsX194c19yZWFkX2NoZWNrZWQoZ2MsIFhCVF9OVUxMLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgR0NTUFJJTlRGKCIlcy9wZGV2IiwgaG90cGx1Z19w YXRoKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICZwZGV2KTsKKyAgICAg ICAgaWYgKHJjKQorICAgICAgICAgICAgZ290byBvdXQ7CisgICAgICAgIGlmICghcGRldikgewor ICAgICAgICAgICAgcmMgPSBFUlJPUl9GQUlMOworICAgICAgICAgICAgZ290byBvdXQ7CisgICAg ICAgIH0KKyAgICAgICAgTE9HKERFQlVHLCAiYXR0YWNoZWQgbG9jYWwgYmxvY2sgZGV2aWNlICVz IiwgcGRldik7CisgICAgICAgIGRscy0+ZGlza3BhdGggPSBsaWJ4bF9fc3RyZHVwKGdjLCBwZGV2 KTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBMSUJYTF9ESVNLX0JBQ0tFTkRfUURJU0s6Cisg ICAgICAgIGRldiA9IEdDU1BSSU5URigiL2Rldi8lcyIsIGRpc2stPnZkZXYpOworICAgICAgICBM T0coREVCVUcsICJsb2NhbGx5IGF0dGFjaGluZyBxZGlzayAlcyIsIGRldik7CiAKLSAgICBkZXYg PSBHQ1NQUklOVEYoIi9kZXYvJXMiLCBkaXNrLT52ZGV2KTsKLSAgICBMT0coREVCVUcsICJsb2Nh bGx5IGF0dGFjaGluZyBxZGlzayAlcyIsIGRldik7CisgICAgICAgIHJjID0gbGlieGxfX2Rldmlj ZV9mcm9tX2Rpc2soZ2MsIExJQlhMX1RPT0xTVEFDS19ET01JRCwgZGlzaywgJmRldmljZSk7Cisg ICAgICAgIGlmIChyYyA8IDApCisgICAgICAgICAgICBnb3RvIG91dDsKKyAgICAgICAgYmVfcGF0 aCA9IGxpYnhsX19kZXZpY2VfYmFja2VuZF9wYXRoKGdjLCAmZGV2aWNlKTsKKyAgICAgICAgcmMg PSBsaWJ4bF9fd2FpdF9mb3JfYmFja2VuZChnYywgYmVfcGF0aCwgIjQiKTsKKyAgICAgICAgaWYg KHJjIDwgMCkKKyAgICAgICAgICAgIGdvdG8gb3V0OwogCi0gICAgcmMgPSBsaWJ4bF9fZGV2aWNl X2Zyb21fZGlzayhnYywgTElCWExfVE9PTFNUQUNLX0RPTUlELCBkaXNrLCAmZGV2aWNlKTsKLSAg ICBpZiAocmMgPCAwKQotICAgICAgICBnb3RvIG91dDsKLSAgICBiZV9wYXRoID0gbGlieGxfX2Rl dmljZV9iYWNrZW5kX3BhdGgoZ2MsICZkZXZpY2UpOwotICAgIHJjID0gbGlieGxfX3dhaXRfZm9y X2JhY2tlbmQoZ2MsIGJlX3BhdGgsICI0Iik7Ci0gICAgaWYgKHJjIDwgMCkKKyAgICAgICAgaWYg KGRldiAhPSBOVUxMKQorICAgICAgICAgICAgZGxzLT5kaXNrcGF0aCA9IGxpYnhsX19zdHJkdXAo Z2MsIGRldik7CisgICAgICAgIGJyZWFrOworICAgIGRlZmF1bHQ6CisgICAgICAgIExPRyhFUlJP UiwgImludmFsaWQgZGlzayBiYWNrZW5kIGZvciBsb2NhbCBhdHRhY2ggY2FsbGJhY2siKTsKKyAg ICAgICAgcmMgPSBFUlJPUl9GQUlMOwogICAgICAgICBnb3RvIG91dDsKLQotICAgIGlmIChkZXYg IT0gTlVMTCkKLSAgICAgICAgZGxzLT5kaXNrcGF0aCA9IGxpYnhsX19zdHJkdXAoZ2MsIGRldik7 CisgICAgfQogCiAgICAgZGxzLT5jYWxsYmFjayhlZ2MsIGRscywgMCk7CiAgICAgcmV0dXJuOwpA QCAtMjg0NiwxMSArMjg5MCwyOSBAQCB2b2lkIGxpYnhsX19kZXZpY2VfZGlza19sb2NhbF9pbml0 aWF0ZV9kZXRhY2gobGlieGxfX2VnYyAqZWdjLAogICAgIGxpYnhsX2RldmljZV9kaXNrICpkaXNr ID0gJmRscy0+ZGlzazsKICAgICBsaWJ4bF9fZGV2aWNlICpkZXZpY2U7CiAgICAgbGlieGxfX2Fv X2RldmljZSAqYW9kZXYgPSAmZGxzLT5hb2RldjsKKyAgICB1aW50MzJfdCBkb21pZCA9IGRscy0+ ZG9taWQ7CiAgICAgbGlieGxfX3ByZXBhcmVfYW9fZGV2aWNlKGFvLCBhb2Rldik7CiAKICAgICBp ZiAoIWRscy0+ZGlza3BhdGgpIGdvdG8gb3V0OwogCiAgICAgc3dpdGNoIChkaXNrLT5iYWNrZW5k KSB7CisgICAgICAgIGNhc2UgTElCWExfRElTS19CQUNLRU5EX1BIWToKKyAgICAgICAgICAgIGlm IChkaXNrLT5ob3RwbHVnX3ZlcnNpb24gPT0gMikgeworICAgICAgICAgICAgICAgIEdDTkVXKGFv ZGV2LT5kZXYpOworICAgICAgICAgICAgICAgIHJjID0gbGlieGxfX2RldmljZV9mcm9tX2Rpc2so Z2MsIGRvbWlkLCBkaXNrLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgYW9kZXYtPmRldik7CisgICAgICAgICAgICAgICAgaWYgKHJjICE9IDApIHsKKyAgICAg ICAgICAgICAgICAgICAgTE9HKEVSUk9SLCAiSW52YWxpZCBvciB1bnN1cHBvcnRlZCB2aXJ0dWFs IGRpc2sgIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJpZGVudGlmaWVyICVzIiwg ZGlzay0+dmRldik7CisgICAgICAgICAgICAgICAgICAgIGdvdG8gb3V0OworICAgICAgICAgICAg ICAgIH0KKyAgICAgICAgICAgICAgICBhb2Rldi0+YWN0aW9uID0gTElCWExfX0RFVklDRV9BQ1RJ T05fTE9DQUxERVRBQ0g7CisgICAgICAgICAgICAgICAgYW9kZXYtPmhvdHBsdWcudmVyc2lvbiA9 IGRpc2stPmhvdHBsdWdfdmVyc2lvbjsKKyAgICAgICAgICAgICAgICBhb2Rldi0+Y2FsbGJhY2sg PSBsb2NhbF9kZXZpY2VfZGV0YWNoX2NiOworICAgICAgICAgICAgICAgIGxpYnhsX19kZXZpY2Vf aG90cGx1ZyhlZ2MsIGFvZGV2KTsKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAg ICB9CisgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBMSUJYTF9ESVNLX0JBQ0tFTkRf UURJU0s6CiAgICAgICAgICAgICBpZiAoZGlzay0+dmRldiAhPSBOVUxMKSB7CiAgICAgICAgICAg ICAgICAgR0NORVcoZGV2aWNlKTsKZGlmZiAtLWdpdCBhL3Rvb2xzL2xpYnhsL2xpYnhsX2Jvb3Rs b2FkZXIuYyBiL3Rvb2xzL2xpYnhsL2xpYnhsX2Jvb3Rsb2FkZXIuYwppbmRleCBlZDEyYjJjLi41 ZDg4OWZlIDEwMDY0NAotLS0gYS90b29scy9saWJ4bC9saWJ4bF9ib290bG9hZGVyLmMKKysrIGIv dG9vbHMvbGlieGwvbGlieGxfYm9vdGxvYWRlci5jCkBAIC0zODEsNiArMzgxLDcgQEAgdm9pZCBs aWJ4bF9fYm9vdGxvYWRlcl9ydW4obGlieGxfX2VnYyAqZWdjLCBsaWJ4bF9fYm9vdGxvYWRlcl9z dGF0ZSAqYmwpCiAgICAgYmwtPmRscy5hbyA9IGFvOwogICAgIGJsLT5kbHMuaW5fZGlzayA9IGJs LT5kaXNrOwogICAgIGJsLT5kbHMuYmxrZGV2X3N0YXJ0ID0gaW5mby0+YmxrZGV2X3N0YXJ0Owor ICAgIGJsLT5kbHMuZG9taWQgPSBkb21pZDsKICAgICBibC0+ZGxzLmNhbGxiYWNrID0gYm9vdGxv YWRlcl9kaXNrX2F0dGFjaGVkX2NiOwogICAgIGxpYnhsX19kZXZpY2VfZGlza19sb2NhbF9pbml0 aWF0ZV9hdHRhY2goZWdjLCAmYmwtPmRscyk7CiAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEvdG9v bHMvbGlieGwvbGlieGxfaW50ZXJuYWwuaCBiL3Rvb2xzL2xpYnhsL2xpYnhsX2ludGVybmFsLmgK aW5kZXggZDk1N2VkMi4uMzIyOGFiMiAxMDA2NDQKLS0tIGEvdG9vbHMvbGlieGwvbGlieGxfaW50 ZXJuYWwuaAorKysgYi90b29scy9saWJ4bC9saWJ4bF9pbnRlcm5hbC5oCkBAIC0yMTUxLDYgKzIx NTEsNyBAQCBzdHJ1Y3QgbGlieGxfX2Rpc2tfbG9jYWxfc3RhdGUgewogICAgIGxpYnhsX2Rldmlj ZV9kaXNrIGRpc2s7CiAgICAgY29uc3QgY2hhciAqYmxrZGV2X3N0YXJ0OwogICAgIGxpYnhsX19k aXNrX2xvY2FsX3N0YXRlX2NhbGxiYWNrICpjYWxsYmFjazsKKyAgICB1aW50MzJfdCBkb21pZDsK ICAgICAvKiBmaWxsZWQgYnkgbGlieGxfX2RldmljZV9kaXNrX2xvY2FsX2luaXRpYXRlX2F0dGFj aCAqLwogICAgIGNoYXIgKmRpc2twYXRoOwogICAgIC8qIHByaXZhdGUgZm9yIGltcGxlbWVudGF0 aW9uIG9mIGxvY2FsIGRldGFjaCAqLwotLSAKMS43LjcuNSAoQXBwbGUgR2l0LTI2KQoKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWls aW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cDovL2xpc3RzLnhlbi5vcmcveGVu LWRldmVsCg==