From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Young Subject: Re: [PATCH 1/2] make xen ocaml safe-strings compliant Date: Tue, 6 Feb 2018 21:56:14 +0000 (GMT) Message-ID: References: <20180206164930.hall3jh62vn4vrix@citrix.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="8323328-108514198-1517954179=:3326" Return-path: Received: from all-amaz-eas1.inumbo.com ([34.197.232.57]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ejBE9-0001CF-RY for xen-devel@lists.xenproject.org; Tue, 06 Feb 2018 21:56:34 +0000 In-Reply-To: <20180206164930.hall3jh62vn4vrix@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: Wei Liu Cc: Marcello Seri , xen-devel@lists.xenproject.org, Christian Lindig , John Thomson , David Scott List-Id: xen-devel@lists.xenproject.org This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --8323328-108514198-1517954179=:3326 Content-Type: text/plain; charset=US-ASCII; format=flowed On Tue, 6 Feb 2018, Wei Liu wrote: > On Tue, Jan 30, 2018 at 10:55:47PM +0000, Michael Young wrote: >> Xen built with ocaml 4.06 gives errors such as >> Error: This expression has type bytes but an expression was >> expected of type string >> as Byte and safe-strings which were introduced in 4.02 are the >> default in 4.06. >> This patch which is partly by Richard W.M. Jones of Red Hat >> from https://bugzilla.redhat.com/show_bug.cgi?id=1526703 >> fixes these issues. >> >> Signed-off-by: Michael Young >> Reviewed-by: Christian Lindig > > Strangely this doesn't apply to staging. And after examining the > downloaded patch I'm not sure if my mail client is acting up. Do you > have a git branch that I can pull from? The patch needed to be reduced as one of the sections being patched was removed by a recent patch. I am attaching the revised patch as a file in case there was also an email formatting issue. Michael Young --8323328-108514198-1517954179=:3326 Content-Type: text/plain; charset=US-ASCII; name=0001-make-xen-ocaml-safe-strings-compliant.patch Content-Transfer-Encoding: BASE64 Content-ID: Content-Description: Content-Disposition: attachment; filename=0001-make-xen-ocaml-safe-strings-compliant.patch RnJvbSAyNDdjZWE5YjU4N2JhYWZhZjgwYmNjNWI0NGJjNjhkZWZiNGVmYTI2 IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQ0KRnJvbTogTWljaGFlbCBZb3Vu ZyA8bS5hLnlvdW5nQGR1cmhhbS5hYy51az4NCkRhdGU6IFR1ZSwgNiBGZWIg MjAxOCAyMToyNzoyMyArMDAwMA0KU3ViamVjdDogW1BBVENIIDEvMiB2Ml0g bWFrZSB4ZW4gb2NhbWwgc2FmZS1zdHJpbmdzIGNvbXBsaWFudA0KDQpYZW4g YnVpbHQgd2l0aCBvY2FtbCA0LjA2IGdpdmVzIGVycm9ycyBzdWNoIGFzDQpF cnJvcjogVGhpcyBleHByZXNzaW9uIGhhcyB0eXBlIGJ5dGVzIGJ1dCBhbiBl eHByZXNzaW9uIHdhcw0KICAgICAgICBleHBlY3RlZCBvZiB0eXBlIHN0cmlu Zw0KYXMgQnl0ZSBhbmQgc2FmZS1zdHJpbmdzIHdoaWNoIHdlcmUgaW50cm9k dWNlZCBpbiA0LjAyIGFyZSB0aGUNCmRlZmF1bHQgaW4gNC4wNi4NClRoaXMg cGF0Y2ggd2hpY2ggaXMgbW9zdGx5IGJ5IFJpY2hhcmQgVy5NLiBKb25lcyBv ZiBSZWQgSGF0DQpmcm9tIGh0dHBzOi8vYnVnemlsbGEucmVkaGF0LmNvbS9z aG93X2J1Zy5jZ2k/aWQ9MTUyNjcwMw0KZml4ZXMgdGhlc2UgaXNzdWVzLg0K DQp2MjogZHJvcCB0b29scy9vY2FtbC9saWJzL3hjL3hlbmN0cmwubWwgZnJv bSB0aGUgcGF0Y2ggYXMgdGhlDQphZmZlY3RlZCBjb2RlIHdhcyByZW1vdmVk IGJ5IGNvbW1pdCBkOTMzZjFhNTNjMDYwMDIzNTFjMWUzNmQ0MDYxNWU0MGJk NGJmNmFmDQp0b29scy9vY2FtbDogRHJvcCBjb3JlZHVtcCBpbmZyYXN0cnVj dHVyZQ0KDQpTaWduZWQtb2ZmLWJ5OiBNaWNoYWVsIFlvdW5nIDxtLmEueW91 bmdAZHVyaGFtLmFjLnVrPg0KUmV2aWV3ZWQtYnk6IENocmlzdGlhbiBMaW5k aWcgPGNocmlzdGlhbi5saW5kaWdAY2l0cml4LmNvbT4NCi0tLQ0KIHRvb2xz L29jYW1sL2xpYnMveGIveGIubWwgICAgICAgIHwgIDYgKysrLS0tDQogdG9v bHMvb2NhbWwveGVuc3RvcmVkL2xvZ2dpbmcubWwgfCAyMiArKysrKysrKysr Ky0tLS0tLS0tLS0tDQogdG9vbHMvb2NhbWwveGVuc3RvcmVkL3N0ZGV4dC5t bCAgfCAgMiArLQ0KIHRvb2xzL29jYW1sL3hlbnN0b3JlZC91dGlscy5tbCAg IHwgMTggKysrKysrKysrLS0tLS0tLS0tDQogNCBmaWxlcyBjaGFuZ2VkLCAy NCBpbnNlcnRpb25zKCspLCAyNCBkZWxldGlvbnMoLSkNCg0KZGlmZiAtLWdp dCBhL3Rvb2xzL29jYW1sL2xpYnMveGIveGIubWwgYi90b29scy9vY2FtbC9s aWJzL3hiL3hiLm1sDQppbmRleCA1MDk0NGI1ZmQ2Li5hYTJjZjk4MjIzIDEw MDY0NA0KLS0tIGEvdG9vbHMvb2NhbWwvbGlicy94Yi94Yi5tbA0KKysrIGIv dG9vbHMvb2NhbWwvbGlicy94Yi94Yi5tbA0KQEAgLTg0LDcgKzg0LDcgQEAg bGV0IHJlYWRfbW1hcCBiYWNrIGNvbiBzIGxlbiA9DQogDQogbGV0IHJlYWQg Y29uIHMgbGVuID0NCiAJbWF0Y2ggY29uLmJhY2tlbmQgd2l0aA0KLQl8IEZk IGJhY2tmZCAgICAgLT4gcmVhZF9mZCBiYWNrZmQgY29uIHMgbGVuDQorCXwg RmQgYmFja2ZkICAgICAtPiByZWFkX2ZkIGJhY2tmZCBjb24gKEJ5dGVzLm9m X3N0cmluZyBzKSBsZW4NCiAJfCBYZW5tbWFwIGJhY2ttbWFwIC0+IHJlYWRf bW1hcCBiYWNrbW1hcCBjb24gcyBsZW4NCiANCiBsZXQgd3JpdGVfZmQgYmFj ayBjb24gcyBsZW4gPQ0KQEAgLTk4LDcgKzk4LDcgQEAgbGV0IHdyaXRlX21t YXAgYmFjayBjb24gcyBsZW4gPQ0KIA0KIGxldCB3cml0ZSBjb24gcyBsZW4g PQ0KIAltYXRjaCBjb24uYmFja2VuZCB3aXRoDQotCXwgRmQgYmFja2ZkICAg ICAtPiB3cml0ZV9mZCBiYWNrZmQgY29uIHMgbGVuDQorCXwgRmQgYmFja2Zk ICAgICAtPiB3cml0ZV9mZCBiYWNrZmQgY29uIChCeXRlcy5vZl9zdHJpbmcg cykgbGVuDQogCXwgWGVubW1hcCBiYWNrbW1hcCAtPiB3cml0ZV9tbWFwIGJh Y2ttbWFwIGNvbiBzIGxlbg0KIA0KICgqIE5COiBjYW4gdGhyb3cgUmVjb25u ZWN0ICopDQpAQCAtMTQ3LDcgKzE0Nyw3IEBAIGxldCBpbnB1dCBjb24gPQ0K IAl8IE5vSGRyIChpLCBidWYpICAgICAgLT4NCiAJCSgqIHdlIGNvbXBsZXRl IHRoZSBwYXJ0aWFsIGhlYWRlciAqKQ0KIAkJaWYgc3ogPiAwIHRoZW4NCi0J CQlTdHJpbmcuYmxpdCBzIDAgYnVmIChQYXJ0aWFsLmhlYWRlcl9zaXplICgp IC0gaSkgc3o7DQorCQkJU3RyaW5nLmJsaXQgcyAwIChCeXRlcy5vZl9zdHJp bmcgYnVmKSAoUGFydGlhbC5oZWFkZXJfc2l6ZSAoKSAtIGkpIHN6Ow0KIAkJ Y29uLnBhcnRpYWxfaW4gPC0gaWYgc3ogPSBpIHRoZW4NCiAJCQlIYXZlSGRy IChQYXJ0aWFsLm9mX3N0cmluZyBidWYpIGVsc2UgTm9IZHIgKGkgLSBzeiwg YnVmKQ0KIAkpOw0KZGlmZiAtLWdpdCBhL3Rvb2xzL29jYW1sL3hlbnN0b3Jl ZC9sb2dnaW5nLm1sIGIvdG9vbHMvb2NhbWwveGVuc3RvcmVkL2xvZ2dpbmcu bWwNCmluZGV4IDBjMGQwM2QwYzQuLmQyNGFiZjhhM2EgMTAwNjQ0DQotLS0g YS90b29scy9vY2FtbC94ZW5zdG9yZWQvbG9nZ2luZy5tbA0KKysrIGIvdG9v bHMvb2NhbWwveGVuc3RvcmVkL2xvZ2dpbmcubWwNCkBAIC02MCwxMSArNjAs MTEgQEAgdHlwZSBsb2dnZXIgPQ0KIGxldCB0cnVuY2F0ZV9saW5lIG5iX2No YXJzIGxpbmUgPSANCiAJaWYgU3RyaW5nLmxlbmd0aCBsaW5lID4gbmJfY2hh cnMgLSAxIHRoZW4NCiAJCWxldCBsZW4gPSBtYXggKG5iX2NoYXJzIC0gMSkg MiBpbg0KLQkJbGV0IGRzdF9saW5lID0gU3RyaW5nLmNyZWF0ZSBsZW4gaW4N Ci0JCVN0cmluZy5ibGl0IGxpbmUgMCBkc3RfbGluZSAwIChsZW4gLSAyKTsN Ci0JCWRzdF9saW5lLltsZW4tMl0gPC0gJy4nOyANCi0JCWRzdF9saW5lLlts ZW4tMV0gPC0gJy4nOw0KLQkJZHN0X2xpbmUNCisJCWxldCBkc3RfbGluZSA9 IEJ5dGVzLmNyZWF0ZSBsZW4gaW4NCisJCUJ5dGVzLmJsaXRfc3RyaW5nIGxp bmUgMCBkc3RfbGluZSAwIChsZW4gLSAyKTsNCisJCUJ5dGVzLnNldCBkc3Rf bGluZSAobGVuLTIpICcuJzsgDQorCQlCeXRlcy5zZXQgZHN0X2xpbmUgKGxl bi0xKSAnLic7DQorCQlCeXRlcy50b19zdHJpbmcgZHN0X2xpbmUNCiAJZWxz ZSBsaW5lDQogDQogbGV0IGxvZ19yb3RhdGUgcmVmX2NoIGxvZ19maWxlIGxv Z19uYl9maWxlcyA9DQpAQCAtMjUyLDEzICsyNTIsMTMgQEAgbGV0IHN0cmlu Z19vZl9hY2Nlc3NfdHlwZSA9IGZ1bmN0aW9uDQogCSopDQogDQogbGV0IHNh bml0aXplX2RhdGEgZGF0YSA9DQotCWxldCBkYXRhID0gU3RyaW5nLmNvcHkg ZGF0YSBpbg0KLQlmb3IgaSA9IDAgdG8gU3RyaW5nLmxlbmd0aCBkYXRhIC0g MQ0KKwlsZXQgZGF0YSA9IEJ5dGVzLmNvcHkgZGF0YSBpbg0KKwlmb3IgaSA9 IDAgdG8gQnl0ZXMubGVuZ3RoIGRhdGEgLSAxDQogCWRvDQotCQlpZiBkYXRh LltpXSA9ICdcMDAwJyB0aGVuDQotCQkJZGF0YS5baV0gPC0gJyAnDQorCQlp ZiBCeXRlcy5nZXQgZGF0YSBpID0gJ1wwMDAnIHRoZW4NCisJCQlCeXRlcy5z ZXQgZGF0YSBpICcgJw0KIAlkb25lOw0KLQlTdHJpbmcuZXNjYXBlZCBkYXRh DQorCVN0cmluZy5lc2NhcGVkIChCeXRlcy50b19zdHJpbmcgZGF0YSkNCiAN CiBsZXQgYWN0aXZhdGVfYWNjZXNzX2xvZyA9IHJlZiB0cnVlDQogbGV0IGFj Y2Vzc19sb2dfZGVzdGluYXRpb24gPSByZWYgKEZpbGUgKFBhdGhzLnhlbl9s b2dfZGlyIF4gIi94ZW5zdG9yZWQtYWNjZXNzLmxvZyIpKQ0KQEAgLTI5MSw3 ICsyOTEsNyBAQCBsZXQgYWNjZXNzX2xvZ2dpbmcgfmNvbiB+dGlkID8oZGF0 YT0iIikgfmxldmVsIGFjY2Vzc190eXBlID0NCiAJCQkJbGV0IGRhdGUgPSBz dHJpbmdfb2ZfZGF0ZSgpIGluDQogCQkJCWxldCB0aWQgPSBzdHJpbmdfb2Zf dGlkIH5jb24gdGlkIGluDQogCQkJCWxldCBhY2Nlc3NfdHlwZSA9IHN0cmlu Z19vZl9hY2Nlc3NfdHlwZSBhY2Nlc3NfdHlwZSBpbg0KLQkJCQlsZXQgZGF0 YSA9IHNhbml0aXplX2RhdGEgZGF0YSBpbg0KKwkJCQlsZXQgZGF0YSA9IHNh bml0aXplX2RhdGEgKEJ5dGVzLm9mX3N0cmluZyBkYXRhKSBpbg0KIAkJCQls ZXQgcHJlZml4ID0gcHJlZml4ICFhY2Nlc3NfbG9nX2Rlc3RpbmF0aW9uIGRh dGUgaW4NCiAJCQkJbGV0IG1zZyA9IFByaW50Zi5zcHJpbnRmICIlcyAlcyAl cyAlcyIgcHJlZml4IHRpZCBhY2Nlc3NfdHlwZSBkYXRhIGluDQogCQkJCWxv Z2dlci53cml0ZSB+bGV2ZWwgbXNnKQ0KZGlmZiAtLWdpdCBhL3Rvb2xzL29j YW1sL3hlbnN0b3JlZC9zdGRleHQubWwgYi90b29scy9vY2FtbC94ZW5zdG9y ZWQvc3RkZXh0Lm1sDQppbmRleCBiOGE4ZmQwMGUxLi5kMDUxNTVjOTdlIDEw MDY0NA0KLS0tIGEvdG9vbHMvb2NhbWwveGVuc3RvcmVkL3N0ZGV4dC5tbA0K KysrIGIvdG9vbHMvb2NhbWwveGVuc3RvcmVkL3N0ZGV4dC5tbA0KQEAgLTEy Miw3ICsxMjIsNyBAQCBsZXQgcGlkZmlsZV93cml0ZSBmaWxlbmFtZSA9DQog CQlsZXQgcGlkID0gVW5peC5nZXRwaWQgKCkgaW4NCiAJCWxldCBidWYgPSBz dHJpbmdfb2ZfaW50IHBpZCBeICJcbiIgaW4NCiAJCWxldCBsZW4gPSBTdHJp bmcubGVuZ3RoIGJ1ZiBpbg0KLQkJaWYgVW5peC53cml0ZSBmZCBidWYgMCBs ZW4gPD4gbGVuIA0KKwkJaWYgVW5peC53cml0ZSBmZCAoQnl0ZXMub2Zfc3Ry aW5nIGJ1ZikgMCBsZW4gPD4gbGVuIA0KIAkJdGhlbiBmYWlsd2l0aCAicGlk ZmlsZV93cml0ZSBmYWlsZWQiOw0KIAkpDQogCShmdW4gKCkgLT4gVW5peC5j bG9zZSBmZCkNCmRpZmYgLS1naXQgYS90b29scy9vY2FtbC94ZW5zdG9yZWQv dXRpbHMubWwgYi90b29scy9vY2FtbC94ZW5zdG9yZWQvdXRpbHMubWwNCmlu ZGV4IGU4OWMxYWZmMDQuLmM5NmRlZjdiZWUgMTAwNjQ0DQotLS0gYS90b29s cy9vY2FtbC94ZW5zdG9yZWQvdXRpbHMubWwNCisrKyBiL3Rvb2xzL29jYW1s L3hlbnN0b3JlZC91dGlscy5tbA0KQEAgLTQ1LDIzICs0NSwyMyBAQCBsZXQg Z2V0X2hpZXJhcmNoeSBwYXRoID0NCiANCiBsZXQgaGV4aWZ5IHMgPQ0KIAls ZXQgaGV4c2VxX29mX2NoYXIgYyA9IHNwcmludGYgIiUwMngiIChDaGFyLmNv ZGUgYykgaW4NCi0JbGV0IGhzID0gU3RyaW5nLmNyZWF0ZSAoU3RyaW5nLmxl bmd0aCBzICogMikgaW4NCisJbGV0IGhzID0gQnl0ZXMuY3JlYXRlIChTdHJp bmcubGVuZ3RoIHMgKiAyKSBpbg0KIAlmb3IgaSA9IDAgdG8gU3RyaW5nLmxl bmd0aCBzIC0gMQ0KIAlkbw0KIAkJbGV0IHNlcSA9IGhleHNlcV9vZl9jaGFy IHMuW2ldIGluDQotCQlocy5baSAqIDJdIDwtIHNlcS5bMF07DQotCQlocy5b aSAqIDIgKyAxXSA8LSBzZXEuWzFdOw0KKwkJQnl0ZXMuc2V0IGhzIChpICog Mikgc2VxLlswXTsNCisJCUJ5dGVzLnNldCBocyAoaSAqIDIgKyAxKSBzZXEu WzFdOw0KIAlkb25lOw0KLQlocw0KKwlCeXRlcy50b19zdHJpbmcgaHMNCiAN CiBsZXQgdW5oZXhpZnkgaHMgPQ0KIAlsZXQgY2hhcl9vZl9oZXhzZXEgc2Vx MCBzZXExID0gQ2hhci5jaHIgKGludF9vZl9zdHJpbmcgKHNwcmludGYgIjB4 JWMlYyIgc2VxMCBzZXExKSkgaW4NCi0JbGV0IHMgPSBTdHJpbmcuY3JlYXRl IChTdHJpbmcubGVuZ3RoIGhzIC8gMikgaW4NCi0JZm9yIGkgPSAwIHRvIFN0 cmluZy5sZW5ndGggcyAtIDENCisJbGV0IHMgPSBCeXRlcy5jcmVhdGUgKFN0 cmluZy5sZW5ndGggaHMgLyAyKSBpbg0KKwlmb3IgaSA9IDAgdG8gQnl0ZXMu bGVuZ3RoIHMgLSAxDQogCWRvDQotCQlzLltpXSA8LSBjaGFyX29mX2hleHNl cSBocy5baSAqIDJdIGhzLltpICogMiArIDFdDQorCQlCeXRlcy5zZXQgcyBp IChjaGFyX29mX2hleHNlcSBocy5baSAqIDJdIGhzLltpICogMiArIDFdKQ0K IAlkb25lOw0KLQlzDQorCUJ5dGVzLnRvX3N0cmluZyBzDQogDQogbGV0IHRy aW1fcGF0aCBwYXRoID0NCiAJdHJ5DQpAQCAtODUsNyArODUsNyBAQCBsZXQg Y3JlYXRlX3VuaXhfc29ja2V0IG5hbWUgPQ0KIGxldCByZWFkX2ZpbGVfc2lu Z2xlX2ludGVnZXIgZmlsZW5hbWUgPQ0KIAlsZXQgZmQgPSBVbml4Lm9wZW5m aWxlIGZpbGVuYW1lIFsgVW5peC5PX1JET05MWSBdIDBvNjQwIGluDQogCWxl dCBidWYgPSBTdHJpbmcubWFrZSAyMCAoY2hhcl9vZl9pbnQgMCkgaW4NCi0J bGV0IHN6ID0gVW5peC5yZWFkIGZkIGJ1ZiAwIDIwIGluDQorCWxldCBzeiA9 IFVuaXgucmVhZCBmZCAoQnl0ZXMub2Zfc3RyaW5nIGJ1ZikgMCAyMCBpbg0K IAlVbml4LmNsb3NlIGZkOw0KIAlpbnRfb2Zfc3RyaW5nIChTdHJpbmcuc3Vi IGJ1ZiAwIHN6KQ0KIA0KLS0gDQoyLjE0LjMNCg0K --8323328-108514198-1517954179=:3326 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVs IG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0 cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA== --8323328-108514198-1517954179=:3326--