From: Olaf Hering Subject: [PATCH v1] libxl: add helper function to set device_model_version Date: Tue, 14 May 2019 09:27:41 +0200 Message-ID: <20190514072741.11760-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 1hQRqt-00054T-25 for xen-devel@lists.xenproject.org; Tue, 14 May 2019 07:27: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: Wei Liu , Olaf Hering , Ian Jackson List-Id: xen-devel@lists.xenproject.org QW4gdXBjb21pbmcgY2hhbmdlIHdpbGwgc2V0IHRoZSB2YWx1ZSBvZiBkZXZpY2VfbW9kZWxfdmVy c2lvbiBwcm9wZXJseQphbHNvIGZvciB0aGUgbm9uLUhWTSBjYXNlLgoKTW92ZSBleGlzdGluZyBj b2RlIHRvIG5ldyBmdW5jdGlvbiBsaWJ4bF9fZG9tYWluX3NldF9kZXZpY2VfbW9kZWwuCk1vdmUg YWxzbyBpbml0aWFsaXphdGlvbiBmb3IgZGV2aWNlX21vZGVsX3N0dWJkb21haW4gdG8gdGhhdCBm dW5jdGlvbi4KTWFrZSBzdXJlIGxpYnhsX19kb21haW5fYnVpbGRfaW5mb19zZXRkZWZhdWx0IGlz IGNhbGxlZCB3aXRoCmRldmljZV9tb2RlbF92ZXJzaW9uIHNldC4KClVwZGF0ZSBsaWJ4bF9fc3Bh d25fc3R1Yl9kbSgpIGFuZCBpbml0aWF0ZV9kb21haW5fY3JlYXRlKCkgdG8gY2FsbCB0aGUKbmV3 IGZ1bmN0aW9uIHByaW9yIGxpYnhsX19kb21haW5fYnVpbGRfaW5mb19zZXRkZWZhdWx0KCkgYmVj YXVzZQpkZXZpY2VfbW9kZV92ZXJzaW9uIGlzIGV4cGVjdGVkIHRvIGJlIGluaXRpYWx6ZWQuCmxp YnhsX2RvbWFpbl9uZWVkX21lbW9yeSgpIG5lZWRzIG5vIHVwZGF0ZSBiZWNhdXNlIGl0IGRvZXMg bm90IGhhdmUgYQpkX2NvbmZpZyBhdmFpbGFibGUgYW55d2F5LCBhbmQgdGhlIGNhbGxlcnMgcHJv dmlkZSBhIHBvcHVsYXRlZCBiX2luZm8uCgpTaWduZWQtb2ZmLWJ5OiBPbGFmIEhlcmluZyA8b2xh ZkBhZXBmbGUuZGU+Ci0tLQogdG9vbHMvbGlieGwvbGlieGxfY3JlYXRlLmMgICB8IDkwICsrKysr KysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tCiB0b29scy9saWJ4bC9saWJ4 bF9kbS5jICAgICAgIHwgIDIgKwogdG9vbHMvbGlieGwvbGlieGxfaW50ZXJuYWwuaCB8ICAyICsK IDMgZmlsZXMgY2hhbmdlZCwgNTkgaW5zZXJ0aW9ucygrKSwgMzUgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvdG9vbHMvbGlieGwvbGlieGxfY3JlYXRlLmMgYi90b29scy9saWJ4bC9saWJ4bF9j cmVhdGUuYwppbmRleCA4OWZlODBmYzljLi4zZjA0MzFjYzg0IDEwMDY0NAotLS0gYS90b29scy9s aWJ4bC9saWJ4bF9jcmVhdGUuYworKysgYi90b29scy9saWJ4bC9saWJ4bF9jcmVhdGUuYwpAQCAt MjcsNiArMjcsNTMgQEAKIAogI2luY2x1ZGUgPHhlbi14c20vZmxhc2svZmxhc2suaD4KIAoraW50 IGxpYnhsX19kb21haW5fc2V0X2RldmljZV9tb2RlbChsaWJ4bF9fZ2MgKmdjLCBsaWJ4bF9kb21h aW5fY29uZmlnICpkX2NvbmZpZykKK3sKKyAgICBsaWJ4bF9kb21haW5fYnVpbGRfaW5mbyAqYl9p bmZvID0gJmRfY29uZmlnLT5iX2luZm87CisgICAgaW50IHJldDsKKworICAgIGxpYnhsX2RlZmJv b2xfc2V0ZGVmYXVsdCgmYl9pbmZvLT5kZXZpY2VfbW9kZWxfc3R1YmRvbWFpbiwgZmFsc2UpOwor CisgICAgaWYgKGJfaW5mby0+ZGV2aWNlX21vZGVsX3ZlcnNpb24pCisgICAgICAgIHJldHVybiAw OworCisgICAgc3dpdGNoIChiX2luZm8tPnR5cGUpIHsKKyAgICBjYXNlIExJQlhMX0RPTUFJTl9U WVBFX0hWTToKKyAgICAgICAgaWYgKGxpYnhsX2RlZmJvb2xfdmFsKGJfaW5mby0+ZGV2aWNlX21v ZGVsX3N0dWJkb21haW4pKSB7CisgICAgICAgICAgICBiX2luZm8tPmRldmljZV9tb2RlbF92ZXJz aW9uID0KKyAgICAgICAgICAgICAgICBMSUJYTF9ERVZJQ0VfTU9ERUxfVkVSU0lPTl9RRU1VX1hF Tl9UUkFESVRJT05BTDsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIGJfaW5mby0+ZGV2 aWNlX21vZGVsX3ZlcnNpb24gPSBsaWJ4bF9fZGVmYXVsdF9kZXZpY2VfbW9kZWwoZ2MpOworICAg ICAgICB9CisgICAgICAgIGJyZWFrOworICAgIGRlZmF1bHQ6CisgICAgICAgIGJfaW5mby0+ZGV2 aWNlX21vZGVsX3ZlcnNpb24gPQorICAgICAgICAgICAgTElCWExfREVWSUNFX01PREVMX1ZFUlNJ T05fUUVNVV9YRU5fVFJBRElUSU9OQUw7CisgICAgICAgIGJyZWFrOworICAgIH0KKworICAgIGlm IChiX2luZm8tPmRldmljZV9tb2RlbF92ZXJzaW9uID09IExJQlhMX0RFVklDRV9NT0RFTF9WRVJT SU9OX1FFTVVfWEVOKSB7CisgICAgICAgIGNvbnN0IGNoYXIgKmRtOworCisgICAgICAgIGRtID0g bGlieGxfX2RvbWFpbl9kZXZpY2VfbW9kZWwoZ2MsIGJfaW5mbyk7CisgICAgICAgIHJldCA9IGFj Y2VzcyhkbSwgWF9PSyk7CisgICAgICAgIGlmIChyZXQgPCAwKSB7CisgICAgICAgICAgICAvKiBx ZW11LXhlbiB1bmF2YWlsYWJsZSwgdXNlIHFlbXUteGVuLXRyYWRpdGlvbmFsICovCisgICAgICAg ICAgICBpZiAoZXJybm8gPT0gRU5PRU5UKSB7CisgICAgICAgICAgICAgICAgTE9HRShJTkZPLCAi cWVtdS14ZW4gaXMgdW5hdmFpbGFibGUiCisgICAgICAgICAgICAgICAgICAgICAiLCB1c2luZyBx ZW11LXhlbi10cmFkaXRpb25hbCBpbnN0ZWFkIik7CisgICAgICAgICAgICAgICAgYl9pbmZvLT5k ZXZpY2VfbW9kZWxfdmVyc2lvbiA9CisgICAgICAgICAgICAgICAgICAgIExJQlhMX0RFVklDRV9N T0RFTF9WRVJTSU9OX1FFTVVfWEVOX1RSQURJVElPTkFMOworICAgICAgICAgICAgfSBlbHNlIHsK KyAgICAgICAgICAgICAgICBMT0dFKEVSUk9SLCAicWVtdS14ZW4gYWNjZXNzIGVycm9yIik7Cisg ICAgICAgICAgICAgICAgcmV0dXJuIEVSUk9SX0ZBSUw7CisgICAgICAgICAgICB9CisgICAgICAg IH0KKyAgICB9CisKKyAgICByZXR1cm4gMDsKK30KKwogaW50IGxpYnhsX19kb21haW5fY3JlYXRl X2luZm9fc2V0ZGVmYXVsdChsaWJ4bF9fZ2MgKmdjLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBsaWJ4bF9kb21haW5fY3JlYXRlX2luZm8gKmNfaW5mbykKIHsKQEAg LTczLDYgKzEyMCw4IEBAIGludCBsaWJ4bF9fZG9tYWluX2J1aWxkX2luZm9fc2V0ZGVmYXVsdChs aWJ4bF9fZ2MgKmdjLAogICAgICAgICByZXR1cm4gRVJST1JfSU5WQUw7CiAgICAgfQogCisgICAg YXNzZXJ0KGJfaW5mby0+ZGV2aWNlX21vZGVsX3ZlcnNpb24pOworCiAgICAgLyogQ29weSBkZXBy ZWNhdGVkIG9wdGlvbnMgdG8gaXQncyBuZXcgcG9zaXRpb24uICovCiAgICAgcmMgPSBsaWJ4bF9f ZG9tYWluX2J1aWxkX2luZm9fY29weV9kZXByZWNhdGVkKENUWCwgYl9pbmZvKTsKICAgICBpZiAo cmMpIHsKQEAgLTgwLDQ1ICsxMjksMTAgQEAgaW50IGxpYnhsX19kb21haW5fYnVpbGRfaW5mb19z ZXRkZWZhdWx0KGxpYnhsX19nYyAqZ2MsCiAgICAgICAgIHJldHVybiByYzsKICAgICB9CiAKLSAg ICBsaWJ4bF9kZWZib29sX3NldGRlZmF1bHQoJmJfaW5mby0+ZGV2aWNlX21vZGVsX3N0dWJkb21h aW4sIGZhbHNlKTsKLQogICAgIGlmIChsaWJ4bF9kZWZib29sX3ZhbChiX2luZm8tPmRldmljZV9t b2RlbF9zdHViZG9tYWluKSAmJgogICAgICAgICAhYl9pbmZvLT5kZXZpY2VfbW9kZWxfc3NpZHJl ZikKICAgICAgICAgYl9pbmZvLT5kZXZpY2VfbW9kZWxfc3NpZHJlZiA9IFNFQ0lOSVRTSURfRE9N RE07CiAKLSAgICBpZiAoIWJfaW5mby0+ZGV2aWNlX21vZGVsX3ZlcnNpb24pIHsKLSAgICAgICAg aWYgKGJfaW5mby0+dHlwZSA9PSBMSUJYTF9ET01BSU5fVFlQRV9IVk0pIHsKLSAgICAgICAgICAg IGlmIChsaWJ4bF9kZWZib29sX3ZhbChiX2luZm8tPmRldmljZV9tb2RlbF9zdHViZG9tYWluKSkg ewotICAgICAgICAgICAgICAgIGJfaW5mby0+ZGV2aWNlX21vZGVsX3ZlcnNpb24gPQotICAgICAg ICAgICAgICAgICAgICBMSUJYTF9ERVZJQ0VfTU9ERUxfVkVSU0lPTl9RRU1VX1hFTl9UUkFESVRJ T05BTDsKLSAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAgYl9pbmZvLT5kZXZp Y2VfbW9kZWxfdmVyc2lvbiA9IGxpYnhsX19kZWZhdWx0X2RldmljZV9tb2RlbChnYyk7Ci0gICAg ICAgICAgICB9Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBiX2luZm8tPmRldmljZV9t b2RlbF92ZXJzaW9uID0KLSAgICAgICAgICAgICAgICBMSUJYTF9ERVZJQ0VfTU9ERUxfVkVSU0lP Tl9RRU1VX1hFTjsKLSAgICAgICAgfQotICAgICAgICBpZiAoYl9pbmZvLT5kZXZpY2VfbW9kZWxf dmVyc2lvbgotICAgICAgICAgICAgICAgID09IExJQlhMX0RFVklDRV9NT0RFTF9WRVJTSU9OX1FF TVVfWEVOKSB7Ci0gICAgICAgICAgICBjb25zdCBjaGFyICpkbTsKLQotICAgICAgICAgICAgZG0g PSBsaWJ4bF9fZG9tYWluX2RldmljZV9tb2RlbChnYywgYl9pbmZvKTsKLSAgICAgICAgICAgIHJj ID0gYWNjZXNzKGRtLCBYX09LKTsKLSAgICAgICAgICAgIGlmIChyYyA8IDApIHsKLSAgICAgICAg ICAgICAgICAvKiBxZW11LXhlbiB1bmF2YWlsYWJsZSwgdXNlIHFlbXUteGVuLXRyYWRpdGlvbmFs ICovCi0gICAgICAgICAgICAgICAgaWYgKGVycm5vID09IEVOT0VOVCkgewotICAgICAgICAgICAg ICAgICAgICBMT0dFKElORk8sICJxZW11LXhlbiBpcyB1bmF2YWlsYWJsZSIKLSAgICAgICAgICAg ICAgICAgICAgICAgICAiLCB1c2luZyBxZW11LXhlbi10cmFkaXRpb25hbCBpbnN0ZWFkIik7Ci0g ICAgICAgICAgICAgICAgICAgIGJfaW5mby0+ZGV2aWNlX21vZGVsX3ZlcnNpb24gPQotICAgICAg ICAgICAgICAgICAgICAgICAgTElCWExfREVWSUNFX01PREVMX1ZFUlNJT05fUUVNVV9YRU5fVFJB RElUSU9OQUw7Ci0gICAgICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICAgICAg TE9HRShFUlJPUiwgInFlbXUteGVuIGFjY2VzcyBlcnJvciIpOwotICAgICAgICAgICAgICAgICAg ICByZXR1cm4gRVJST1JfRkFJTDsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB9Ci0g ICAgICAgIH0KLSAgICB9Ci0KICAgICBpZiAoYl9pbmZvLT5ibGtkZXZfc3RhcnQgPT0gTlVMTCkK ICAgICAgICAgYl9pbmZvLT5ibGtkZXZfc3RhcnQgPSBsaWJ4bF9fc3RyZHVwKE5PR0MsICJ4dmRh Iik7CiAKQEAgLTkzOCw2ICs5NTIsMTIgQEAgc3RhdGljIHZvaWQgaW5pdGlhdGVfZG9tYWluX2Ny ZWF0ZShsaWJ4bF9fZWdjICplZ2MsCiAgICAgICAgIGdvdG8gZXJyb3Jfb3V0OwogICAgIH0KIAor ICAgIHJldCA9IGxpYnhsX19kb21haW5fc2V0X2RldmljZV9tb2RlbChnYywgZF9jb25maWcpOwor ICAgIGlmIChyZXQpIHsKKyAgICAgICAgTE9HRChFUlJPUiwgZG9taWQsICJVbmFibGUgdG8gc2V0 IGRvbWFpbiBkZXZpY2UgbW9kZWwiKTsKKyAgICAgICAgZ290byBlcnJvcl9vdXQ7CisgICAgfQor CiAgICAgcmV0ID0gbGlieGxfX2RvbWFpbl9jcmVhdGVfaW5mb19zZXRkZWZhdWx0KGdjLCAmZF9j b25maWctPmNfaW5mbyk7CiAgICAgaWYgKHJldCkgewogICAgICAgICBMT0dEKEVSUk9SLCBkb21p ZCwgIlVuYWJsZSB0byBzZXQgZG9tYWluIGNyZWF0ZSBpbmZvIGRlZmF1bHRzIik7CmRpZmYgLS1n aXQgYS90b29scy9saWJ4bC9saWJ4bF9kbS5jIGIvdG9vbHMvbGlieGwvbGlieGxfZG0uYwppbmRl eCAyZjE5Nzg2YmRkLi4wODZlNTY2MzExIDEwMDY0NAotLS0gYS90b29scy9saWJ4bC9saWJ4bF9k bS5jCisrKyBiL3Rvb2xzL2xpYnhsL2xpYnhsX2RtLmMKQEAgLTIxNjgsNiArMjE2OCw4IEBAIHZv aWQgbGlieGxfX3NwYXduX3N0dWJfZG0obGlieGxfX2VnYyAqZWdjLCBsaWJ4bF9fc3R1Yl9kbV9z cGF3bl9zdGF0ZSAqc2RzcykKICAgICBkbV9jb25maWctPmNfaW5mby5ydW5faG90cGx1Z19zY3Jp cHRzID0KICAgICAgICAgZ3Vlc3RfY29uZmlnLT5jX2luZm8ucnVuX2hvdHBsdWdfc2NyaXB0czsK IAorICAgIHJldCA9IGxpYnhsX19kb21haW5fc2V0X2RldmljZV9tb2RlbChnYywgZG1fY29uZmln KTsKKyAgICBpZiAocmV0KSBnb3RvIG91dDsKICAgICByZXQgPSBsaWJ4bF9fZG9tYWluX2NyZWF0 ZV9pbmZvX3NldGRlZmF1bHQoZ2MsICZkbV9jb25maWctPmNfaW5mbyk7CiAgICAgaWYgKHJldCkg Z290byBvdXQ7CiAgICAgcmV0ID0gbGlieGxfX2RvbWFpbl9idWlsZF9pbmZvX3NldGRlZmF1bHQo Z2MsICZkbV9jb25maWctPmJfaW5mbyk7CmRpZmYgLS1naXQgYS90b29scy9saWJ4bC9saWJ4bF9p bnRlcm5hbC5oIGIvdG9vbHMvbGlieGwvbGlieGxfaW50ZXJuYWwuaAppbmRleCA0NGUwMjIxMjg0 Li4yNWYxMTM0MDRiIDEwMDY0NAotLS0gYS90b29scy9saWJ4bC9saWJ4bF9pbnRlcm5hbC5oCisr KyBiL3Rvb2xzL2xpYnhsL2xpYnhsX2ludGVybmFsLmgKQEAgLTEzNzQsNiArMTM3NCw4IEBAIF9o aWRkZW4gaW50IGxpYnhsX19kZXZpY2VfbmV4dGlkKGxpYnhsX19nYyAqZ2MsIHVpbnQzMl90IGRv bWlkLAogX2hpZGRlbiBpbnQgbGlieGxfX3Jlc29sdmVfZG9taWQobGlieGxfX2djICpnYywgY29u c3QgY2hhciAqbmFtZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQzMl90 ICpkb21pZCk7CiAKK19oaWRkZW4gaW50IGxpYnhsX19kb21haW5fc2V0X2RldmljZV9tb2RlbChs aWJ4bF9fZ2MgKmdjLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGxpYnhsX2RvbWFpbl9jb25maWcgKmRfY29uZmlnKTsKIC8qCiAgKiBGb3IgZWFjaCBhZ2dyZWdh dGUgdHlwZSB3aGljaCBjYW4gYmUgdXNlZCBhcyBhbiBpbnB1dCB3ZSBwcm92aWRlOgogICoKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBt YWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMu eGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw=