From mboxrd@z Thu Jan 1 00:00:00 1970 From: Konrad Rzeszutek Wilk Subject: QEMU-TRAD Re: [PATCH] Fixed building with newer GNUTLS versions. Date: Fri, 1 Apr 2016 09:51:45 -0400 Message-ID: <20160401135145.GC906@char.us.oracle.com> References: <1459457899-24651-1-git-send-email-sfjuocekr@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1alzUQ-0000t8-2M for xen-devel@lists.xenproject.org; Fri, 01 Apr 2016 13:51:54 +0000 Content-Disposition: inline In-Reply-To: <1459457899-24651-1-git-send-email-sfjuocekr@gmail.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: Sjoer van der Ploeg , ian.jackson@citrix.com Cc: xen-devel@lists.xenproject.org List-Id: xen-devel@lists.xenproject.org T24gVGh1LCBNYXIgMzEsIDIwMTYgYXQgMTA6NTg6MTlQTSArMDIwMCwgU2pvZXIgdmFuIGRlciBQ bG9lZyB3cm90ZToKCkhleWEhCgpUaGFuayB5b3UgZm9yIHBvc3RpbmcgdGhpcyBhbmQgYWxzbyBh ZGRpbmcgdGhlICNpZmRlZiBmb3Igb2xkZXIKdmVyc2lvbnMhCgpXYXMgd29uZGVyaW5nIHRob3Vn aHQgLSBoYWQgeW91IGRvdWJsZS1jaGVja2VkIHRoYXQgdGhlIG5ldwpjb2RlIHBhdGggd29ya3Mg d2l0aCB0aGUgY2VydHM/CgpUaGFua3MhCgpQLlMuCkNDLWluZyBJYW4gd2hvIGlzIHRoZSBRRU1V LXRyYWRpdGlvbmFsIG1haW50YWluZXIuCj4gU2lnbmVkLW9mZi1ieTogU2pvZXIgdmFuIGRlciBQ bG9lZyA8c2ZqdW9jZWtyQGdtYWlsLmNvbT4KPiAtLS0KPiAgdm5jLmMgfCA3MSArKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0t Cj4gIDEgZmlsZSBjaGFuZ2VkLCA0OCBpbnNlcnRpb25zKCspLCAyMyBkZWxldGlvbnMoLSkKPiAK PiBkaWZmIC0tZ2l0IGEvdm5jLmMgYi92bmMuYwo+IGluZGV4IDU3M2FmM2IuLjYxZDE1NTUgMTAw NjQ0Cj4gLS0tIGEvdm5jLmMKPiArKysgYi92bmMuYwo+IEBAIC0xOTI1LDkgKzE5MjUsOSBAQCBz dGF0aWMgaW50IHZuY190bHNfaW5pdGlhbGl6ZSh2b2lkKQo+ICAgICAgcmV0dXJuIDE7Cj4gIH0K PiAgCj4gLXN0YXRpYyBnbnV0bHNfYW5vbl9zZXJ2ZXJfY3JlZGVudGlhbHMgdm5jX3Rsc19pbml0 aWFsaXplX2Fub25fY3JlZCh2b2lkKQo+ICtzdGF0aWMgZ251dGxzX2Fub25fc2VydmVyX2NyZWRl bnRpYWxzX3Qgdm5jX3Rsc19pbml0aWFsaXplX2Fub25fY3JlZCh2b2lkKQo+ICB7Cj4gLSAgICBn bnV0bHNfYW5vbl9zZXJ2ZXJfY3JlZGVudGlhbHMgYW5vbl9jcmVkOwo+ICsgICAgZ251dGxzX2Fu b25fc2VydmVyX2NyZWRlbnRpYWxzX3QgYW5vbl9jcmVkOwo+ICAgICAgaW50IHJldDsKPiAgCj4g ICAgICBpZiAoKHJldCA9IGdudXRsc19hbm9uX2FsbG9jYXRlX3NlcnZlcl9jcmVkZW50aWFscygm YW5vbl9jcmVkKSkgPCAwKSB7Cj4gQEAgLTIxNTEsMTMgKzIxNTEsNTIgQEAgc3RhdGljIHZvaWQg dm5jX2hhbmRzaGFrZV9pbyh2b2lkICpvcGFxdWUpIHsKPiAgICAgICAodnMpLT5zdWJhdXRoID09 IFZOQ19BVVRIX1ZFTkNSWVBUX1g1MDlWTkMgfHwgICAgXAo+ICAgICAgICh2cyktPnN1YmF1dGgg PT0gVk5DX0FVVEhfVkVOQ1JZUFRfWDUwOVBMQUlOKQo+ICAKPiArI2lmIGRlZmluZWQoR05VVExT X1ZFUlNJT05fTlVNQkVSKSAmJiBcCj4gKyAgICBHTlVUTFNfVkVSU0lPTl9OVU1CRVIgPj0gMHgw MjAyMDAgLyogMi4yLjAgKi8KPiArc3RhdGljIGludCB2bmNfc2V0X2dudXRsc19wcmlvcml0eShn bnV0bHNfc2Vzc2lvbl90IHMsIGludCB4NTA5KQo+ICt7Cj4gKyAgICBjb25zdCBjaGFyICpwcmlv cml0eSA9IHg1MDkgPyAiTk9STUFMIiA6ICJOT1JNQUw6K0FOT04tREgiOwo+ICsgICAgaW50IHJj Owo+ICAKPiAtc3RhdGljIGludCB2bmNfc3RhcnRfdGxzKHN0cnVjdCBWbmNTdGF0ZSAqdnMpIHsK PiAtICAgIHN0YXRpYyBjb25zdCBpbnQgY2VydF90eXBlX3ByaW9yaXR5W10gPSB7IEdOVVRMU19D UlRfWDUwOSwgMCB9Owo+IC0gICAgc3RhdGljIGNvbnN0IGludCBwcm90b2NvbF9wcmlvcml0eVtd PSB7IEdOVVRMU19UTFMxXzEsIEdOVVRMU19UTFMxXzAsIEdOVVRMU19TU0wzLCAwIH07Cj4gLSAg ICBzdGF0aWMgY29uc3QgaW50IGt4X2Fub25bXSA9IHtHTlVUTFNfS1hfQU5PTl9ESCwgMH07Cj4g LSAgICBzdGF0aWMgY29uc3QgaW50IGt4X3g1MDlbXSA9IHtHTlVUTFNfS1hfREhFX0RTUywgR05V VExTX0tYX1JTQSwgR05VVExTX0tYX0RIRV9SU0EsIEdOVVRMU19LWF9TUlAsIDB9Owo+ICsgICAg cmMgPSBnbnV0bHNfcHJpb3JpdHlfc2V0X2RpcmVjdChzLCBwcmlvcml0eSwgTlVMTCk7Cj4gKyAg ICBpZiAocmMgIT0gR05VVExTX0VfU1VDQ0VTUykgewo+ICsgICAgICAgIHJldHVybiAtMTsKPiAr ICAgIH0KPiArICAgIHJldHVybiAwOwo+ICt9Cj4gKyNlbHNlCj4gK3N0YXRpYyBpbnQgdm5jX3Nl dF9nbnV0bHNfcHJpb3JpdHkoZ251dGxzX3Nlc3Npb25fdCBzLCBpbnQgeDUwOSkKPiArewo+ICsg ICAgc3RhdGljIGNvbnN0IGludCBjZXJ0X3R5cGVzW10gPSB7IEdOVVRMU19DUlRfWDUwOSwgMCB9 Owo+ICsgICAgc3RhdGljIGNvbnN0IGludCBwcm90b2NvbHNbXSA9IHsKPiArICAgICAgICBHTlVU TFNfVExTMV8xLCBHTlVUTFNfVExTMV8wLCBHTlVUTFNfU1NMMywgMAo+ICsgICAgfTsKPiArICAg IHN0YXRpYyBjb25zdCBpbnQga3hfYW5vbltdID0geyBHTlVUTFNfS1hfQU5PTl9ESCwgMCB9Owo+ ICsgICAgc3RhdGljIGNvbnN0IGludCBreF94NTA5W10gPSB7Cj4gKyAgICAgICAgR05VVExTX0tY X0RIRV9EU1MsIEdOVVRMU19LWF9SU0EsCj4gKyAgICAgICAgR05VVExTX0tYX0RIRV9SU0EsIEdO VVRMU19LWF9TUlAsIDAKPiArICAgIH07Cj4gKyAgICBpbnQgcmM7Cj4gKwo+ICsgICAgcmMgPSBn bnV0bHNfa3hfc2V0X3ByaW9yaXR5KHMsIHg1MDkgPyBreF94NTA5IDoga3hfYW5vbik7Cj4gKyAg ICBpZiAocmMgIT0gR05VVExTX0VfU1VDQ0VTUykgewo+ICsgICAgICAgIHJldHVybiAtMTsKPiAr ICAgIH0KPiArCj4gKyAgICByYyA9IGdudXRsc19jZXJ0aWZpY2F0ZV90eXBlX3NldF9wcmlvcml0 eShzLCBjZXJ0X3R5cGVzKTsKPiArICAgIGlmIChyYyAhPSBHTlVUTFNfRV9TVUNDRVNTKSB7Cj4g KyAgICAgICAgcmV0dXJuIC0xOwo+ICsgICAgfQo+ICAKPiArICAgIHJjID0gZ251dGxzX3Byb3Rv Y29sX3NldF9wcmlvcml0eShzLCBwcm90b2NvbHMpOwo+ICsgICAgaWYgKHJjICE9IEdOVVRMU19F X1NVQ0NFU1MpIHsKPiArICAgICAgICByZXR1cm4gLTE7Cj4gKyAgICB9Cj4gKyAgICByZXR1cm4g MDsKPiArfQo+ICsjZW5kaWYKPiArCj4gK3N0YXRpYyBpbnQgdm5jX3N0YXJ0X3RscyhzdHJ1Y3Qg Vm5jU3RhdGUgKnZzKSB7Cj4gICAgICBWTkNfREVCVUcoIkRvIFRMUyBzZXR1cFxuIik7Cj4gICAg ICBpZiAodm5jX3Rsc19pbml0aWFsaXplKCkgPCAwKSB7Cj4gIAlWTkNfREVCVUcoIkZhaWxlZCB0 byBpbml0IFRMU1xuIik7Cj4gQEAgLTIxNzcsMjEgKzIyMTYsNyBAQCBzdGF0aWMgaW50IHZuY19z dGFydF90bHMoc3RydWN0IFZuY1N0YXRlICp2cykgewo+ICAJICAgIHJldHVybiAtMTsKPiAgCX0K PiAgCj4gLQlpZiAoZ251dGxzX2t4X3NldF9wcmlvcml0eSh2cy0+dGxzX3Nlc3Npb24sIE5FRURf WDUwOV9BVVRIKHZzKSA/IGt4X3g1MDkgOiBreF9hbm9uKSA8IDApIHsKPiAtCSAgICBnbnV0bHNf ZGVpbml0KHZzLT50bHNfc2Vzc2lvbik7Cj4gLQkgICAgdnMtPnRsc19zZXNzaW9uID0gTlVMTDsK PiAtCSAgICB2bmNfY2xpZW50X2Vycm9yKHZzKTsKPiAtCSAgICByZXR1cm4gLTE7Cj4gLQl9Cj4g LQo+IC0JaWYgKGdudXRsc19jZXJ0aWZpY2F0ZV90eXBlX3NldF9wcmlvcml0eSh2cy0+dGxzX3Nl c3Npb24sIGNlcnRfdHlwZV9wcmlvcml0eSkgPCAwKSB7Cj4gLQkgICAgZ251dGxzX2RlaW5pdCh2 cy0+dGxzX3Nlc3Npb24pOwo+IC0JICAgIHZzLT50bHNfc2Vzc2lvbiA9IE5VTEw7Cj4gLQkgICAg dm5jX2NsaWVudF9lcnJvcih2cyk7Cj4gLQkgICAgcmV0dXJuIC0xOwo+IC0JfQo+IC0KPiAtCWlm IChnbnV0bHNfcHJvdG9jb2xfc2V0X3ByaW9yaXR5KHZzLT50bHNfc2Vzc2lvbiwgcHJvdG9jb2xf cHJpb3JpdHkpIDwgMCkgewo+ICsJaWYgKHZuY19zZXRfZ251dGxzX3ByaW9yaXR5KHZzLT50bHNf c2Vzc2lvbiwgISFORUVEX1g1MDlfQVVUSCh2cykpIDwgMCkgewo+ICAJICAgIGdudXRsc19kZWlu aXQodnMtPnRsc19zZXNzaW9uKTsKPiAgCSAgICB2cy0+dGxzX3Nlc3Npb24gPSBOVUxMOwo+ICAJ ICAgIHZuY19jbGllbnRfZXJyb3IodnMpOwo+IEBAIC0yMjE5LDcgKzIyNDQsNyBAQCBzdGF0aWMg aW50IHZuY19zdGFydF90bHMoc3RydWN0IFZuY1N0YXRlICp2cykgewo+ICAJICAgIH0KPiAgCj4g IAl9IGVsc2Ugewo+IC0JICAgIGdudXRsc19hbm9uX3NlcnZlcl9jcmVkZW50aWFscyBhbm9uX2Ny ZWQgPSB2bmNfdGxzX2luaXRpYWxpemVfYW5vbl9jcmVkKCk7Cj4gKwkgICAgZ251dGxzX2Fub25f c2VydmVyX2NyZWRlbnRpYWxzX3QgYW5vbl9jcmVkID0gdm5jX3Rsc19pbml0aWFsaXplX2Fub25f Y3JlZCgpOwo+ICAJICAgIGlmICghYW5vbl9jcmVkKSB7Cj4gIAkJZ251dGxzX2RlaW5pdCh2cy0+ dGxzX3Nlc3Npb24pOwo+ICAJCXZzLT50bHNfc2Vzc2lvbiA9IE5VTEw7Cj4gLS0gCj4gMi44LjAu cmMzCj4gCj4gCj4gX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KPiBYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Cj4gWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKPiBo dHRwOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxp c3RzLnhlbi5vcmcKaHR0cDovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg==