From: Paul Kocialkowski Subject: [PATCH i-g-t 2/2] lib/igt_core: Split out env-related handling to common_init_env Date: Thu, 20 Jul 2017 17:11:27 +0300 Message-ID: <20170720141127.14974-2-paul.kocialkowski@linux.intel.com> References: <20170720141127.14974-1-paul.kocialkowski@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 061A86E6A5 for ; Thu, 20 Jul 2017 14:12:19 +0000 (UTC) In-Reply-To: <20170720141127.14974-1-paul.kocialkowski@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org VGhpcyBtb3ZlcyB0aGUgcGFydHMgb2YgdGhlIGNvZGUgZG9pbmcgZW52LXJlbGF0ZWQgaGFuZGxp bmcgZnJvbQpjb21tb25faW5pdCB0byBhIG5ldyBkZWRpY2F0ZWQgY29tbW9uX2luaXRfZW52IGZ1 bmN0aW9uLCBtYWtpbmcKY29tbW9uX2luaXQgYSBiaXQgbW9yZSByZWFkYWJsZS4KClNpZ25lZC1v ZmYtYnk6IFBhdWwgS29jaWFsa293c2tpIDxwYXVsLmtvY2lhbGtvd3NraUBsaW51eC5pbnRlbC5j b20+Ci0tLQogbGliL2lndF9jb3JlLmMgfCA0NiArKysrKysrKysrKysrKysrKysrKysrKysrKy0t LS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjYgaW5zZXJ0aW9ucygrKSwgMjAg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGliL2lndF9jb3JlLmMgYi9saWIvaWd0X2NvcmUu YwppbmRleCBlMjUyNzZmYy4uYzA0ODhlOTQgMTAwNjQ0Ci0tLSBhL2xpYi9pZ3RfY29yZS5jCisr KyBiL2xpYi9pZ3RfY29yZS5jCkBAIC02NTIsOCArNjUyLDYgQEAgc3RhdGljIHZvaWQgY29tbW9u X2luaXRfY29uZmlnKHZvaWQpCiAKIAlnX2NsZWFyX2Vycm9yKCZlcnJvcik7CiAKLQlmcmFtZV9k dW1wX3BhdGggPSBnZXRlbnYoIklHVF9GUkFNRV9EVU1QX1BBVEgiKTsKLQogCWlmICghZnJhbWVf ZHVtcF9wYXRoKQogCQlmcmFtZV9kdW1wX3BhdGggPSBnX2tleV9maWxlX2dldF9zdHJpbmcoaWd0 X2tleV9maWxlLCAiQ29tbW9uIiwKIAkJCQkJCQkiRnJhbWVEdW1wUGF0aCIsCkBAIC02NzYsNiAr Njc0LDMxIEBAIG91dDoKIH0KICNlbmRpZgogCitzdGF0aWMgdm9pZCBjb21tb25faW5pdF9lbnYo dm9pZCkKK3sKKwljb25zdCBjaGFyICplbnY7CisKKwlpZiAoIWlzYXR0eShTVERPVVRfRklMRU5P KSB8fCBnZXRlbnYoIklHVF9QTEFJTl9PVVRQVVQiKSkKKwkJX19pZ3RfcGxhaW5fb3V0cHV0ID0g dHJ1ZTsKKworCWlmICghX19pZ3RfcGxhaW5fb3V0cHV0KQorCQlzZXRsb2NhbGUoTENfQUxMLCAi Iik7CisKKwllbnYgPSBnZXRlbnYoIklHVF9MT0dfTEVWRUwiKTsKKwlpZiAoZW52KSB7CisJCWlm IChzdHJjbXAoZW52LCAiZGVidWciKSA9PSAwKQorCQkJaWd0X2xvZ19sZXZlbCA9IElHVF9MT0df REVCVUc7CisJCWVsc2UgaWYgKHN0cmNtcChlbnYsICJpbmZvIikgPT0gMCkKKwkJCWlndF9sb2df bGV2ZWwgPSBJR1RfTE9HX0lORk87CisJCWVsc2UgaWYgKHN0cmNtcChlbnYsICJ3YXJuIikgPT0g MCkKKwkJCWlndF9sb2dfbGV2ZWwgPSBJR1RfTE9HX1dBUk47CisJCWVsc2UgaWYgKHN0cmNtcChl bnYsICJub25lIikgPT0gMCkKKwkJCWlndF9sb2dfbGV2ZWwgPSBJR1RfTE9HX05PTkU7CisJfQor CisJZnJhbWVfZHVtcF9wYXRoID0gZ2V0ZW52KCJJR1RfRlJBTUVfRFVNUF9QQVRIIik7Cit9CisK IHN0YXRpYyBpbnQgY29tbW9uX2luaXQoaW50ICphcmdjLCBjaGFyICoqYXJndiwKIAkJICAgICAg IGNvbnN0IGNoYXIgKmV4dHJhX3Nob3J0X29wdHMsCiAJCSAgICAgICBjb25zdCBzdHJ1Y3Qgb3B0 aW9uICpleHRyYV9sb25nX29wdHMsCkBAIC02OTksMjUgKzcyMiw4IEBAIHN0YXRpYyBpbnQgY29t bW9uX2luaXQoaW50ICphcmdjLCBjaGFyICoqYXJndiwKIAlpbnQgZXh0cmFfb3B0X2NvdW50Owog CWludCBhbGxfb3B0X2NvdW50OwogCWludCByZXQgPSAwOwotCWNvbnN0IGNoYXIgKmVudjsKLQot CWlmICghaXNhdHR5KFNURE9VVF9GSUxFTk8pIHx8IGdldGVudigiSUdUX1BMQUlOX09VVFBVVCIp KQotCQlfX2lndF9wbGFpbl9vdXRwdXQgPSB0cnVlOwotCi0JaWYgKCFfX2lndF9wbGFpbl9vdXRw dXQpCi0JCXNldGxvY2FsZShMQ19BTEwsICIiKTsKIAotCWVudiA9IGdldGVudigiSUdUX0xPR19M RVZFTCIpOwotCWlmIChlbnYpIHsKLQkJaWYgKHN0cmNtcChlbnYsICJkZWJ1ZyIpID09IDApCi0J CQlpZ3RfbG9nX2xldmVsID0gSUdUX0xPR19ERUJVRzsKLQkJZWxzZSBpZiAoc3RyY21wKGVudiwg ImluZm8iKSA9PSAwKQotCQkJaWd0X2xvZ19sZXZlbCA9IElHVF9MT0dfSU5GTzsKLQkJZWxzZSBp ZiAoc3RyY21wKGVudiwgIndhcm4iKSA9PSAwKQotCQkJaWd0X2xvZ19sZXZlbCA9IElHVF9MT0df V0FSTjsKLQkJZWxzZSBpZiAoc3RyY21wKGVudiwgIm5vbmUiKSA9PSAwKQotCQkJaWd0X2xvZ19s ZXZlbCA9IElHVF9MT0dfTk9ORTsKLQl9CisJY29tbW9uX2luaXRfZW52KCk7CiAKIAljb21tYW5k X3N0ciA9IGFyZ3ZbMF07CiAJaWYgKHN0cnJjaHIoY29tbWFuZF9zdHIsICcvJykpCi0tIAoyLjEz LjIKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVs LWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=