From: Olaf Hering Subject: [PATCH v1] libxl: fix migration of PV and PVH domUs with and without qemu Date: Wed, 10 Apr 2019 12:33:38 +0200 Message-ID: <20190410103338.5456-1-olaf@aepfle.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hEAYE-0001Vn-PE for xen-devel@lists.xenproject.org; Wed, 10 Apr 2019 10:33:55 +0000 List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: Anthony PERARD , Wei Liu , Olaf Hering , Ian Jackson , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= List-Id: xen-devel@lists.xenproject.org SWYgYSBkb21VIGhhcyBhIHFlbXUteGVuIGluc3RhbmNlIGF0dGFjaGVkLCBpdCBpcyByZXF1aXJl ZCB0byBjYWxsIHFlbXVzCiJ4ZW4tc2F2ZS1kZXZpY2VzLXN0YXRlIiBtZXRob2QuIFdpdGhvdXQg aXQsIHRoZSByZWNlaXZpbmcgc2lkZSBvZiBhIFBWIG9yClBWSCBtaWdyYXRpb24gbWF5IGJlIHVu YWJsZSB0byBsb2NrIHRoZSBpbWFnZToKCnhlbiBiZTogcWRpc2stNTE3MTI6IHhlbiBiZTogcWRp c2stNTE3MTI6IGVycm9yOiBGYWlsZWQgdG8gZ2V0ICJ3cml0ZSIgbG9jawplcnJvcjogRmFpbGVk IHRvIGdldCAid3JpdGUiIGxvY2sKeGVuIGJlOiBxZGlzay01MTcxMjogeGVuIGJlOiBxZGlzay01 MTcxMjogaW5pdGlhbGlzZSgpIGZhaWxlZAppbml0aWFsaXNlKCkgZmFpbGVkCgpUbyBmaXggdGhp cyBidWcsIGxpYnhsX19kb21haW5fc3VzcGVuZF9kZXZpY2VfbW9kZWwoKSBhbmQKbGlieGxfX2Rv bWFpbl9yZXN1bWVfZGV2aWNlX21vZGVsKCkgaGF2ZSB0byBiZSBjYWxsZWQgbm90IG9ubHkgZm9y IEhWTSwKYnV0IGFsc28gaWYgdGhlIGFjdGl2ZSBkZXZpY2VfbW9kZWwgaXMgUUVNVV9YRU4uCgpV bmZvcnR1bmF0ZWx5LCBsaWJ4bF9fZG9tYWluX2J1aWxkX2luZm9fc2V0ZGVmYXVsdCgpIGhhcmRj b2RlcwpiX2luZm8tPmRldmljZV9tb2RlbF92ZXJzaW9uIHRvIFFFTVVfWEVOIGlmIGl0IGRvZXMg bm90IGtub3cgaXQgYW55CmJldHRlci4gVGhpcyBicmVha3MgZG9tVXMgd2l0aG91dCBhIGRldmlj ZV9tb2RlbC4gbGlieGxfX3FtcF9zdG9wKCkgd291bGQKd2FpdCAxMCBzZWNvbmRzIGluIHFtcF9v cGVuKCkgZm9yIGEgcWVtdSB0aGF0IHdpbGwgbmV2ZXIgYXBwZWFyLiAgRHVyaW5nCnRoaXMgbG9u ZyB0aW1lZnJhbWUgdGhlIGRvbVUgcmVtYWlucyBpbiBzdGF0ZSBwYXVzZWQgb24gdGhlIHNlbmRp bmcgc2lkZS4KQXMgYSByZXN1bHQgbmV0d29yayBjb25uZWN0aW9ucyBtYXkgYmUgZHJvcHBlZC4g T25jZSB0aGlzIGJ1ZyBpcyBmaXhlZCBhcwp3ZWxsLCBieSBqdXN0IHJlbW92aW5nIHRoYXQgYXNz dW1wdGlvbiwgdGhlcmUgaXMgbm8gY29kZSB0byBhY3R1YWxseQppbml0aWFsaXNlIGJfaW5mby0+ ZGV2aWNlX21vZGVsX3ZlcnNpb24uCgpUaGVyZSBpcyBhIGhlbHBlciBmdW5jdGlvbiBsaWJ4bF9f bmVlZF94ZW5wdl9xZW11KCksIHdoaWNoIGlzIHVzZWQgaW4KdmFyaW91cyBwbGFjZXMgdG8gZGVj aWRlIGlmIGFueSBkZXZpY2VfbW9kZWwgaGFzIHRvIGJlIHNwYXduZWQuIFRoaXMKZnVuY3Rpb24g Y2FuIG5vdCBiZSB1c2VkIGFzIGlzLCBqdXN0IHRvIGZpbGwgYl9pbmZvLT5kZXZpY2VfbW9kZWxf dmVyc2lvbiwKYmVjYXVzZSBzdG9yZV9saWJ4bF9lbnRyeSgpIHdhcyBhbHJlYWR5IGNhbGxlZCBl YXJsaWVyLiBVcGRhdGUgdGhpcwpmdW5jdGlvbiB0byByZWNlaXZlIGEgZG9taWQgdG8gd29yayB3 aXRoLCBpbnN0ZWFkIG9mIHJlYWRpbmcgeGVuc3RvcmUuCgpSZWFycmFuZ2UgdGhlIGNvZGUgYW5k IGluaXRpYWxpemUgYl9pbmZvLT5kZXZpY2VfbW9kZWxfdmVyc2lvbiBpbgpsaWJ4bF9fZG9tYWlu X2J1aWxkX2luZm9fc2V0ZGVmYXVsdCgpIHBlciBET01BSU5fVFlQRS4KClVwZGF0ZSBpbml0aWF0 ZV9kb21haW5fY3JlYXRlKCkgdG8gc2V0IGJfaW5mby0+ZGV2aWNlX21vZGVsX3ZlcnNpb24gaWYg aXQKd2FzIG5vdCBzZXQgZWFybGllciwgdXNpbmcgdGhlIHVwZGF0ZWQgbGlieGxfX25lZWRfeGVu cHZfcWVtdSgpLgoKSW50cm9kdWNlIExJQlhMX0RFVklDRV9NT0RFTF9WRVJTSU9OX05PTkVfUkVR VUlSRUQgZm9yIFBWIGFuZCBQVkggdGhhdApoYXZlIG5vIG5lZWQgZm9yIGEgZGV2aWNlX21vZGVs LgoKVXBkYXRlIGV4aXN0aW5nIHVzZXJzIG9mIGxpYnhsX19uZWVkX3hlbnB2X3FlbXUoKSB0byB1 c2UKYl9pbmZvLT5kZXZpY2VfbW9kZWxfdmVyc2lvbiBmb3IgdGhlaXIgY2hlY2sgaWYgYSBkZXZp Y2VfbW9kZWwgaXMgbmVlZGVkLgoKU2lnbmVkLW9mZi1ieTogT2xhZiBIZXJpbmcgPG9sYWZAYWVw ZmxlLmRlPgpDYzogUm9nZXIgUGF1IE1vbm7DqSA8cm9nZXIucGF1QGNpdHJpeC5jb20+CkNjOiBB bnRob255IFBFUkFSRCA8YW50aG9ueS5wZXJhcmRAY2l0cml4LmNvbT4KLS0tCiB0b29scy9saWJ4 bC9saWJ4bF9jcmVhdGUuYyAgICAgIHwgMzcgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr LS0tLS0tLQogdG9vbHMvbGlieGwvbGlieGxfZG0uYyAgICAgICAgICB8IDM4ICsrKysrKysrKysr KysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tCiB0b29scy9saWJ4bC9saWJ4bF9kb21fc3VzcGVu ZC5jIHwgIDggKysrKysrLS0KIHRvb2xzL2xpYnhsL2xpYnhsX2ludGVybmFsLmggICAgfCAgMyAr Ky0KIHRvb2xzL2xpYnhsL2xpYnhsX3R5cGVzLmlkbCAgICAgfCAgMSArCiA1IGZpbGVzIGNoYW5n ZWQsIDYxIGluc2VydGlvbnMoKyksIDI2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Rvb2xz L2xpYnhsL2xpYnhsX2NyZWF0ZS5jIGIvdG9vbHMvbGlieGwvbGlieGxfY3JlYXRlLmMKaW5kZXgg ODlmZTgwZmM5Yy4uNzc4NDE3ZjM4NiAxMDA2NDQKLS0tIGEvdG9vbHMvbGlieGwvbGlieGxfY3Jl YXRlLmMKKysrIGIvdG9vbHMvbGlieGwvbGlieGxfY3JlYXRlLmMKQEAgLTg3LDE2ICs4NywyMCBA QCBpbnQgbGlieGxfX2RvbWFpbl9idWlsZF9pbmZvX3NldGRlZmF1bHQobGlieGxfX2djICpnYywK ICAgICAgICAgYl9pbmZvLT5kZXZpY2VfbW9kZWxfc3NpZHJlZiA9IFNFQ0lOSVRTSURfRE9NRE07 CiAKICAgICBpZiAoIWJfaW5mby0+ZGV2aWNlX21vZGVsX3ZlcnNpb24pIHsKLSAgICAgICAgaWYg KGJfaW5mby0+dHlwZSA9PSBMSUJYTF9ET01BSU5fVFlQRV9IVk0pIHsKKyAgICAgICAgc3dpdGNo IChiX2luZm8tPnR5cGUpIHsKKyAgICAgICAgY2FzZSBMSUJYTF9ET01BSU5fVFlQRV9IVk06CiAg ICAgICAgICAgICBpZiAobGlieGxfZGVmYm9vbF92YWwoYl9pbmZvLT5kZXZpY2VfbW9kZWxfc3R1 YmRvbWFpbikpIHsKICAgICAgICAgICAgICAgICBiX2luZm8tPmRldmljZV9tb2RlbF92ZXJzaW9u ID0KICAgICAgICAgICAgICAgICAgICAgTElCWExfREVWSUNFX01PREVMX1ZFUlNJT05fUUVNVV9Y RU5fVFJBRElUSU9OQUw7CiAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgIGJf aW5mby0+ZGV2aWNlX21vZGVsX3ZlcnNpb24gPSBsaWJ4bF9fZGVmYXVsdF9kZXZpY2VfbW9kZWwo Z2MpOwogICAgICAgICAgICAgfQotICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgYl9pbmZv LT5kZXZpY2VfbW9kZWxfdmVyc2lvbiA9Ci0gICAgICAgICAgICAgICAgTElCWExfREVWSUNFX01P REVMX1ZFUlNJT05fUUVNVV9YRU47CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBM SUJYTF9ET01BSU5fVFlQRV9QVjoKKyAgICAgICAgY2FzZSBMSUJYTF9ET01BSU5fVFlQRV9QVkg6 CisgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICAvKiB3aWxsIGJlIHNldCBsYXRlciAqLwor ICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KICAgICAgICAgaWYgKGJfaW5mby0+ZGV2aWNl X21vZGVsX3ZlcnNpb24KICAgICAgICAgICAgICAgICA9PSBMSUJYTF9ERVZJQ0VfTU9ERUxfVkVS U0lPTl9RRU1VX1hFTikgewpAQCAtOTc4LDYgKzk4MiwxNyBAQCBzdGF0aWMgdm9pZCBpbml0aWF0 ZV9kb21haW5fY3JlYXRlKGxpYnhsX19lZ2MgKmVnYywKICAgICAgICAgZ290byBlcnJvcl9vdXQ7 CiAgICAgfQogCisgICAgaWYgKGRfY29uZmlnLT5iX2luZm8uZGV2aWNlX21vZGVsX3ZlcnNpb24K KyAgICAgICAgPT0gTElCWExfREVWSUNFX01PREVMX1ZFUlNJT05fVU5LTk9XTikgeworICAgICAg ICByZXQgPSBsaWJ4bF9fbmVlZF94ZW5wdl9xZW11KGdjLCBkX2NvbmZpZywgZG9taWQpOworICAg ICAgICBpZiAocmV0KQorICAgICAgICAgICAgZF9jb25maWctPmJfaW5mby5kZXZpY2VfbW9kZWxf dmVyc2lvbiA9CisgICAgICAgICAgICAgICAgTElCWExfREVWSUNFX01PREVMX1ZFUlNJT05fUUVN VV9YRU47CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGRfY29uZmlnLT5iX2luZm8uZGV2aWNl X21vZGVsX3ZlcnNpb24gPQorICAgICAgICAgICAgICAgIExJQlhMX0RFVklDRV9NT0RFTF9WRVJT SU9OX05PTkVfUkVRVUlSRUQ7CisgICAgfQorCiAgICAgZGNzLT5ndWVzdF9kb21pZCA9IGRvbWlk OwogICAgIGRjcy0+c2Rzcy5kbS5ndWVzdF9kb21pZCA9IDA7IC8qIG1lYW5zIHdlIGhhdmVuJ3Qg c3Bhd25lZCAqLwogCkBAIC0xMzEyLDYgKzEzMjcsNyBAQCBzdGF0aWMgdm9pZCBkb21jcmVhdGVf bGF1bmNoX2RtKGxpYnhsX19lZ2MgKmVnYywgbGlieGxfX211bHRpZGV2ICptdWx0aWRldiwKICAg ICBsaWJ4bF9fZG9tYWluX2NyZWF0ZV9zdGF0ZSAqZGNzID0gQ09OVEFJTkVSX09GKG11bHRpZGV2 LCAqZGNzLCBtdWx0aWRldik7CiAgICAgU1RBVEVfQU9fR0MoZGNzLT5hbyk7CiAgICAgaW50IGk7 CisgICAgYm9vbCBuZWVkX3FlbXU7CiAKICAgICAvKiBjb252ZW5pZW5jZSBhbGlhc2VzICovCiAg ICAgY29uc3QgdWludDMyX3QgZG9taWQgPSBkY3MtPmd1ZXN0X2RvbWlkOwpAQCAtMTQ2NCwxMCAr MTQ4MCwxNyBAQCBzdGF0aWMgdm9pZCBkb21jcmVhdGVfbGF1bmNoX2RtKGxpYnhsX19lZ2MgKmVn YywgbGlieGxfX211bHRpZGV2ICptdWx0aWRldiwKICAgICAgICAgbGlieGxfX2RldmljZV9jb25z b2xlX2FkZChnYywgZG9taWQsICZjb25zb2xlLCBzdGF0ZSwgJmRldmljZSk7CiAgICAgICAgIGxp YnhsX19kZXZpY2VfY29uc29sZV9kaXNwb3NlKCZjb25zb2xlKTsKIAotICAgICAgICByZXQgPSBs aWJ4bF9fbmVlZF94ZW5wdl9xZW11KGdjLCBkX2NvbmZpZyk7Ci0gICAgICAgIGlmIChyZXQgPCAw KQorICAgICAgICBzd2l0Y2ggKGRfY29uZmlnLT5iX2luZm8uZGV2aWNlX21vZGVsX3ZlcnNpb24p IHsKKyAgICAgICAgICAgIGNhc2UgTElCWExfREVWSUNFX01PREVMX1ZFUlNJT05fUUVNVV9YRU5f VFJBRElUSU9OQUw6CisgICAgICAgICAgICBjYXNlIExJQlhMX0RFVklDRV9NT0RFTF9WRVJTSU9O X1FFTVVfWEVOOgorICAgICAgICAgICAgICAgIG5lZWRfcWVtdSA9IHRydWU7CisgICAgICAgICAg ICAgICAgYnJlYWs7CisgICAgICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgICAgIG5lZWRf cWVtdSA9IGZhbHNlOworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9CiAgICAgICAg ICAgICBnb3RvIGVycm9yX291dDsKLSAgICAgICAgaWYgKHJldCkgeworICAgICAgICBpZiAobmVl ZF9xZW11KSB7CiAgICAgICAgICAgICBkY3MtPnNkc3MuZG0uZ3Vlc3RfZG9taWQgPSBkb21pZDsK ICAgICAgICAgICAgIGxpYnhsX19zcGF3bl9sb2NhbF9kbShlZ2MsICZkY3MtPnNkc3MuZG0pOwog ICAgICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEvdG9vbHMvbGlieGwvbGlieGxfZG0uYyBi L3Rvb2xzL2xpYnhsL2xpYnhsX2RtLmMKaW5kZXggMmYxOTc4NmJkZC4uNWU4NjFhODExMSAxMDA2 NDQKLS0tIGEvdG9vbHMvbGlieGwvbGlieGxfZG0uYworKysgYi90b29scy9saWJ4bC9saWJ4bF9k bS5jCkBAIC0yMjY4LDcgKzIyNjgsNyBAQCBzdGF0aWMgdm9pZCBzcGF3bl9zdHViX2xhdW5jaF9k bShsaWJ4bF9fZWdjICplZ2MsCiAgICAgbGlieGxfX2RvbWFpbl9idWlsZF9zdGF0ZSAqY29uc3Qg ZF9zdGF0ZSA9IHNkc3MtPmRtLmJ1aWxkX3N0YXRlOwogICAgIGxpYnhsX19kb21haW5fYnVpbGRf c3RhdGUgKmNvbnN0IHN0dWJkb21fc3RhdGUgPSAmc2Rzcy0+ZG1fc3RhdGU7CiAgICAgdWludDMy X3QgZG1fZG9taWQgPSBzZHNzLT5wdnFlbXUuZ3Vlc3RfZG9taWQ7Ci0gICAgaW50IG5lZWRfcWVt dTsKKyAgICBib29sIG5lZWRfcWVtdTsKIAogICAgIGlmIChyZXQpIHsKICAgICAgICAgTE9HRChF UlJPUiwgZ3Vlc3RfZG9taWQsICJlcnJvciBjb25uZWN0aW5nIGRpc2sgZGV2aWNlcyIpOwpAQCAt MjMzNyw3ICsyMzM3LDE1IEBAIHN0YXRpYyB2b2lkIHNwYXduX3N0dWJfbGF1bmNoX2RtKGxpYnhs X19lZ2MgKmVnYywKICAgICAgICAgfQogICAgIH0KIAotICAgIG5lZWRfcWVtdSA9IGxpYnhsX19u ZWVkX3hlbnB2X3FlbXUoZ2MsIGRtX2NvbmZpZyk7CisgICAgc3dpdGNoIChkbV9jb25maWctPmJf aW5mby5kZXZpY2VfbW9kZWxfdmVyc2lvbikgeworICAgICAgICBjYXNlIExJQlhMX0RFVklDRV9N T0RFTF9WRVJTSU9OX1FFTVVfWEVOX1RSQURJVElPTkFMOgorICAgICAgICBjYXNlIExJQlhMX0RF VklDRV9NT0RFTF9WRVJTSU9OX1FFTVVfWEVOOgorICAgICAgICAgICAgbmVlZF9xZW11ID0gdHJ1 ZTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgbmVl ZF9xZW11ID0gZmFsc2U7CisgICAgICAgICAgICBicmVhazsKKyAgICB9CiAKICAgICBmb3IgKGkg PSAwOyBpIDwgbnVtX2NvbnNvbGU7IGkrKykgewogICAgICAgICBsaWJ4bF9fZGV2aWNlIGRldmlj ZTsKQEAgLTMxNzUsMTggKzMxODMsMTEgQEAgc3RhdGljIHZvaWQga2lsbF9kZXZpY2VfbW9kZWxf dWlkX2NiKGxpYnhsX19lZ2MgKmVnYywKIH0KIAogLyogUmV0dXJuIDAgaWYgbm8gZG0gbmVlZGVk LCAxIGlmIG5lZWRlZCBhbmQgPDAgaWYgZXJyb3IuICovCi1pbnQgbGlieGxfX25lZWRfeGVucHZf cWVtdShsaWJ4bF9fZ2MgKmdjLCBsaWJ4bF9kb21haW5fY29uZmlnICpkX2NvbmZpZykKK2ludCBs aWJ4bF9fbmVlZF94ZW5wdl9xZW11KGxpYnhsX19nYyAqZ2MsIGxpYnhsX2RvbWFpbl9jb25maWcg KmRfY29uZmlnLCB1aW50MzJfdCBkb21pZCkKIHsKICAgICBpbnQgaWR4LCBpLCByZXQsIG51bTsK LSAgICB1aW50MzJfdCBkb21pZDsKICAgICBjb25zdCBzdHJ1Y3QgbGlieGxfZGV2aWNlX3R5cGUg KmR0OwogCi0gICAgcmV0ID0gbGlieGxfX2dldF9kb21pZChnYywgJmRvbWlkKTsKLSAgICBpZiAo cmV0KSB7Ci0gICAgICAgIExPRyhFUlJPUiwgInVuYWJsZSB0byBnZXQgZG9tYWluIGlkIik7Ci0g ICAgICAgIGdvdG8gb3V0OwotICAgIH0KLQogICAgIGlmIChkX2NvbmZpZy0+bnVtX3ZmYnMgPiAw IHx8IGRfY29uZmlnLT5udW1fcDlzID4gMCkgewogICAgICAgICByZXQgPSAxOwogICAgICAgICBn b3RvIG91dDsKQEAgLTMyMzgsMjEgKzMyMzksMjYgQEAgaW50IGxpYnhsX19kbV9jaGVja19zdGFy dChsaWJ4bF9fZ2MgKmdjLCBsaWJ4bF9kb21haW5fY29uZmlnICpkX2NvbmZpZywKICAgICAgICAg ICAgICAgICAgICAgICAgICAgdWludDMyX3QgZG9taWQpCiB7CiAgICAgaW50IHJjOworICAgIGJv b2wgbmVlZF9xZW11OwogCiAgICAgaWYgKGxpYnhsX19kbV9hY3RpdmUoZ2MsIGRvbWlkKSkKICAg ICAgICAgcmV0dXJuIDA7CiAKLSAgICByYyA9IGxpYnhsX19uZWVkX3hlbnB2X3FlbXUoZ2MsIGRf Y29uZmlnKTsKLSAgICBpZiAocmMgPCAwKQotICAgICAgICBnb3RvIG91dDsKLQotICAgIGlmICgh cmMpCisgICAgc3dpdGNoIChkX2NvbmZpZy0+Yl9pbmZvLmRldmljZV9tb2RlbF92ZXJzaW9uKSB7 CisgICAgICAgIGNhc2UgTElCWExfREVWSUNFX01PREVMX1ZFUlNJT05fUUVNVV9YRU5fVFJBRElU SU9OQUw6CisgICAgICAgIGNhc2UgTElCWExfREVWSUNFX01PREVMX1ZFUlNJT05fUUVNVV9YRU46 CisgICAgICAgICAgICBuZWVkX3FlbXUgPSB0cnVlOworICAgICAgICAgICAgYnJlYWs7CisgICAg ICAgIGRlZmF1bHQ6CisgICAgICAgICAgICBuZWVkX3FlbXUgPSBmYWxzZTsKKyAgICAgICAgICAg IGJyZWFrOworICAgIH0KKyAgICBpZiAobmVlZF9xZW11ID09IGZhbHNlKQogICAgICAgICByZXR1 cm4gMDsKIAogICAgIExPR0QoRVJST1IsIGRvbWlkLCAiZGV2aWNlIG1vZGVsIHJlcXVpcmVkIGJ1 dCBub3QgcnVubmluZyIpOwogICAgIHJjID0gRVJST1JfRkFJTDsKIAotb3V0OgogICAgIHJldHVy biByYzsKIH0KIApkaWZmIC0tZ2l0IGEvdG9vbHMvbGlieGwvbGlieGxfZG9tX3N1c3BlbmQuYyBi L3Rvb2xzL2xpYnhsL2xpYnhsX2RvbV9zdXNwZW5kLmMKaW5kZXggZDFhZjNhNjU3My4uYzQ5MmZl NWRkMSAxMDA2NDQKLS0tIGEvdG9vbHMvbGlieGwvbGlieGxfZG9tX3N1c3BlbmQuYworKysgYi90 b29scy9saWJ4bC9saWJ4bF9kb21fc3VzcGVuZC5jCkBAIC0zNzksNyArMzc5LDkgQEAgc3RhdGlj IHZvaWQgZG9tYWluX3N1c3BlbmRfY29tbW9uX2d1ZXN0X3N1c3BlbmRlZChsaWJ4bF9fZWdjICpl Z2MsCiAgICAgbGlieGxfX2V2X3hzd2F0Y2hfZGVyZWdpc3RlcihnYywgJmRzcHMtPmd1ZXN0X3dh dGNoKTsKICAgICBsaWJ4bF9fZXZfdGltZV9kZXJlZ2lzdGVyKGdjLCAmZHNwcy0+Z3Vlc3RfdGlt ZW91dCk7CiAKLSAgICBpZiAoZHNwcy0+dHlwZSA9PSBMSUJYTF9ET01BSU5fVFlQRV9IVk0pIHsK KyAgICBpZiAoZHNwcy0+dHlwZSA9PSBMSUJYTF9ET01BSU5fVFlQRV9IVk0gfHwKKyAgICAgICAg bGlieGxfX2RldmljZV9tb2RlbF92ZXJzaW9uX3J1bm5pbmcoZ2MsIGRzcHMtPmRvbWlkKSA9PQor ICAgICAgICBMSUJYTF9ERVZJQ0VfTU9ERUxfVkVSU0lPTl9RRU1VX1hFTikgewogICAgICAgICBk c3BzLT5jYWxsYmFja19kZXZpY2VfbW9kZWxfZG9uZSA9IGRvbWFpbl9zdXNwZW5kX2NvbW1vbl9k b25lOwogICAgICAgICBsaWJ4bF9fZG9tYWluX3N1c3BlbmRfZGV2aWNlX21vZGVsKGVnYywgZHNw cyk7IC8qIG11c3QgYmUgbGFzdCAqLwogICAgICAgICByZXR1cm47CkBAIC00NTksNyArNDYxLDkg QEAgaW50IGxpYnhsX19kb21haW5fcmVzdW1lKGxpYnhsX19nYyAqZ2MsIHVpbnQzMl90IGRvbWlk LCBpbnQgc3VzcGVuZF9jYW5jZWwpCiAgICAgICAgIGdvdG8gb3V0OwogICAgIH0KIAotICAgIGlm ICh0eXBlID09IExJQlhMX0RPTUFJTl9UWVBFX0hWTSkgeworICAgIGlmICh0eXBlID09IExJQlhM X0RPTUFJTl9UWVBFX0hWTSB8fAorICAgICAgICBsaWJ4bF9fZGV2aWNlX21vZGVsX3ZlcnNpb25f cnVubmluZyhnYywgZG9taWQpID09CisgICAgICAgIExJQlhMX0RFVklDRV9NT0RFTF9WRVJTSU9O X1FFTVVfWEVOKSB7CiAgICAgICAgIHJjID0gbGlieGxfX2RvbWFpbl9yZXN1bWVfZGV2aWNlX21v ZGVsKGdjLCBkb21pZCk7CiAgICAgICAgIGlmIChyYykgewogICAgICAgICAgICAgTE9HRChFUlJP UiwgZG9taWQsICJmYWlsZWQgdG8gcmVzdW1lIGRldmljZSBtb2RlbDolZCIsIHJjKTsKZGlmZiAt LWdpdCBhL3Rvb2xzL2xpYnhsL2xpYnhsX2ludGVybmFsLmggYi90b29scy9saWJ4bC9saWJ4bF9p bnRlcm5hbC5oCmluZGV4IDQ0ZTAyMjEyODQuLjllYjQyMTFkODUgMTAwNjQ0Ci0tLSBhL3Rvb2xz L2xpYnhsL2xpYnhsX2ludGVybmFsLmgKKysrIGIvdG9vbHMvbGlieGwvbGlieGxfaW50ZXJuYWwu aApAQCAtMTgxNyw3ICsxODE3LDggQEAgX2hpZGRlbiBpbnQgbGlieGxfX2RvbWFpbl9idWlsZChs aWJ4bF9fZ2MgKmdjLAogX2hpZGRlbiBjb25zdCBjaGFyICpsaWJ4bF9fZG9tYWluX2RldmljZV9t b2RlbChsaWJ4bF9fZ2MgKmdjLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGNvbnN0IGxpYnhsX2RvbWFpbl9idWlsZF9pbmZvICppbmZvKTsKIF9oaWRkZW4gaW50IGxp YnhsX19uZWVkX3hlbnB2X3FlbXUobGlieGxfX2djICpnYywKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgbGlieGxfZG9tYWluX2NvbmZpZyAqZF9jb25maWcpOworICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBsaWJ4bF9kb21haW5fY29uZmlnICpkX2NvbmZpZywK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdWludDMyX3QgZG9taWQpOwogX2hp ZGRlbiBib29sIGxpYnhsX19xdWVyeV9xZW11X2JhY2tlbmQobGlieGxfX2djICpnYywKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQzMl90IGRvbWlkLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdWludDMyX3QgYmFja2VuZF9pZCwKZGlm ZiAtLWdpdCBhL3Rvb2xzL2xpYnhsL2xpYnhsX3R5cGVzLmlkbCBiL3Rvb2xzL2xpYnhsL2xpYnhs X3R5cGVzLmlkbAppbmRleCBjYjQ3MDJmZDdhLi43ZDc1YmQzODUwIDEwMDY0NAotLS0gYS90b29s cy9saWJ4bC9saWJ4bF90eXBlcy5pZGwKKysrIGIvdG9vbHMvbGlieGwvbGlieGxfdHlwZXMuaWRs CkBAIC0xMDYsNiArMTA2LDcgQEAgbGlieGxfZGV2aWNlX21vZGVsX3ZlcnNpb24gPSBFbnVtZXJh dGlvbigiZGV2aWNlX21vZGVsX3ZlcnNpb24iLCBbCiAgICAgKDAsICJVTktOT1dOIiksCiAgICAg KDEsICJRRU1VX1hFTl9UUkFESVRJT05BTCIpLCAjIEhpc3RvcmljYWwgcWVtdS14ZW4gZGV2aWNl IG1vZGVsIChxZW11LWRtKQogICAgICgyLCAiUUVNVV9YRU4iKSwgICAgICAgICAgICAgIyBVcHN0 cmVhbSBiYXNlZCBxZW11LXhlbiBkZXZpY2UgbW9kZWwKKyAgICAoMywgIk5PTkVfUkVRVUlSRUQi KSwKICAgICBdKQogCiBsaWJ4bF9jb25zb2xlX3R5cGUgPSBFbnVtZXJhdGlvbigiY29uc29sZV90 eXBlIiwgWwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K WGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0 cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA==