From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: Re: QEMU-TRAD Re: [PATCH] Fixed building with newer GNUTLS versions. Date: Wed, 4 May 2016 11:28:40 +0100 Message-ID: <20160504102840.GJ2111@citrix.com> References: <1459457899-24651-1-git-send-email-sfjuocekr@gmail.com> <20160401135145.GC906@char.us.oracle.com> <20160401164526.GC10820@char.us.oracle.com> <20160503161842.GA3435@char.us.oracle.com> <20160503163545.GB2111@citrix.com> <20160503164907.GB31399@char.us.oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <20160503164907.GB31399@char.us.oracle.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: Konrad Rzeszutek Wilk Cc: Sjoer van der Ploeg , xen-devel@lists.xensource.com, Wei Liu , ian.jackson@citrix.com List-Id: xen-devel@lists.xenproject.org T24gVHVlLCBNYXkgMDMsIDIwMTYgYXQgMTI6NDk6MDdQTSAtMDQwMCwgS29ucmFkIFJ6ZXN6dXRl ayBXaWxrIHdyb3RlOgo+IE9uIFR1ZSwgTWF5IDAzLCAyMDE2IGF0IDA1OjM1OjQ1UE0gKzAxMDAs IFdlaSBMaXUgd3JvdGU6Cj4gPiBUaGUgb3JpZ2luYWwgcGF0Y2ggc2VlbXMgdG8gbWFsZm9ybWVk Lgo+ID4gCj4gPiBJIHNraW0gdGhlIGNvZGUsIHRoZSByZWZhY3RvcmluZyBwYXJ0cyBsb29rIGNv cnJlY3QgdG8gbWUuIFdoYXQgSSdtIG5vdAo+ID4gc3VyZSBpcyB3aGV0aGVyIHRoZSByZXBsYWNl bWVudCBpcyBjb3JyZWN0IG9yIG5vdC4KPiA+IAo+ID4gVGhlIHJlZmVyZW5jZSB0byBnbnV0bHNf cHJpb3JpdHlfc2V0X2RpcmVjdCBpbiBbMF0gaXMgZnJvbSBhIHNlY3Rpb24KPiA+IGNhbGxlZCAi VXBncmFkaW5nIHRvIDMuNC54IGZyb20gMy4zLngiLCB3aGlsZSB0aGUgdmVyc2lvbiBjaGVjayBp biB0aGUKPiA+IHByb3Bvc2VkIHBhdGNoIGNoZWNrcyBmb3IgMi4yLjAuCj4gPiAKPiA+IERvIEkg bWlzcyBhbnl0aGluZyBoZXJlPyBXaGF0IHZlcnNpb24gZG9lcyBGZWRvcmEgaGF2ZT8KPiAKPiBn bnV0bHMtMy40LjktMS5mYzIzLng4Nl82NAo+IAo+IHFlbXUtdHJhZCBidWlsZHMgZmluZSB1bmRl ciAKPiBnbnV0bHMtMi44LjUtNC5mYzEzLng4Nl82NAo+IAoKQ2FuIHlvdSB0cnkgdGhlIGF0dGFj aGVkIHBhdGNoPwoKQSBoaWdoZXIgbGV2ZWwgcXVlc3Rpb24gdG8gYXNrIGlzIHdoZXRoZXIgdGhl IHByaW9yaXR5IGxpc3QgaW4gdGhlIHBhdGNoCmlzIHJlYWxseSBjb3JyZWN0LiBTcGVjaWZpY2Fs bHk6CgorICAgIGNvbnN0IGNoYXIgKnByaW9yaXR5ID0geDUwOSA/ICJOT1JNQUwiIDogIk5PUk1B TDorQU5PTi1ESCI7CgotLS04PC0tLQpGcm9tIGM2ZDYyNTllZTA5NjIwZjQ2ZTM2MzBiMDE5NDlm NjJkNmQzNzc3ZmQgTW9uIFNlcCAxNyAwMDowMDowMCAyMDAxCkZyb206IFdlaSBMaXUgPHdlaS5s aXUyQGNpdHJpeC5jb20+CkRhdGU6IFRodSwgMzEgTWFyIDIwMTYgMjI6NTg6MTkgKzAyMDAKU3Vi amVjdDogW1BBVENIXSBGaXggYnVpbGQgd2l0aCBHTlVUTFMgPiAzLjQKCmdudXRsc19reF9zZXRf cHJpb3JpdHksIGdudXRsc19jZXJ0aWZpY2F0ZV90eXBlX3NldF9wcmlvcml0eSBhbmQKZ251dGxz X3Byb3RvY29sX3NldF9wcmlvcml0eSBhcmUgcmVtb3ZlZCBpbiAzLjQuIEFwcGxpY2F0aW9uIHNo b3VsZCB1c2UKZ251dGxzX3ByaW9yaXR5X3NldF9kaXJlY3QgaW5zdGVhZC4KClByb3ZpZGUgY29t cGF0aWJpbGl0eSBsYXllciBmb3IgUUVNVSB0cmFkaXRpb25hbC4KClswXSBodHRwczovL3d3dy5n bnV0bHMub3JnL21hbnVhbC9odG1sX25vZGUvVXBncmFkaW5nLWZyb20tcHJldmlvdXMtdmVyc2lv bnMuaHRtbAoKU2lnbmVkLW9mZi1ieTogU2pvZXIgdmFuIGRlciBQbG9lZyA8c2ZqdW9jZWtyQGdt YWlsLmNvbT4KU2lnbmVkLW9mZi1ieTogV2VpIExpdSA8d2VpLmxpdTJAY2l0cml4LmNvbT4KLS0t CiB2bmMuYyB8IDcxICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr Ky0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA0OCBpbnNlcnRpb25zKCsp LCAyMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS92bmMuYyBiL3ZuYy5jCmluZGV4IDU3M2Fm M2IuLmM1NTA1ZmIgMTAwNjQ0Ci0tLSBhL3ZuYy5jCisrKyBiL3ZuYy5jCkBAIC0xOTI1LDkgKzE5 MjUsOSBAQCBzdGF0aWMgaW50IHZuY190bHNfaW5pdGlhbGl6ZSh2b2lkKQogICAgIHJldHVybiAx OwogfQogCi1zdGF0aWMgZ251dGxzX2Fub25fc2VydmVyX2NyZWRlbnRpYWxzIHZuY190bHNfaW5p dGlhbGl6ZV9hbm9uX2NyZWQodm9pZCkKK3N0YXRpYyBnbnV0bHNfYW5vbl9zZXJ2ZXJfY3JlZGVu dGlhbHNfdCB2bmNfdGxzX2luaXRpYWxpemVfYW5vbl9jcmVkKHZvaWQpCiB7Ci0gICAgZ251dGxz X2Fub25fc2VydmVyX2NyZWRlbnRpYWxzIGFub25fY3JlZDsKKyAgICBnbnV0bHNfYW5vbl9zZXJ2 ZXJfY3JlZGVudGlhbHNfdCBhbm9uX2NyZWQ7CiAgICAgaW50IHJldDsKIAogICAgIGlmICgocmV0 ID0gZ251dGxzX2Fub25fYWxsb2NhdGVfc2VydmVyX2NyZWRlbnRpYWxzKCZhbm9uX2NyZWQpKSA8 IDApIHsKQEAgLTIxNTEsMTMgKzIxNTEsNTIgQEAgc3RhdGljIHZvaWQgdm5jX2hhbmRzaGFrZV9p byh2b2lkICpvcGFxdWUpIHsKICAgICAgKHZzKS0+c3ViYXV0aCA9PSBWTkNfQVVUSF9WRU5DUllQ VF9YNTA5Vk5DIHx8ICAgIFwKICAgICAgKHZzKS0+c3ViYXV0aCA9PSBWTkNfQVVUSF9WRU5DUllQ VF9YNTA5UExBSU4pCiAKKyNpZiBkZWZpbmVkKEdOVVRMU19WRVJTSU9OX05VTUJFUikgJiYgXAor ICAgIEdOVVRMU19WRVJTSU9OX05VTUJFUiA+PSAweDAzMDQwMCAvKiAzLjQuMCAqLworc3RhdGlj IGludCB2bmNfc2V0X2dudXRsc19wcmlvcml0eShnbnV0bHNfc2Vzc2lvbl90IHMsIGludCB4NTA5 KQoreworICAgIGNvbnN0IGNoYXIgKnByaW9yaXR5ID0geDUwOSA/ICJOT1JNQUwiIDogIk5PUk1B TDorQU5PTi1ESCI7CisgICAgaW50IHJjOwogCi1zdGF0aWMgaW50IHZuY19zdGFydF90bHMoc3Ry dWN0IFZuY1N0YXRlICp2cykgewotICAgIHN0YXRpYyBjb25zdCBpbnQgY2VydF90eXBlX3ByaW9y aXR5W10gPSB7IEdOVVRMU19DUlRfWDUwOSwgMCB9OwotICAgIHN0YXRpYyBjb25zdCBpbnQgcHJv dG9jb2xfcHJpb3JpdHlbXT0geyBHTlVUTFNfVExTMV8xLCBHTlVUTFNfVExTMV8wLCBHTlVUTFNf U1NMMywgMCB9OwotICAgIHN0YXRpYyBjb25zdCBpbnQga3hfYW5vbltdID0ge0dOVVRMU19LWF9B Tk9OX0RILCAwfTsKLSAgICBzdGF0aWMgY29uc3QgaW50IGt4X3g1MDlbXSA9IHtHTlVUTFNfS1hf REhFX0RTUywgR05VVExTX0tYX1JTQSwgR05VVExTX0tYX0RIRV9SU0EsIEdOVVRMU19LWF9TUlAs IDB9OworICAgIHJjID0gZ251dGxzX3ByaW9yaXR5X3NldF9kaXJlY3QocywgcHJpb3JpdHksIE5V TEwpOworICAgIGlmIChyYyAhPSBHTlVUTFNfRV9TVUNDRVNTKSB7CisgICAgICAgIHJldHVybiAt MTsKKyAgICB9CisgICAgcmV0dXJuIDA7Cit9CisjZWxzZQorc3RhdGljIGludCB2bmNfc2V0X2du dXRsc19wcmlvcml0eShnbnV0bHNfc2Vzc2lvbl90IHMsIGludCB4NTA5KQoreworICAgIHN0YXRp YyBjb25zdCBpbnQgY2VydF90eXBlc1tdID0geyBHTlVUTFNfQ1JUX1g1MDksIDAgfTsKKyAgICBz dGF0aWMgY29uc3QgaW50IHByb3RvY29sc1tdID0geworICAgICAgICBHTlVUTFNfVExTMV8xLCBH TlVUTFNfVExTMV8wLCBHTlVUTFNfU1NMMywgMAorICAgIH07CisgICAgc3RhdGljIGNvbnN0IGlu dCBreF9hbm9uW10gPSB7IEdOVVRMU19LWF9BTk9OX0RILCAwIH07CisgICAgc3RhdGljIGNvbnN0 IGludCBreF94NTA5W10gPSB7CisgICAgICAgIEdOVVRMU19LWF9ESEVfRFNTLCBHTlVUTFNfS1hf UlNBLAorICAgICAgICBHTlVUTFNfS1hfREhFX1JTQSwgR05VVExTX0tYX1NSUCwgMAorICAgIH07 CisgICAgaW50IHJjOworCisgICAgcmMgPSBnbnV0bHNfa3hfc2V0X3ByaW9yaXR5KHMsIHg1MDkg PyBreF94NTA5IDoga3hfYW5vbik7CisgICAgaWYgKHJjICE9IEdOVVRMU19FX1NVQ0NFU1MpIHsK KyAgICAgICAgcmV0dXJuIC0xOworICAgIH0KKworICAgIHJjID0gZ251dGxzX2NlcnRpZmljYXRl X3R5cGVfc2V0X3ByaW9yaXR5KHMsIGNlcnRfdHlwZXMpOworICAgIGlmIChyYyAhPSBHTlVUTFNf RV9TVUNDRVNTKSB7CisgICAgICAgIHJldHVybiAtMTsKKyAgICB9CiAKKyAgICByYyA9IGdudXRs c19wcm90b2NvbF9zZXRfcHJpb3JpdHkocywgcHJvdG9jb2xzKTsKKyAgICBpZiAocmMgIT0gR05V VExTX0VfU1VDQ0VTUykgeworICAgICAgICByZXR1cm4gLTE7CisgICAgfQorICAgIHJldHVybiAw OworfQorI2VuZGlmCisKK3N0YXRpYyBpbnQgdm5jX3N0YXJ0X3RscyhzdHJ1Y3QgVm5jU3RhdGUg KnZzKSB7CiAgICAgVk5DX0RFQlVHKCJEbyBUTFMgc2V0dXBcbiIpOwogICAgIGlmICh2bmNfdGxz X2luaXRpYWxpemUoKSA8IDApIHsKIAlWTkNfREVCVUcoIkZhaWxlZCB0byBpbml0IFRMU1xuIik7 CkBAIC0yMTc3LDIxICsyMjE2LDcgQEAgc3RhdGljIGludCB2bmNfc3RhcnRfdGxzKHN0cnVjdCBW bmNTdGF0ZSAqdnMpIHsKIAkgICAgcmV0dXJuIC0xOwogCX0KIAotCWlmIChnbnV0bHNfa3hfc2V0 X3ByaW9yaXR5KHZzLT50bHNfc2Vzc2lvbiwgTkVFRF9YNTA5X0FVVEgodnMpID8ga3hfeDUwOSA6 IGt4X2Fub24pIDwgMCkgewotCSAgICBnbnV0bHNfZGVpbml0KHZzLT50bHNfc2Vzc2lvbik7Ci0J ICAgIHZzLT50bHNfc2Vzc2lvbiA9IE5VTEw7Ci0JICAgIHZuY19jbGllbnRfZXJyb3IodnMpOwot CSAgICByZXR1cm4gLTE7Ci0JfQotCi0JaWYgKGdudXRsc19jZXJ0aWZpY2F0ZV90eXBlX3NldF9w cmlvcml0eSh2cy0+dGxzX3Nlc3Npb24sIGNlcnRfdHlwZV9wcmlvcml0eSkgPCAwKSB7Ci0JICAg IGdudXRsc19kZWluaXQodnMtPnRsc19zZXNzaW9uKTsKLQkgICAgdnMtPnRsc19zZXNzaW9uID0g TlVMTDsKLQkgICAgdm5jX2NsaWVudF9lcnJvcih2cyk7Ci0JICAgIHJldHVybiAtMTsKLQl9Ci0K LQlpZiAoZ251dGxzX3Byb3RvY29sX3NldF9wcmlvcml0eSh2cy0+dGxzX3Nlc3Npb24sIHByb3Rv Y29sX3ByaW9yaXR5KSA8IDApIHsKKwlpZiAodm5jX3NldF9nbnV0bHNfcHJpb3JpdHkodnMtPnRs c19zZXNzaW9uLCAhIU5FRURfWDUwOV9BVVRIKHZzKSkgPCAwKSB7CiAJICAgIGdudXRsc19kZWlu aXQodnMtPnRsc19zZXNzaW9uKTsKIAkgICAgdnMtPnRsc19zZXNzaW9uID0gTlVMTDsKIAkgICAg dm5jX2NsaWVudF9lcnJvcih2cyk7CkBAIC0yMjE5LDcgKzIyNDQsNyBAQCBzdGF0aWMgaW50IHZu Y19zdGFydF90bHMoc3RydWN0IFZuY1N0YXRlICp2cykgewogCSAgICB9CiAKIAl9IGVsc2Ugewot CSAgICBnbnV0bHNfYW5vbl9zZXJ2ZXJfY3JlZGVudGlhbHMgYW5vbl9jcmVkID0gdm5jX3Rsc19p bml0aWFsaXplX2Fub25fY3JlZCgpOworCSAgICBnbnV0bHNfYW5vbl9zZXJ2ZXJfY3JlZGVudGlh bHNfdCBhbm9uX2NyZWQgPSB2bmNfdGxzX2luaXRpYWxpemVfYW5vbl9jcmVkKCk7CiAJICAgIGlm ICghYW5vbl9jcmVkKSB7CiAJCWdudXRsc19kZWluaXQodnMtPnRsc19zZXNzaW9uKTsKIAkJdnMt PnRsc19zZXNzaW9uID0gTlVMTDsKLS0gCjIuMS40CgoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxA bGlzdHMueGVuLm9yZwpodHRwOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK