From mboxrd@z Thu Jan 1 00:00:00 1970 From: Roger Pau Monne Subject: [PATCH 07/19] libxl: add PVH support to domain creation Date: Tue, 22 Aug 2017 10:49:08 +0100 Message-ID: <20170822094920.70151-8-roger.pau@citrix.com> References: <20170822094920.70151-1-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.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dk5p4-0006F4-I4 for xen-devel@lists.xenproject.org; Tue, 22 Aug 2017 09:50:10 +0000 In-Reply-To: <20170822094920.70151-1-roger.pau@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: Wei Liu , boris.ostrovsky@oracle.com, Roger Pau Monne , Ian Jackson List-Id: xen-devel@lists.xenproject.org UmVtb3ZlIHRoZSBkZXZpY2UgbW9kZWwgIm5vbmUiIHN1cHBvcnQgZnJvbSBkb21haW4gY3JlYXRp b24gYW5kCmludHJvZHVjZSBzdXBwb3J0IGZvciBQVkguCgpUaGlzIHJlcXVpcmVzIGNoYW5naW5n IHNvbWUgb2YgdGhlIEhWTSBjaGVja3MgdG8gYmUgYXBwbGllZCBmb3IgYm90aApIVk0gYW5kIFBW SC4KClNpZ25lZC1vZmYtYnk6IFJvZ2VyIFBhdSBNb25uw6kgPHJvZ2VyLnBhdUBjaXRyaXguY29t PgotLS0KQ2M6IElhbiBKYWNrc29uIDxpYW4uamFja3NvbkBldS5jaXRyaXguY29tPgpDYzogV2Vp IExpdSA8d2VpLmxpdTJAY2l0cml4LmNvbT4KLS0tCiB0b29scy9saWJ4bC9saWJ4bF9jcmVhdGUu YyB8IDY5ICsrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEg ZmlsZSBjaGFuZ2VkLCAzNiBpbnNlcnRpb25zKCspLCAzMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS90b29scy9saWJ4bC9saWJ4bF9jcmVhdGUuYyBiL3Rvb2xzL2xpYnhsL2xpYnhsX2NyZWF0 ZS5jCmluZGV4IDc1ZTg1ZjgwODYuLjM5ODg5NDQ5OTQgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2xpYnhs L2xpYnhsX2NyZWF0ZS5jCisrKyBiL3Rvb2xzL2xpYnhsL2xpYnhsX2NyZWF0ZS5jCkBAIC0zNSw3 ICszNSw3IEBAIGludCBsaWJ4bF9fZG9tYWluX2NyZWF0ZV9pbmZvX3NldGRlZmF1bHQobGlieGxf X2djICpnYywKICAgICAgICAgcmV0dXJuIEVSUk9SX0lOVkFMOwogICAgIH0KIAotICAgIGlmIChj X2luZm8tPnR5cGUgPT0gTElCWExfRE9NQUlOX1RZUEVfSFZNKSB7CisgICAgaWYgKGNfaW5mby0+ dHlwZSAhPSBMSUJYTF9ET01BSU5fVFlQRV9QVikgewogICAgICAgICBsaWJ4bF9kZWZib29sX3Nl dGRlZmF1bHQoJmNfaW5mby0+aGFwLCB0cnVlKTsKICAgICAgICAgbGlieGxfZGVmYm9vbF9zZXRk ZWZhdWx0KCZjX2luZm8tPm9vcywgdHJ1ZSk7CiAgICAgfQpAQCAtNjUsNyArNjUsOCBAQCBpbnQg bGlieGxfX2RvbWFpbl9idWlsZF9pbmZvX3NldGRlZmF1bHQobGlieGxfX2djICpnYywKICAgICBp bnQgaTsKIAogICAgIGlmIChiX2luZm8tPnR5cGUgIT0gTElCWExfRE9NQUlOX1RZUEVfSFZNICYm Ci0gICAgICAgIGJfaW5mby0+dHlwZSAhPSBMSUJYTF9ET01BSU5fVFlQRV9QVikgeworICAgICAg ICBiX2luZm8tPnR5cGUgIT0gTElCWExfRE9NQUlOX1RZUEVfUFYgJiYKKyAgICAgICAgYl9pbmZv LT50eXBlICE9IExJQlhMX0RPTUFJTl9UWVBFX1BWSCkgewogICAgICAgICBMT0coRVJST1IsICJp bnZhbGlkIGRvbWFpbiB0eXBlIik7CiAgICAgICAgIHJldHVybiBFUlJPUl9JTlZBTDsKICAgICB9 CkBAIC0xMjAsOCArMTIxLDYgQEAgaW50IGxpYnhsX19kb21haW5fYnVpbGRfaW5mb19zZXRkZWZh dWx0KGxpYnhsX19nYyAqZ2MsCiAgICAgICAgICAgICAgICAgYl9pbmZvLT51Lmh2bS5iaW9zID0g TElCWExfQklPU19UWVBFX1JPTUJJT1M7IGJyZWFrOwogICAgICAgICAgICAgY2FzZSBMSUJYTF9E RVZJQ0VfTU9ERUxfVkVSU0lPTl9RRU1VX1hFTjoKICAgICAgICAgICAgICAgICBiX2luZm8tPnUu aHZtLmJpb3MgPSBMSUJYTF9CSU9TX1RZUEVfU0VBQklPUzsgYnJlYWs7Ci0gICAgICAgICAgICBj YXNlIExJQlhMX0RFVklDRV9NT0RFTF9WRVJTSU9OX05PTkU6Ci0gICAgICAgICAgICAgICAgYnJl YWs7CiAgICAgICAgICAgICBkZWZhdWx0OgogICAgICAgICAgICAgICAgIExPRyhFUlJPUiwgInVu a25vd24gZGV2aWNlIG1vZGVsIHZlcnNpb24iKTsKICAgICAgICAgICAgICAgICByZXR1cm4gRVJS T1JfSU5WQUw7CkBAIC0xNDEsOCArMTQwLDYgQEAgaW50IGxpYnhsX19kb21haW5fYnVpbGRfaW5m b19zZXRkZWZhdWx0KGxpYnhsX19nYyAqZ2MsCiAgICAgICAgICAgICAgICAgcmV0dXJuIEVSUk9S X0lOVkFMOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNhc2Ug TElCWExfREVWSUNFX01PREVMX1ZFUlNJT05fTk9ORToKLSAgICAgICAgICAgIGJyZWFrOwogICAg ICAgICBkZWZhdWx0OmFib3J0KCk7CiAgICAgICAgIH0KIApAQCAtMjIyLDEwICsyMTksNyBAQCBp bnQgbGlieGxfX2RvbWFpbl9idWlsZF9pbmZvX3NldGRlZmF1bHQobGlieGxfX2djICpnYywKICAg ICAgICAgICAgIGJfaW5mby0+dS5odm0ubW1pb19ob2xlX21lbWtiID0gMDsKIAogICAgICAgICBp ZiAoYl9pbmZvLT51Lmh2bS52Z2Eua2luZCA9PSBMSUJYTF9WR0FfSU5URVJGQUNFX1RZUEVfVU5L Tk9XTikgewotICAgICAgICAgICAgaWYgKGJfaW5mby0+ZGV2aWNlX21vZGVsX3ZlcnNpb24gPT0g TElCWExfREVWSUNFX01PREVMX1ZFUlNJT05fTk9ORSkKLSAgICAgICAgICAgICAgICBiX2luZm8t PnUuaHZtLnZnYS5raW5kID0gTElCWExfVkdBX0lOVEVSRkFDRV9UWVBFX05PTkU7Ci0gICAgICAg ICAgICBlbHNlCi0gICAgICAgICAgICAgICAgYl9pbmZvLT51Lmh2bS52Z2Eua2luZCA9IExJQlhM X1ZHQV9JTlRFUkZBQ0VfVFlQRV9DSVJSVVM7CisgICAgICAgICAgICBiX2luZm8tPnUuaHZtLnZn YS5raW5kID0gTElCWExfVkdBX0lOVEVSRkFDRV9UWVBFX0NJUlJVUzsKICAgICAgICAgfQogCiAg ICAgICAgIGlmICghYl9pbmZvLT51Lmh2bS5oZHR5cGUpCkBAIC0yNTksMTIgKzI1Myw2IEBAIGlu dCBsaWJ4bF9fZG9tYWluX2J1aWxkX2luZm9fc2V0ZGVmYXVsdChsaWJ4bF9fZ2MgKmdjLAogICAg ICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgYnJlYWs7Ci0g ICAgICAgIGNhc2UgTElCWExfREVWSUNFX01PREVMX1ZFUlNJT05fTk9ORToKLSAgICAgICAgICAg IGlmIChiX2luZm8tPnUuaHZtLnZnYS5raW5kICE9IExJQlhMX1ZHQV9JTlRFUkZBQ0VfVFlQRV9O T05FKSB7Ci0gICAgICAgICAgICAgICAgTE9HKEVSUk9SLAotICAgICAgICAiZ3Vlc3RzIHdpdGhv dXQgYSBkZXZpY2UgbW9kZWwgY2Fubm90IGhhdmUgYW4gZW11bGF0ZWQgdmlkZW8gY2FyZCIpOwot ICAgICAgICAgICAgICAgIHJldHVybiBFUlJPUl9JTlZBTDsKLSAgICAgICAgICAgIH0KICAgICAg ICAgICAgIGJfaW5mby0+dmlkZW9fbWVta2IgPSAwOwogICAgICAgICAgICAgYnJlYWs7CiAgICAg ICAgIGNhc2UgTElCWExfREVWSUNFX01PREVMX1ZFUlNJT05fUUVNVV9YRU46CkBAIC00MDEsNiAr Mzg5LDggQEAgaW50IGxpYnhsX19kb21haW5fYnVpbGRfaW5mb19zZXRkZWZhdWx0KGxpYnhsX19n YyAqZ2MsCiAgICAgICAgICAgICBiX2luZm8tPnUucHYuY21kbGluZSA9IE5VTEw7CiAgICAgICAg IH0KICAgICAgICAgYnJlYWs7CisgICAgY2FzZSBMSUJYTF9ET01BSU5fVFlQRV9QVkg6CisgICAg ICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAgICAgIExPRyhFUlJPUiwgImludmFsaWQgZG9t YWluIHR5cGUgJXMgaW4gY3JlYXRlIGluZm8iLAogICAgICAgICAgICAgbGlieGxfZG9tYWluX3R5 cGVfdG9fc3RyaW5nKGJfaW5mby0+dHlwZSkpOwpAQCAtNTE5LDYgKzUwOSwxNyBAQCBpbnQgbGli eGxfX2RvbWFpbl9idWlsZChsaWJ4bF9fZ2MgKmdjLAogICAgICAgICB9CiAKICAgICAgICAgYnJl YWs7CisgICAgY2FzZSBMSUJYTF9ET01BSU5fVFlQRV9QVkg6CisgICAgICAgIHJldCA9IGxpYnhs X19idWlsZF9odm0oZ2MsIGRvbWlkLCBkX2NvbmZpZywgc3RhdGUpOworICAgICAgICBpZiAocmV0 KQorICAgICAgICAgICAgZ290byBvdXQ7CisKKyAgICAgICAgdm1lbnRzID0gbGlieGxfX2NhbGxv YyhnYywgMywgc2l6ZW9mKGNoYXIgKikpOworICAgICAgICB2bWVudHNbMF0gPSAic3RhcnRfdGlt ZSI7CisgICAgICAgIHZtZW50c1sxXSA9IEdDU1BSSU5URigiJWx1LiUwMmQiLCBzdGFydF90aW1l LnR2X3NlYywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChpbnQpc3RhcnRfdGltZS50 dl91c2VjLzEwMDAwKTsKKworICAgICAgICBicmVhazsKICAgICBkZWZhdWx0OgogICAgICAgICBy ZXQgPSBFUlJPUl9JTlZBTDsKICAgICAgICAgZ290byBvdXQ7CkBAIC01NTMsNyArNTU0LDcgQEAg aW50IGxpYnhsX19kb21haW5fbWFrZShsaWJ4bF9fZ2MgKmdjLCBsaWJ4bF9kb21haW5fY29uZmln ICpkX2NvbmZpZywKICAgICB9CiAKICAgICBmbGFncyA9IDA7Ci0gICAgaWYgKGluZm8tPnR5cGUg PT0gTElCWExfRE9NQUlOX1RZUEVfSFZNKSB7CisgICAgaWYgKGluZm8tPnR5cGUgIT0gTElCWExf RE9NQUlOX1RZUEVfUFYpIHsKICAgICAgICAgZmxhZ3MgfD0gWEVOX0RPTUNUTF9DREZfaHZtX2d1 ZXN0OwogICAgICAgICBmbGFncyB8PSBsaWJ4bF9kZWZib29sX3ZhbChpbmZvLT5oYXApID8gWEVO X0RPTUNUTF9DREZfaGFwIDogMDsKICAgICAgICAgZmxhZ3MgfD0gbGlieGxfZGVmYm9vbF92YWwo aW5mby0+b29zKSA/IDAgOiBYRU5fRE9NQ1RMX0NERl9vb3Nfb2ZmOwpAQCAtODgwLDcgKzg4MSw3 IEBAIHN0YXRpYyB2b2lkIGluaXRpYXRlX2RvbWFpbl9jcmVhdGUobGlieGxfX2VnYyAqZWdjLAog ICAgIC8qIElmIHRhcmdldF9tZW1rYiBpcyBzbWFsbGVyIHRoYW4gbWF4X21lbWtiLCB0aGUgc3Vi c2VxdWVudCBjYWxsCiAgICAgICogdG8gbGlieGMgd2hlbiBidWlsZGluZyBIVk0gZG9tYWluIHdp bGwgZW5hYmxlIFBvRCBtb2RlLgogICAgICAqLwotICAgIHBvZF9lbmFibGVkID0gKGRfY29uZmln LT5jX2luZm8udHlwZSA9PSBMSUJYTF9ET01BSU5fVFlQRV9IVk0pICYmCisgICAgcG9kX2VuYWJs ZWQgPSAoZF9jb25maWctPmNfaW5mby50eXBlICE9IExJQlhMX0RPTUFJTl9UWVBFX1BWKSAmJgog ICAgICAgICAoZF9jb25maWctPmJfaW5mby50YXJnZXRfbWVta2IgPCBkX2NvbmZpZy0+Yl9pbmZv Lm1heF9tZW1rYik7CiAKICAgICAvKiBXZSBjYW5ub3QgaGF2ZSBQb0QgYW5kIFBDSSBkZXZpY2Ug YXNzaWdubWVudCBhdCB0aGUgc2FtZSB0aW1lCkBAIC04ODksNyArODkwLDcgQEAgc3RhdGljIHZv aWQgaW5pdGlhdGVfZG9tYWluX2NyZWF0ZShsaWJ4bF9fZWdjICplZ2MsCiAgICAgICogZ3Vlc3Qu IFRvIHN0YXkgb24gdGhlIHNhZmUgc2lkZSwgd2UgZGlzYWJsZSBQQ0kgZGV2aWNlCiAgICAgICog YXNzaWdubWVudCB3aGVuIFBvRCBpcyBlbmFibGVkLgogICAgICAqLwotICAgIGlmIChkX2NvbmZp Zy0+Y19pbmZvLnR5cGUgPT0gTElCWExfRE9NQUlOX1RZUEVfSFZNICYmCisgICAgaWYgKGRfY29u ZmlnLT5jX2luZm8udHlwZSAhPSBMSUJYTF9ET01BSU5fVFlQRV9QViAmJgogICAgICAgICBkX2Nv bmZpZy0+bnVtX3BjaWRldnMgJiYgcG9kX2VuYWJsZWQpIHsKICAgICAgICAgcmV0ID0gRVJST1Jf SU5WQUw7CiAgICAgICAgIExPR0QoRVJST1IsIGRvbWlkLApAQCAtOTI4LDE4ICs5MjksMjAgQEAg c3RhdGljIHZvaWQgaW5pdGlhdGVfZG9tYWluX2NyZWF0ZShsaWJ4bF9fZWdjICplZ2MsCiAgICAg ICAgIGdvdG8gZXJyb3Jfb3V0OwogICAgIH0KIAotICAgIGlmIChkX2NvbmZpZy0+Y19pbmZvLnR5 cGUgPT0gTElCWExfRE9NQUlOX1RZUEVfSFZNICYmCisgICAgaWYgKGRfY29uZmlnLT5jX2luZm8u dHlwZSAhPSBMSUJYTF9ET01BSU5fVFlQRV9QViAmJgogICAgICAgICAobGlieGxfZGVmYm9vbF92 YWwoZF9jb25maWctPmJfaW5mby5uZXN0ZWRfaHZtKSAmJgotICAgICAgICAobGlieGxfZGVmYm9v bF92YWwoZF9jb25maWctPmJfaW5mby51Lmh2bS5hbHRwMm0pIHx8CisgICAgICAgICgoZF9jb25m aWctPmNfaW5mby50eXBlICE9IExJQlhMX0RPTUFJTl9UWVBFX0hWTSAmJgorICAgICAgICAgIGxp YnhsX2RlZmJvb2xfdmFsKGRfY29uZmlnLT5iX2luZm8udS5odm0uYWx0cDJtKSkgfHwKICAgICAg ICAgKGRfY29uZmlnLT5iX2luZm8uYWx0cDJtICE9IExJQlhMX0FMVFAyTV9NT0RFX0RJU0FCTEVE KSkpKSB7CiAgICAgICAgIHJldCA9IEVSUk9SX0lOVkFMOwogICAgICAgICBMT0dEKEVSUk9SLCBk b21pZCwgIm5lc3RlZGh2bSBhbmQgYWx0cDJtaHZtIGNhbm5vdCBiZSB1c2VkIHRvZ2V0aGVyIik7 CiAgICAgICAgIGdvdG8gZXJyb3Jfb3V0OwogICAgIH0KIAotICAgIGlmIChkX2NvbmZpZy0+Y19p bmZvLnR5cGUgPT0gTElCWExfRE9NQUlOX1RZUEVfSFZNICYmCi0gICAgICAgIChsaWJ4bF9kZWZi b29sX3ZhbChkX2NvbmZpZy0+Yl9pbmZvLnUuaHZtLmFsdHAybSkgfHwKLSAgICAgICAgKGRfY29u ZmlnLT5iX2luZm8uYWx0cDJtICE9IExJQlhMX0FMVFAyTV9NT0RFX0RJU0FCTEVEKSkgJiYKKyAg ICBpZiAoKChkX2NvbmZpZy0+Y19pbmZvLnR5cGUgPT0gTElCWExfRE9NQUlOX1RZUEVfSFZNICYm CisgICAgICAgICBsaWJ4bF9kZWZib29sX3ZhbChkX2NvbmZpZy0+Yl9pbmZvLnUuaHZtLmFsdHAy bSkpIHx8CisgICAgICAgIChkX2NvbmZpZy0+Y19pbmZvLnR5cGUgIT0gTElCWExfRE9NQUlOX1RZ UEVfUFYgJiYKKyAgICAgICAgIGRfY29uZmlnLT5iX2luZm8uYWx0cDJtICE9IExJQlhMX0FMVFAy TV9NT0RFX0RJU0FCTEVEKSkgJiYKICAgICAgICAgcG9kX2VuYWJsZWQpIHsKICAgICAgICAgcmV0 ID0gRVJST1JfSU5WQUw7CiAgICAgICAgIExPR0QoRVJST1IsIGRvbWlkLCAiQ2Fubm90IGVuYWJs ZSBQb0QgYW5kIEFMVFAyTSBhdCB0aGUgc2FtZSB0aW1lIik7CkBAIC0xMTIyLDcgKzExMjUsNyBA QCBzdGF0aWMgdm9pZCBkb21jcmVhdGVfYm9vdGxvYWRlcl9kb25lKGxpYnhsX19lZ2MgKmVnYywK ICAgICAgICAgICAgIGNycy0+ZG9taWQgPSBkb21pZDsKICAgICAgICAgICAgIGNycy0+c2VuZF9i YWNrX2ZkID0gZGNzLT5zZW5kX2JhY2tfZmQ7CiAgICAgICAgICAgICBjcnMtPnJlY3ZfZmQgPSBy ZXN0b3JlX2ZkOwotICAgICAgICAgICAgY3JzLT5odm0gPSAoaW5mby0+dHlwZSA9PSBMSUJYTF9E T01BSU5fVFlQRV9IVk0pOworICAgICAgICAgICAgY3JzLT5odm0gPSAoaW5mby0+dHlwZSAhPSBM SUJYTF9ET01BSU5fVFlQRV9QVik7CiAgICAgICAgICAgICBjcnMtPmNhbGxiYWNrID0gbGlieGxf X2NvbG9fcmVzdG9yZV9zZXR1cF9kb25lOwogICAgICAgICAgICAgbGlieGxfX2NvbG9fcmVzdG9y ZV9zZXR1cChlZ2MsIGNycyk7CiAgICAgICAgICAgICBicmVhazsKQEAgLTEyMDMsNiArMTIwNiwx MiBAQCBzdGF0aWMgdm9pZCBkb21jcmVhdGVfc3RyZWFtX2RvbmUobGlieGxfX2VnYyAqZWdjLAog ICAgICAgICAgICAgdm1lbnRzW2krK10gPSAoY2hhciAqKSBzdGF0ZS0+cHZfY21kbGluZTsKICAg ICAgICAgfQogICAgICAgICBicmVhazsKKyAgICBjYXNlIExJQlhMX0RPTUFJTl9UWVBFX1BWSDoK KyAgICAgICAgdm1lbnRzID0gbGlieGxfX2NhbGxvYyhnYywgMywgc2l6ZW9mKGNoYXIgKikpOwor ICAgICAgICB2bWVudHNbMF0gPSAic3RhcnRfdGltZSI7CisgICAgICAgIHZtZW50c1sxXSA9IEdD U1BSSU5URigiJWx1LiUwMmQiLCBzdGFydF90aW1lLnR2X3NlYywKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIChpbnQpc3RhcnRfdGltZS50dl91c2VjLzEwMDAwKTsKKyAgICAgICAgYnJl YWs7CiAgICAgZGVmYXVsdDoKICAgICAgICAgcmV0ID0gRVJST1JfSU5WQUw7CiAgICAgICAgIGdv dG8gb3V0OwpAQCAtMTM2NywxMiArMTM3Niw2IEBAIHN0YXRpYyB2b2lkIGRvbWNyZWF0ZV9sYXVu Y2hfZG0obGlieGxfX2VnYyAqZWdjLCBsaWJ4bF9fbXVsdGlkZXYgKm11bHRpZGV2LAogICAgICAg ICBsaWJ4bF9fZGV2aWNlX2NvbnNvbGVfYWRkKGdjLCBkb21pZCwgJmNvbnNvbGUsIHN0YXRlLCAm ZGV2aWNlKTsKICAgICAgICAgbGlieGxfX2RldmljZV9jb25zb2xlX2Rpc3Bvc2UoJmNvbnNvbGUp OwogCi0gICAgICAgIGlmIChkX2NvbmZpZy0+Yl9pbmZvLmRldmljZV9tb2RlbF92ZXJzaW9uID09 Ci0gICAgICAgICAgICBMSUJYTF9ERVZJQ0VfTU9ERUxfVkVSU0lPTl9OT05FKSB7Ci0gICAgICAg ICAgICBkb21jcmVhdGVfZGV2bW9kZWxfc3RhcnRlZChlZ2MsICZkY3MtPnNkc3MuZG0sIDApOwot ICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0KICAgICAgICAgbGlieGxfZGV2aWNlX3Zr Yl9pbml0KCZ2a2IpOwogICAgICAgICBsaWJ4bF9fZGV2aWNlX3ZrYl9hZGQoZ2MsIGRvbWlkLCAm dmtiKTsKICAgICAgICAgbGlieGxfZGV2aWNlX3ZrYl9kaXNwb3NlKCZ2a2IpOwpAQCAtMTM5NCw2 ICsxMzk3LDcgQEAgc3RhdGljIHZvaWQgZG9tY3JlYXRlX2xhdW5jaF9kbShsaWJ4bF9fZWdjICpl Z2MsIGxpYnhsX19tdWx0aWRldiAqbXVsdGlkZXYsCiAgICAgICAgIHJldHVybjsKICAgICB9CiAg ICAgY2FzZSBMSUJYTF9ET01BSU5fVFlQRV9QVjoKKyAgICBjYXNlIExJQlhMX0RPTUFJTl9UWVBF X1BWSDoKICAgICB7CiAgICAgICAgIGxpYnhsX19kZXZpY2VfY29uc29sZSBjb25zb2xlOwogICAg ICAgICBsaWJ4bF9fZGV2aWNlIGRldmljZTsKQEAgLTE3MDAsOCArMTcwNCw3IEBAIHN0YXRpYyB2 b2lkIGRvbWFpbl9zb2Z0X3Jlc2V0X2NiKGxpYnhsX19lZ2MgKmVnYywKICAgICAgICAgZ290byBl cnJvcjsKICAgICB9CiAKLSAgICBpZiAoY2Rjcy0+ZGNzLmd1ZXN0X2NvbmZpZy0+Yl9pbmZvLmRl dmljZV9tb2RlbF92ZXJzaW9uICE9Ci0gICAgICAgIExJQlhMX0RFVklDRV9NT0RFTF9WRVJTSU9O X05PTkUpIHsKKyAgICBpZiAoY2Rjcy0+ZGNzLmd1ZXN0X2NvbmZpZy0+Yl9pbmZvLnR5cGUgPT0g TElCWExfRE9NQUlOX1RZUEVfSFZNKSB7CiAgICAgICAgIHNhdmVmaWxlID0gR0NTUFJJTlRGKExJ QlhMX0RFVklDRV9NT0RFTF9TQVZFX0ZJTEUiLiVkIiwgZGRzLT5kb21pZCk7CiAgICAgICAgIHJl c3RvcmVmaWxlID0gR0NTUFJJTlRGKExJQlhMX0RFVklDRV9NT0RFTF9SRVNUT1JFX0ZJTEUiLiVk IiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGRzLT5kb21pZCk7Ci0tIAoyLjEx LjAgKEFwcGxlIEdpdC04MSkKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3Jn Cmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK