On 10/22/24 12:09, Paolo Bonzini wrote:
This is the second of three series needed to enable Rust for all CI
jobs (the third is due to differences in the functionality between
C and Rust implementations of PL011, for which I have sent the RFC
a little earlier).
My overall patch queue can be found at branch rust-next of my git
repository https://gitlab.com/bonzini/qemu.git.
Note that this requires "meson subprojects update --reset" in order to do
an incremental build if you have already downloaded the Rust subprojects.
While I have a solution for that (modeled after scripts/git-submodule.sh),
I first need to check with the Meson folks whether my script is using only
stable interfaces.
This is the contents of subprojects/packagefiles/bilge-impl-1.63.0.patch
in base64 encoding. You can replace it in your tree by executing the
command:
base64 -d <<\EOF > subprojects/packagefiles/bilge-impl-1.63.0.patch
LS0tIGEvc3JjL3NoYXJlZC9kaXNjcmltaW5hbnRfYXNzaWduZXIucnMKKysrIGIvc3JjL3NoYXJl
ZC9kaXNjcmltaW5hbnRfYXNzaWduZXIucnMKQEAgLTI2LDIwICsyNiwyMCBAQAogICAgICAgICBs
ZXQgZGlzY3JpbWluYW50X2V4cHIgPSAmZGlzY3JpbWluYW50LjE7DQogICAgICAgICBsZXQgdmFy
aWFudF9uYW1lID0gJnZhcmlhbnQuaWRlbnQ7DQogDQotICAgICAgICBsZXQgRXhwcjo6TGl0KEV4
cHJMaXQgeyBsaXQ6IExpdDo6SW50KGludCksIC4uIH0pID0gZGlzY3JpbWluYW50X2V4cHIgZWxz
ZSB7DQorICAgICAgICBpZiBsZXQgRXhwcjo6TGl0KEV4cHJMaXQgeyBsaXQ6IExpdDo6SW50KGlu
dCksIC4uIH0pID0gZGlzY3JpbWluYW50X2V4cHIgew0KKyAgICAgICAgICAgIGxldCBkaXNjcmlt
aW5hbnRfdmFsdWU6IHUxMjggPSBpbnQuYmFzZTEwX3BhcnNlKCkudW53cmFwX29yX2Vsc2UodW5y
ZWFjaGFibGUpOw0KKyAgICAgICAgICAgIGlmIGRpc2NyaW1pbmFudF92YWx1ZSA+IHNlbGYubWF4
X3ZhbHVlKCkgew0KKyAgICAgICAgICAgICAgICBhYm9ydCEodmFyaWFudCwgIlZhbHVlIG9mIHZh
cmlhbnQgZXhjZWVkcyB0aGUgZ2l2ZW4gbnVtYmVyIG9mIGJpdHMiKQ0KKyAgICAgICAgICAgIH0N
CisNCisgICAgICAgICAgICBTb21lKGRpc2NyaW1pbmFudF92YWx1ZSkNCisgICAgICAgIH0gZWxz
ZSB7DQogICAgICAgICAgICAgYWJvcnQhKA0KICAgICAgICAgICAgICAgICBkaXNjcmltaW5hbnRf
ZXhwciwNCiAgICAgICAgICAgICAgICAgInZhcmlhbnQgYHt9YCBpcyBub3QgYSBudW1iZXIiLCB2
YXJpYW50X25hbWU7DQogICAgICAgICAgICAgICAgIGhlbHAgPSAib25seSBsaXRlcmFsIGludGVn
ZXJzIGN1cnJlbnRseSBzdXBwb3J0ZWQiDQogICAgICAgICAgICAgKQ0KLSAgICAgICAgfTsNCi0N
Ci0gICAgICAgIGxldCBkaXNjcmltaW5hbnRfdmFsdWU6IHUxMjggPSBpbnQuYmFzZTEwX3BhcnNl
KCkudW53cmFwX29yX2Vsc2UodW5yZWFjaGFibGUpOw0KLSAgICAgICAgaWYgZGlzY3JpbWluYW50
X3ZhbHVlID4gc2VsZi5tYXhfdmFsdWUoKSB7DQotICAgICAgICAgICAgYWJvcnQhKHZhcmlhbnQs
ICJWYWx1ZSBvZiB2YXJpYW50IGV4Y2VlZHMgdGhlIGdpdmVuIG51bWJlciBvZiBiaXRzIikNCiAg
ICAgICAgIH0NCi0NCi0gICAgICAgIFNvbWUoZGlzY3JpbWluYW50X3ZhbHVlKQ0KICAgICB9DQog
DQogICAgIGZuIGFzc2lnbigmbXV0IHNlbGYsIHZhcmlhbnQ6ICZWYXJpYW50KSAtPiB1MTI4IHsN
Ci0tLSBhL3NyYy9zaGFyZWQvZmFsbGJhY2sucnMKKysrIGIvc3JjL3NoYXJlZC9mYWxsYmFjay5y
cwpAQCAtMjIsOCArMjIsOSBAQAogICAgICAgICAgICAgfQ0KICAgICAgICAgICAgIFVubmFtZWQo
ZmllbGRzKSA9PiB7DQogICAgICAgICAgICAgICAgIGxldCB2YXJpYW50X2ZpZWxkcyA9IGZpZWxk
cy51bm5hbWVkLml0ZXIoKTsNCi0gICAgICAgICAgICAgICAgbGV0IE9rKGZhbGxiYWNrX3ZhbHVl
KSA9IHZhcmlhbnRfZmllbGRzLmV4YWN0bHlfb25lKCkgZWxzZSB7DQotICAgICAgICAgICAgICAg
ICAgICBhYm9ydCEodmFyaWFudCwgImZhbGxiYWNrIHZhcmlhbnQgbXVzdCBoYXZlIGV4YWN0bHkg
b25lIGZpZWxkIjsgaGVscCA9ICJ1c2Ugb25seSBvbmUgZmllbGQgb3IgY2hhbmdlIHRvIGEgdW5p
dCB2YXJpYW50IikNCisgICAgICAgICAgICAgICAgbGV0IGZhbGxiYWNrX3ZhbHVlID0gbWF0Y2gg
dmFyaWFudF9maWVsZHMuZXhhY3RseV9vbmUoKSB7DQorICAgICAgICAgICAgICAgICAgICBPayhv
aykgPT4gb2ssDQorICAgICAgICAgICAgICAgICAgICBfID0+IGFib3J0ISh2YXJpYW50LCAiZmFs
bGJhY2sgdmFyaWFudCBtdXN0IGhhdmUgZXhhY3RseSBvbmUgZmllbGQiOyBoZWxwID0gInVzZSBv
bmx5IG9uZSBmaWVsZCBvciBjaGFuZ2UgdG8gYSB1bml0IHZhcmlhbnQiKQ0KICAgICAgICAgICAg
ICAgICB9Ow0KIA0KICAgICAgICAgICAgICAgICBpZiAhaXNfbGFzdF92YXJpYW50IHsNCg==
Paolo
