From: Olaf Hering Subject: [PATCH v1] libxl: fix device_model_version related assert Date: Thu, 16 May 2019 14:50:00 +0200 Message-ID: <20190516125000.23559-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 1hRFpt-0002ub-2f for xen-devel@lists.xenproject.org; Thu, 16 May 2019 12:50:13 +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: Wei Liu , Olaf Hering , Ian Jackson List-Id: xen-devel@lists.xenproject.org SW4gY29tbWl0IDM4MDJlY2JhYTkgKCJsaWJ4bDogYWRkIGhlbHBlciBmdW5jdGlvbiB0byBzZXQK ZGV2aWNlX21vZGVsX3ZlcnNpb24iKSBhbiBhc3NlcnQgd2FzIGFkZGVkIHRvCmxpYnhsX19kb21h aW5fYnVpbGRfaW5mb19zZXRkZWZhdWx0IHRvIG1ha2Ugc3VyZSBjYWxsZXJzIHByb3ZpZGUKY29t cGxldGUgaW5mbyB0byB0aGlzIGZ1bmN0aW9uLiBUaGlzIHVudmVpbGVkIGEgZmxhdyBpbiB0aGUg d2F5IGhvdwpsaWJ4bF9kb21haW5fYnVpbGRfaW5mbyBpcyBwYXNzZWQgdG8gbGlieGwuIFRoZSBw dWJsaWMgQVBJCmxpYnhsX2RvbWFpbl9uZWVkX21lbW9yeSBwYXNzZXMgYW4gaW5jb21wbGV0ZSBs aWJ4bF9kb21haW5fYnVpbGRfaW5mbyB0bwpsaWJ4bF9fZG9tYWluX2J1aWxkX2luZm9fc2V0ZGVm YXVsdCwgd2hpY2ggdHJpZ2dlcnMgdGhlIGFzc2VydC4gUHJpb3IgdG8KdGhlIGNoYW5nZSBhYm92 ZSwgZGV2aWNlX21vZGVsX3ZlcnNpb24gd2FzIGhhcmRjb2RlZCB0byBRRU1VX1hFTiB3aGljaAps ZWFkIHRvIHRoZSBidWdzIGRlc2NyaWJlZCBpbiB0aGF0IGNoYW5nZXNldC4KCkEgbmV3IGxpYnhs IEFQSSB3b3VsZCBuZWVkIHRvIGJlIGNyZWF0ZWQgdG8gZnVsbHkgcG9wdWxhdGUKbGlieGxfZG9t YWluX2J1aWxkX2luZm8gd2l0aCBtaXNzaW5nIGRlZmF1bHRzLiBGb3IgZXhpc3RpbmcsIHVuY2hh bmdlZApjb25zdW1lcnMgb2YgbGlieGwgdGhlIGFzc3VtcHRpb24gYWJvdXQgUUVNVV9YRU4gbmVl ZHMgdG8gYmUgcmVzdG9yZWQKd2l0aGluIHRoaXMgZnVuY3Rpb24gdG8gcHJvcGVybHkgcG9wdWxh dGUgdGhlIGFtb3VudCBvZiByZXF1aXJlZCBtZW1vcnkuCgpTaWduZWQtb2ZmLWJ5OiBPbGFmIEhl cmluZyA8b2xhZkBhZXBmbGUuZGU+ClJlcG9ydGVkLWJ5OiBKdWVyZ2VuIEdyb3NzIDxqZ3Jvc3NA c3VzZS5jb20+Ci0tLQogdG9vbHMvbGlieGwvbGlieGxfY3JlYXRlLmMgfCAxMyArKysrKysrKy0t LS0tCiAxIGZpbGUgY2hhbmdlZCwgOCBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL3Rvb2xzL2xpYnhsL2xpYnhsX2NyZWF0ZS5jIGIvdG9vbHMvbGlieGwvbGlieGxf Y3JlYXRlLmMKaW5kZXggODlmOTlmN2Y0NC4uMDMwODUxZmIyOCAxMDA2NDQKLS0tIGEvdG9vbHMv bGlieGwvbGlieGxfY3JlYXRlLmMKKysrIGIvdG9vbHMvbGlieGwvbGlieGxfY3JlYXRlLmMKQEAg LTEyMyw2ICsxMjMsNyBAQCBpbnQgbGlieGxfX2RvbWFpbl9idWlsZF9pbmZvX3NldGRlZmF1bHQo bGlieGxfX2djICpnYywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBs aWJ4bF9kb21haW5fYnVpbGRfaW5mbyAqYl9pbmZvKQogewogICAgIGludCBpLCByYzsKKyAgICBs aWJ4bF9kZXZpY2VfbW9kZWxfdmVyc2lvbiBkZXZpY2VfbW9kZWxfdmVyc2lvbjsKIAogICAgIGlm IChiX2luZm8tPnR5cGUgIT0gTElCWExfRE9NQUlOX1RZUEVfSFZNICYmCiAgICAgICAgIGJfaW5m by0+dHlwZSAhPSBMSUJYTF9ET01BSU5fVFlQRV9QViAmJgpAQCAtMTMxLDcgKzEzMiw5IEBAIGlu dCBsaWJ4bF9fZG9tYWluX2J1aWxkX2luZm9fc2V0ZGVmYXVsdChsaWJ4bF9fZ2MgKmdjLAogICAg ICAgICByZXR1cm4gRVJST1JfSU5WQUw7CiAgICAgfQogCi0gICAgYXNzZXJ0KGJfaW5mby0+ZGV2 aWNlX21vZGVsX3ZlcnNpb24pOworICAgIGRldmljZV9tb2RlbF92ZXJzaW9uID0gYl9pbmZvLT5k ZXZpY2VfbW9kZWxfdmVyc2lvbjsKKyAgICBpZiAoIWRldmljZV9tb2RlbF92ZXJzaW9uKQorICAg ICAgICBkZXZpY2VfbW9kZWxfdmVyc2lvbiA9IExJQlhMX0RFVklDRV9NT0RFTF9WRVJTSU9OX1FF TVVfWEVOOwogCiAgICAgLyogQ29weSBkZXByZWNhdGVkIG9wdGlvbnMgdG8gaXQncyBuZXcgcG9z aXRpb24uICovCiAgICAgcmMgPSBsaWJ4bF9fZG9tYWluX2J1aWxkX2luZm9fY29weV9kZXByZWNh dGVkKENUWCwgYl9pbmZvKTsKQEAgLTE0OSw3ICsxNTIsNyBAQCBpbnQgbGlieGxfX2RvbWFpbl9i dWlsZF9pbmZvX3NldGRlZmF1bHQobGlieGxfX2djICpnYywKIAogICAgIGlmIChiX2luZm8tPnR5 cGUgPT0gTElCWExfRE9NQUlOX1RZUEVfSFZNKSB7CiAgICAgICAgIGlmICghYl9pbmZvLT51Lmh2 bS5iaW9zKQotICAgICAgICAgICAgc3dpdGNoIChiX2luZm8tPmRldmljZV9tb2RlbF92ZXJzaW9u KSB7CisgICAgICAgICAgICBzd2l0Y2ggKGRldmljZV9tb2RlbF92ZXJzaW9uKSB7CiAgICAgICAg ICAgICBjYXNlIExJQlhMX0RFVklDRV9NT0RFTF9WRVJTSU9OX1FFTVVfWEVOX1RSQURJVElPTkFM OgogICAgICAgICAgICAgICAgIGJfaW5mby0+dS5odm0uYmlvcyA9IExJQlhMX0JJT1NfVFlQRV9S T01CSU9TOyBicmVhazsKICAgICAgICAgICAgIGNhc2UgTElCWExfREVWSUNFX01PREVMX1ZFUlNJ T05fUUVNVV9YRU46CkBAIC0xNjAsNyArMTYzLDcgQEAgaW50IGxpYnhsX19kb21haW5fYnVpbGRf aW5mb19zZXRkZWZhdWx0KGxpYnhsX19nYyAqZ2MsCiAgICAgICAgICAgICB9CiAKICAgICAgICAg LyogRW5mb3JjZSBCSU9TPC0+RGV2aWNlIE1vZGVsIHZlcnNpb24gcmVsYXRpb25zaGlwICovCi0g ICAgICAgIHN3aXRjaCAoYl9pbmZvLT5kZXZpY2VfbW9kZWxfdmVyc2lvbikgeworICAgICAgICBz d2l0Y2ggKGRldmljZV9tb2RlbF92ZXJzaW9uKSB7CiAgICAgICAgIGNhc2UgTElCWExfREVWSUNF X01PREVMX1ZFUlNJT05fUUVNVV9YRU5fVFJBRElUSU9OQUw6CiAgICAgICAgICAgICBpZiAoYl9p bmZvLT51Lmh2bS5iaW9zICE9IExJQlhMX0JJT1NfVFlQRV9ST01CSU9TKSB7CiAgICAgICAgICAg ICAgICAgTE9HKEVSUk9SLCAicWVtdS14ZW4tdHJhZGl0aW9uYWwgcmVxdWlyZXMgYmlvcz1yb21i aW9zLiIpOwpAQCAtMTg2LDcgKzE4OSw3IEBAIGludCBsaWJ4bF9fZG9tYWluX2J1aWxkX2luZm9f c2V0ZGVmYXVsdChsaWJ4bF9fZ2MgKmdjLAogICAgIH0KIAogICAgIGlmIChiX2luZm8tPnR5cGUg PT0gTElCWExfRE9NQUlOX1RZUEVfSFZNICYmCi0gICAgICAgIGJfaW5mby0+ZGV2aWNlX21vZGVs X3ZlcnNpb24gIT0KKyAgICAgICAgZGV2aWNlX21vZGVsX3ZlcnNpb24gIT0KICAgICAgICAgICAg IExJQlhMX0RFVklDRV9NT0RFTF9WRVJTSU9OX1FFTVVfWEVOX1RSQURJVElPTkFMICYmCiAgICAg ICAgIGxpYnhsX2RlZmJvb2xfdmFsKGJfaW5mby0+ZGV2aWNlX21vZGVsX3N0dWJkb21haW4pKSB7 CiAgICAgICAgIExPRyhFUlJPUiwKQEAgLTI1OSw3ICsyNjIsNyBAQCBpbnQgbGlieGxfX2RvbWFp bl9idWlsZF9pbmZvX3NldGRlZmF1bHQobGlieGxfX2djICpnYywKICAgICAgICAgaWYgKCFiX2lu Zm8tPnUuaHZtLmhkdHlwZSkKICAgICAgICAgICAgIGJfaW5mby0+dS5odm0uaGR0eXBlID0gTElC WExfSERUWVBFX0lERTsKIAotICAgICAgICBzd2l0Y2ggKGJfaW5mby0+ZGV2aWNlX21vZGVsX3Zl cnNpb24pIHsKKyAgICAgICAgc3dpdGNoIChkZXZpY2VfbW9kZWxfdmVyc2lvbikgewogICAgICAg ICBjYXNlIExJQlhMX0RFVklDRV9NT0RFTF9WRVJTSU9OX1FFTVVfWEVOX1RSQURJVElPTkFMOgog ICAgICAgICAgICAgc3dpdGNoIChiX2luZm8tPnUuaHZtLnZnYS5raW5kKSB7CiAgICAgICAgICAg ICBjYXNlIExJQlhMX1ZHQV9JTlRFUkZBQ0VfVFlQRV9OT05FOgoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4t ZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9t YWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA==