From mboxrd@z Thu Jan 1 00:00:00 1970 From: Igor Mammedov Subject: Re: [Qemu-devel] [PATCH for-3.2 v5 07/19] hw: apply accel compat properties without touching globals Date: Tue, 11 Dec 2018 14:14:29 +0100 Message-ID: <20181211141429.1081009e@redhat.com> References: <20181204142023.15982-1-marcandre.lureau@redhat.com> <20181204142023.15982-8-marcandre.lureau@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1gWhry-0004tX-2D for xen-devel@lists.xenproject.org; Tue, 11 Dec 2018 13:14:38 +0000 In-Reply-To: <20181204142023.15982-8-marcandre.lureau@redhat.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: =?UTF-8?B?TWFyYy1BbmRyw6k=?= Lureau Cc: Stefano Stabellini , ehabkost@redhat.com, qemu-devel@nongnu.org, Paolo Bonzini , Anthony Perard , "open list:X86" , Andreas =?UTF-8?B?RsOkcmJlcg==?= List-Id: xen-devel@lists.xenproject.org T24gVHVlLCAgNCBEZWMgMjAxOCAxODoyMDoxMSArMDQwMApNYXJjLUFuZHLDqSBMdXJlYXUgPG1h cmNhbmRyZS5sdXJlYXVAcmVkaGF0LmNvbT4gd3JvdGU6Cgo+IEluc3RlYWQgb2YgcmVnaXN0ZXJp bmcgY29tcGF0IHByb3BlcnRpZXMgYXMgZ2xvYmFscywgbGV0J3Mga2VlcCB0aGVtCj4gaW4gdGhl aXIgb3duIGFycmF5LCB0byBhdm9pZCBtaXhpbmcgd2l0aCB1c2VyIGdsb2JhbHMuCj4gCj4gSW50 cm9kdWNlIG9iamVjdF9hcHBseV9nbG9iYWxfcHJvcHMoKSBmdW5jdGlvbiwgdG8gYXBwbHkgY29t cGF0aWJpbGl0eQo+IHByb3BlcnRpZXMgZnJvbSBhIEdQdHJBcnJheS4KPiAKPiBTaWduZWQtb2Zm LWJ5OiBNYXJjLUFuZHLDqSBMdXJlYXUgPG1hcmNhbmRyZS5sdXJlYXVAcmVkaGF0LmNvbT4Kb3Ro ZXIgdGhhbiBzdGF0aWMgbGVhayBsb29rcyBmaW5lLCBjb25zaWRlcmluZyB0aGF0IHdlIGFscmVh ZHkKbGVhayBjb21wYXRfcHJvcHMsIGl0IGRvZXNuJ3QgcmVhbGx5IG1hdHRlciwgc286CgpSZXZp ZXdlZC1ieTogSWdvciBNYW1tZWRvdiA8aW1hbW1lZG9AcmVkaGF0LmNvbT4KCj4gLS0tCj4gIGlu Y2x1ZGUvaHcvcWRldi1jb3JlLmggfCAxMCArKysrKysrKysrCj4gIGluY2x1ZGUvcW9tL29iamVj dC5oICAgfCAgMyArKysKPiAgaW5jbHVkZS9zeXNlbXUvYWNjZWwuaCB8ICA0ICstLS0KPiAgYWNj ZWwvYWNjZWwuYyAgICAgICAgICB8IDEyIC0tLS0tLS0tLS0tLQo+ICBody9jb3JlL3FkZXYuYyAg ICAgICAgIHwgIDkgKysrKysrKysrCj4gIGh3L3hlbi94ZW4tY29tbW9uLmMgICAgfCAgOSArKysr KystLS0KPiAgcW9tL29iamVjdC5jICAgICAgICAgICB8IDI1ICsrKysrKysrKysrKysrKysrKysr KysrKysKPiAgdmwuYyAgICAgICAgICAgICAgICAgICB8ICAxIC0KPiAgOCBmaWxlcyBjaGFuZ2Vk LCA1NCBpbnNlcnRpb25zKCspLCAxOSBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvaW5j bHVkZS9ody9xZGV2LWNvcmUuaCBiL2luY2x1ZGUvaHcvcWRldi1jb3JlLmgKPiBpbmRleCBhMjRk MGRkNTY2Li5hZWFhNmRiYmI4IDEwMDY0NAo+IC0tLSBhL2luY2x1ZGUvaHcvcWRldi1jb3JlLmgK PiArKysgYi9pbmNsdWRlL2h3L3FkZXYtY29yZS5oCj4gQEAgLTI2Nyw2ICsyNjcsMTYgQEAgdHlw ZWRlZiBzdHJ1Y3QgR2xvYmFsUHJvcGVydHkgewo+ICAgICAgRXJyb3IgKiplcnJwOwo+ICB9IEds b2JhbFByb3BlcnR5Owo+ICAKPiArc3RhdGljIGlubGluZSB2b2lkCj4gK2NvbXBhdF9wcm9wc19h ZGQoR1B0ckFycmF5ICphcnIsCj4gKyAgICAgICAgICAgICAgICAgR2xvYmFsUHJvcGVydHkgcHJv cHNbXSwgc2l6ZV90IG5lbGVtKQo+ICt7Cj4gKyAgICBpbnQgaTsKPiArICAgIGZvciAoaSA9IDA7 IGkgPCBuZWxlbTsgaSsrKSB7Cj4gKyAgICAgICAgZ19wdHJfYXJyYXlfYWRkKGFyciwgKHZvaWQg KikmcHJvcHNbaV0pOwo+ICsgICAgfQo+ICt9Cj4gKwo+ICAvKioqIEJvYXJkIEFQSS4gIFRoaXMg c2hvdWxkIGdvIGF3YXkgb25jZSB3ZSBoYXZlIGEgbWFjaGluZSBjb25maWcgZmlsZS4gICoqKi8K PiAgCj4gIERldmljZVN0YXRlICpxZGV2X2NyZWF0ZShCdXNTdGF0ZSAqYnVzLCBjb25zdCBjaGFy ICpuYW1lKTsKPiBkaWZmIC0tZ2l0IGEvaW5jbHVkZS9xb20vb2JqZWN0LmggYi9pbmNsdWRlL3Fv bS9vYmplY3QuaAo+IGluZGV4IDAxMzk4MzhiNjkuLjUxODNjNTg3ZjMgMTAwNjQ0Cj4gLS0tIGEv aW5jbHVkZS9xb20vb2JqZWN0LmgKPiArKysgYi9pbmNsdWRlL3FvbS9vYmplY3QuaAo+IEBAIC02 NzYsNiArNjc2LDkgQEAgT2JqZWN0ICpvYmplY3RfbmV3X3dpdGhfcHJvcHYoY29uc3QgY2hhciAq dHlwZW5hbWUsCj4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEVycm9yICoqZXJycCwK PiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdmFfbGlzdCB2YXJncyk7Cj4gIAo+ICt2 b2lkIG9iamVjdF9hcHBseV9nbG9iYWxfcHJvcHMoT2JqZWN0ICpvYmosIGNvbnN0IEdQdHJBcnJh eSAqcHJvcHMsCj4gKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBFcnJvciAqKmVycnAp Owo+ICsKPiAgLyoqCj4gICAqIG9iamVjdF9zZXRfcHJvcHM6Cj4gICAqIEBvYmo6IHRoZSBvYmpl Y3QgaW5zdGFuY2UgdG8gc2V0IHByb3BlcnRpZXMgb24KPiBkaWZmIC0tZ2l0IGEvaW5jbHVkZS9z eXNlbXUvYWNjZWwuaCBiL2luY2x1ZGUvc3lzZW11L2FjY2VsLmgKPiBpbmRleCA2MzczNThmNDMw Li5mMzMxZDEyOGU5IDEwMDY0NAo+IC0tLSBhL2luY2x1ZGUvc3lzZW11L2FjY2VsLmgKPiArKysg Yi9pbmNsdWRlL3N5c2VtdS9hY2NlbC5oCj4gQEAgLTQ5LDcgKzQ5LDcgQEAgdHlwZWRlZiBzdHJ1 Y3QgQWNjZWxDbGFzcyB7Cj4gICAgICAgKiBnbG9iYWwgcHJvcGVydGllcyBtYXkgYmUgb3ZlcnJp ZGRlbiBieSBtYWNoaW5lLXR5cGUKPiAgICAgICAqIGNvbXBhdF9wcm9wcyBvciB1c2VyLXByb3Zp ZGVkIGdsb2JhbCBwcm9wZXJ0aWVzLgo+ICAgICAgICovCj4gLSAgICBHbG9iYWxQcm9wZXJ0eSAq Z2xvYmFsX3Byb3BzOwo+ICsgICAgR1B0ckFycmF5ICpjb21wYXRfcHJvcHM7Cj4gIH0gQWNjZWxD bGFzczsKPiAgCj4gICNkZWZpbmUgVFlQRV9BQ0NFTCAiYWNjZWwiCj4gQEAgLTY3LDggKzY3LDYg QEAgdHlwZWRlZiBzdHJ1Y3QgQWNjZWxDbGFzcyB7Cj4gIGV4dGVybiB1bnNpZ25lZCBsb25nIHRj Z190Yl9zaXplOwo+ICAKPiAgdm9pZCBjb25maWd1cmVfYWNjZWxlcmF0b3IoTWFjaGluZVN0YXRl ICptcyk7Cj4gLS8qIFJlZ2lzdGVyIGFjY2VsZXJhdG9yIHNwZWNpZmljIGdsb2JhbCBwcm9wZXJ0 aWVzICovCj4gLXZvaWQgYWNjZWxfcmVnaXN0ZXJfY29tcGF0X3Byb3BzKEFjY2VsU3RhdGUgKmFj Y2VsKTsKPiAgLyogQ2FsbGVkIGp1c3QgYmVmb3JlIG9zX3NldHVwX3Bvc3QgKGllIGp1c3QgYmVm b3JlIGRyb3AgT1MgcHJpdnMpICovCj4gIHZvaWQgYWNjZWxfc2V0dXBfcG9zdChNYWNoaW5lU3Rh dGUgKm1zKTsKPiAgCj4gZGlmZiAtLWdpdCBhL2FjY2VsL2FjY2VsLmMgYi9hY2NlbC9hY2NlbC5j Cj4gaW5kZXggM2RhMjZlYjkwZi4uNmRiNWQ4ZjRkZiAxMDA2NDQKPiAtLS0gYS9hY2NlbC9hY2Nl bC5jCj4gKysrIGIvYWNjZWwvYWNjZWwuYwo+IEBAIC0xMTksMTggKzExOSw2IEBAIHZvaWQgY29u ZmlndXJlX2FjY2VsZXJhdG9yKE1hY2hpbmVTdGF0ZSAqbXMpCj4gICAgICB9Cj4gIH0KPiAgCj4g LXZvaWQgYWNjZWxfcmVnaXN0ZXJfY29tcGF0X3Byb3BzKEFjY2VsU3RhdGUgKmFjY2VsKQo+IC17 Cj4gLSAgICBBY2NlbENsYXNzICpjbGFzcyA9IEFDQ0VMX0dFVF9DTEFTUyhhY2NlbCk7Cj4gLSAg ICBHbG9iYWxQcm9wZXJ0eSAqcHJvcCA9IGNsYXNzLT5nbG9iYWxfcHJvcHM7Cj4gLQo+IC0gICAg Zm9yICg7IHByb3AgJiYgcHJvcC0+ZHJpdmVyOyBwcm9wKyspIHsKPiAtICAgICAgICAvKiBBbnkg Y29tcGF0X3Byb3BzIG11c3QgbmV2ZXIgY2F1c2UgZXJyb3IgKi8KPiAtICAgICAgICBwcm9wLT5l cnJwID0gJmVycm9yX2Fib3J0Owo+IC0gICAgICAgIHFkZXZfcHJvcF9yZWdpc3Rlcl9nbG9iYWwo cHJvcCk7Cj4gLSAgICB9Cj4gLX0KPiAtCj4gIHZvaWQgYWNjZWxfc2V0dXBfcG9zdChNYWNoaW5l U3RhdGUgKm1zKQo+ICB7Cj4gICAgICBBY2NlbFN0YXRlICphY2NlbCA9IG1zLT5hY2NlbGVyYXRv cjsKPiBkaWZmIC0tZ2l0IGEvaHcvY29yZS9xZGV2LmMgYi9ody9jb3JlL3FkZXYuYwo+IGluZGV4 IDZiM2NjNTViMjcuLjUzYjUwNzE2NGYgMTAwNjQ0Cj4gLS0tIGEvaHcvY29yZS9xZGV2LmMKPiAr KysgYi9ody9jb3JlL3FkZXYuYwo+IEBAIC05NzIsNiArOTcyLDE1IEBAIHN0YXRpYyB2b2lkIGRl dmljZV9pbml0Zm4oT2JqZWN0ICpvYmopCj4gIAo+ICBzdGF0aWMgdm9pZCBkZXZpY2VfcG9zdF9p bml0KE9iamVjdCAqb2JqKQo+ICB7Cj4gKyAgICBpZiAob2JqZWN0X2R5bmFtaWNfY2FzdChxZGV2 X2dldF9tYWNoaW5lKCksIFRZUEVfTUFDSElORSkpIHsKPiArICAgICAgICBNYWNoaW5lU3RhdGUg Km0gPSBNQUNISU5FKHFkZXZfZ2V0X21hY2hpbmUoKSk7Cj4gKyAgICAgICAgQWNjZWxDbGFzcyAq YWMgPSBBQ0NFTF9HRVRfQ0xBU1MobS0+YWNjZWxlcmF0b3IpOwo+ICsKPiArICAgICAgICBpZiAo YWMtPmNvbXBhdF9wcm9wcykgewo+ICsgICAgICAgICAgICBvYmplY3RfYXBwbHlfZ2xvYmFsX3By b3BzKG9iaiwgYWMtPmNvbXBhdF9wcm9wcywgJmVycm9yX2Fib3J0KTsKPiArICAgICAgICB9Cj4g KyAgICB9Cj4gKwo+ICAgICAgcWRldl9wcm9wX3NldF9nbG9iYWxzKERFVklDRShvYmopKTsKPiAg fQo+ICAKPiBkaWZmIC0tZ2l0IGEvaHcveGVuL3hlbi1jb21tb24uYyBiL2h3L3hlbi94ZW4tY29t bW9uLmMKPiBpbmRleCA2ZWMxNGM3M2NhLi40NTMyYWE4NjMyIDEwMDY0NAo+IC0tLSBhL2h3L3hl bi94ZW4tY29tbW9uLmMKPiArKysgYi9ody94ZW4veGVuLWNvbW1vbi5jCj4gQEAgLTE3NCwxOCAr MTc0LDIxIEBAIHN0YXRpYyBHbG9iYWxQcm9wZXJ0eSB4ZW5fY29tcGF0X3Byb3BzW10gPSB7Cj4g ICAgICAgICAgLmRyaXZlciA9ICJtaWdyYXRpb24iLAo+ICAgICAgICAgIC5wcm9wZXJ0eSA9ICJz ZW5kLXNlY3Rpb24tZm9vdGVyIiwKPiAgICAgICAgICAudmFsdWUgPSAib2ZmIiwKPiAtICAgIH0s Cj4gLSAgICB7IC8qIGVuZCBvZiBsaXN0ICovIH0sCj4gKyAgICB9Cj4gIH07Cj4gIAo+ICBzdGF0 aWMgdm9pZCB4ZW5fYWNjZWxfY2xhc3NfaW5pdChPYmplY3RDbGFzcyAqb2MsIHZvaWQgKmRhdGEp Cj4gIHsKPiAgICAgIEFjY2VsQ2xhc3MgKmFjID0gQUNDRUxfQ0xBU1Mob2MpOwo+ICsKPiAgICAg IGFjLT5uYW1lID0gIlhlbiI7Cj4gICAgICBhYy0+aW5pdF9tYWNoaW5lID0geGVuX2luaXQ7Cj4g ICAgICBhYy0+c2V0dXBfcG9zdCA9IHhlbl9zZXR1cF9wb3N0Owo+ICAgICAgYWMtPmFsbG93ZWQg PSAmeGVuX2FsbG93ZWQ7Cj4gLSAgICBhYy0+Z2xvYmFsX3Byb3BzID0geGVuX2NvbXBhdF9wcm9w czsKPiArICAgIGFjLT5jb21wYXRfcHJvcHMgPSBnX3B0cl9hcnJheV9uZXcoKTsKPiArCj4gKyAg ICBjb21wYXRfcHJvcHNfYWRkKGFjLT5jb21wYXRfcHJvcHMsCj4gKyAgICAgICAgICAgICAgICAg ICAgIHhlbl9jb21wYXRfcHJvcHMsIEdfTl9FTEVNRU5UUyh4ZW5fY29tcGF0X3Byb3BzKSk7Cj4g IH0KPiAgCj4gICNkZWZpbmUgVFlQRV9YRU5fQUNDRUwgQUNDRUxfQ0xBU1NfTkFNRSgieGVuIikK PiBkaWZmIC0tZ2l0IGEvcW9tL29iamVjdC5jIGIvcW9tL29iamVjdC5jCj4gaW5kZXggMTc5MjFj MGE3MS4uZGJkYWIwYWVhZCAxMDA2NDQKPiAtLS0gYS9xb20vb2JqZWN0LmMKPiArKysgYi9xb20v b2JqZWN0LmMKPiBAQCAtMzcwLDYgKzM3MCwzMSBAQCBzdGF0aWMgdm9pZCBvYmplY3RfcG9zdF9p bml0X3dpdGhfdHlwZShPYmplY3QgKm9iaiwgVHlwZUltcGwgKnRpKQo+ICAgICAgfQo+ICB9Cj4g IAo+ICt2b2lkIG9iamVjdF9hcHBseV9nbG9iYWxfcHJvcHMoT2JqZWN0ICpvYmosIGNvbnN0IEdQ dHJBcnJheSAqcHJvcHMsIEVycm9yICoqZXJycCkKPiArewo+ICsgICAgRXJyb3IgKmVyciA9IE5V TEw7Cj4gKyAgICBpbnQgaTsKPiArCj4gKyAgICBpZiAoIXByb3BzKSB7Cj4gKyAgICAgICAgcmV0 dXJuOwo+ICsgICAgfQo+ICsKPiArICAgIGZvciAoaSA9IDA7IGkgPCBwcm9wcy0+bGVuOyBpKysp IHsKPiArICAgICAgICBHbG9iYWxQcm9wZXJ0eSAqcCA9IGdfcHRyX2FycmF5X2luZGV4KHByb3Bz LCBpKTsKPiArCj4gKyAgICAgICAgaWYgKG9iamVjdF9keW5hbWljX2Nhc3Qob2JqLCBwLT5kcml2 ZXIpID09IE5VTEwpIHsKPiArICAgICAgICAgICAgY29udGludWU7Cj4gKyAgICAgICAgfQo+ICsg ICAgICAgIHAtPnVzZWQgPSB0cnVlOwo+ICsgICAgICAgIG9iamVjdF9wcm9wZXJ0eV9wYXJzZShv YmosIHAtPnZhbHVlLCBwLT5wcm9wZXJ0eSwgJmVycik7Cj4gKyAgICAgICAgaWYgKGVyciAhPSBO VUxMKSB7Cj4gKyAgICAgICAgICAgIGVycm9yX3ByZXBlbmQoJmVyciwgImNhbid0IGFwcGx5IGds b2JhbCAlcy4lcz0lczogIiwKPiArICAgICAgICAgICAgICAgICAgICAgICAgICBwLT5kcml2ZXIs IHAtPnByb3BlcnR5LCBwLT52YWx1ZSk7Cj4gKyAgICAgICAgICAgIGVycm9yX3Byb3BhZ2F0ZShl cnJwLCBlcnIpOwo+ICsgICAgICAgIH0KPiArICAgIH0KPiArfQo+ICsKPiAgc3RhdGljIHZvaWQg b2JqZWN0X2luaXRpYWxpemVfd2l0aF90eXBlKHZvaWQgKmRhdGEsIHNpemVfdCBzaXplLCBUeXBl SW1wbCAqdHlwZSkKPiAgewo+ICAgICAgT2JqZWN0ICpvYmogPSBkYXRhOwo+IGRpZmYgLS1naXQg YS92bC5jIGIvdmwuYwo+IGluZGV4IGE1YWU1ZjIzZDIuLjg4YmE2NTg1NzIgMTAwNjQ0Cj4gLS0t IGEvdmwuYwo+ICsrKyBiL3ZsLmMKPiBAQCAtMjk2OCw3ICsyOTY4LDYgQEAgc3RhdGljIHZvaWQg dXNlcl9yZWdpc3Rlcl9nbG9iYWxfcHJvcHModm9pZCkKPiAgICovCj4gIHN0YXRpYyB2b2lkIHJl Z2lzdGVyX2dsb2JhbF9wcm9wZXJ0aWVzKE1hY2hpbmVTdGF0ZSAqbXMpCj4gIHsKPiAtICAgIGFj Y2VsX3JlZ2lzdGVyX2NvbXBhdF9wcm9wcyhtcy0+YWNjZWxlcmF0b3IpOwo+ICAgICAgbWFjaGlu ZV9yZWdpc3Rlcl9jb21wYXRfcHJvcHMobXMpOwo+ICAgICAgdXNlcl9yZWdpc3Rlcl9nbG9iYWxf cHJvcHMoKTsKPiAgfQoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qu b3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2 ZWw= From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44131) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWhs0-0007ta-FF for qemu-devel@nongnu.org; Tue, 11 Dec 2018 08:14:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gWhrx-0006W8-A8 for qemu-devel@nongnu.org; Tue, 11 Dec 2018 08:14:40 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34954) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gWhrx-0006Vs-1I for qemu-devel@nongnu.org; Tue, 11 Dec 2018 08:14:37 -0500 Date: Tue, 11 Dec 2018 14:14:29 +0100 From: Igor Mammedov Message-ID: <20181211141429.1081009e@redhat.com> In-Reply-To: <20181204142023.15982-8-marcandre.lureau@redhat.com> References: <20181204142023.15982-1-marcandre.lureau@redhat.com> <20181204142023.15982-8-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH for-3.2 v5 07/19] hw: apply accel compat properties without touching globals List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?B?TWFyYy1BbmRyw6k=?= Lureau Cc: qemu-devel@nongnu.org, Stefano Stabellini , ehabkost@redhat.com, "open list:X86" , Paolo Bonzini , Anthony Perard , Andreas =?UTF-8?B?RsOkcmJlcg==?= On Tue, 4 Dec 2018 18:20:11 +0400 Marc-Andr=C3=A9 Lureau wrote: > Instead of registering compat properties as globals, let's keep them > in their own array, to avoid mixing with user globals. >=20 > Introduce object_apply_global_props() function, to apply compatibility > properties from a GPtrArray. >=20 > Signed-off-by: Marc-Andr=C3=A9 Lureau other than static leak looks fine, considering that we already leak compat_props, it doesn't really matter, so: Reviewed-by: Igor Mammedov > --- > include/hw/qdev-core.h | 10 ++++++++++ > include/qom/object.h | 3 +++ > include/sysemu/accel.h | 4 +--- > accel/accel.c | 12 ------------ > hw/core/qdev.c | 9 +++++++++ > hw/xen/xen-common.c | 9 ++++++--- > qom/object.c | 25 +++++++++++++++++++++++++ > vl.c | 1 - > 8 files changed, 54 insertions(+), 19 deletions(-) >=20 > diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h > index a24d0dd566..aeaa6dbbb8 100644 > --- a/include/hw/qdev-core.h > +++ b/include/hw/qdev-core.h > @@ -267,6 +267,16 @@ typedef struct GlobalProperty { > Error **errp; > } GlobalProperty; > =20 > +static inline void > +compat_props_add(GPtrArray *arr, > + GlobalProperty props[], size_t nelem) > +{ > + int i; > + for (i =3D 0; i < nelem; i++) { > + g_ptr_array_add(arr, (void *)&props[i]); > + } > +} > + > /*** Board API. This should go away once we have a machine config file.= ***/ > =20 > DeviceState *qdev_create(BusState *bus, const char *name); > diff --git a/include/qom/object.h b/include/qom/object.h > index 0139838b69..5183c587f3 100644 > --- a/include/qom/object.h > +++ b/include/qom/object.h > @@ -676,6 +676,9 @@ Object *object_new_with_propv(const char *typename, > Error **errp, > va_list vargs); > =20 > +void object_apply_global_props(Object *obj, const GPtrArray *props, > + Error **errp); > + > /** > * object_set_props: > * @obj: the object instance to set properties on > diff --git a/include/sysemu/accel.h b/include/sysemu/accel.h > index 637358f430..f331d128e9 100644 > --- a/include/sysemu/accel.h > +++ b/include/sysemu/accel.h > @@ -49,7 +49,7 @@ typedef struct AccelClass { > * global properties may be overridden by machine-type > * compat_props or user-provided global properties. > */ > - GlobalProperty *global_props; > + GPtrArray *compat_props; > } AccelClass; > =20 > #define TYPE_ACCEL "accel" > @@ -67,8 +67,6 @@ typedef struct AccelClass { > extern unsigned long tcg_tb_size; > =20 > void configure_accelerator(MachineState *ms); > -/* Register accelerator specific global properties */ > -void accel_register_compat_props(AccelState *accel); > /* Called just before os_setup_post (ie just before drop OS privs) */ > void accel_setup_post(MachineState *ms); > =20 > diff --git a/accel/accel.c b/accel/accel.c > index 3da26eb90f..6db5d8f4df 100644 > --- a/accel/accel.c > +++ b/accel/accel.c > @@ -119,18 +119,6 @@ void configure_accelerator(MachineState *ms) > } > } > =20 > -void accel_register_compat_props(AccelState *accel) > -{ > - AccelClass *class =3D ACCEL_GET_CLASS(accel); > - GlobalProperty *prop =3D class->global_props; > - > - for (; prop && prop->driver; prop++) { > - /* Any compat_props must never cause error */ > - prop->errp =3D &error_abort; > - qdev_prop_register_global(prop); > - } > -} > - > void accel_setup_post(MachineState *ms) > { > AccelState *accel =3D ms->accelerator; > diff --git a/hw/core/qdev.c b/hw/core/qdev.c > index 6b3cc55b27..53b507164f 100644 > --- a/hw/core/qdev.c > +++ b/hw/core/qdev.c > @@ -972,6 +972,15 @@ static void device_initfn(Object *obj) > =20 > static void device_post_init(Object *obj) > { > + if (object_dynamic_cast(qdev_get_machine(), TYPE_MACHINE)) { > + MachineState *m =3D MACHINE(qdev_get_machine()); > + AccelClass *ac =3D ACCEL_GET_CLASS(m->accelerator); > + > + if (ac->compat_props) { > + object_apply_global_props(obj, ac->compat_props, &error_abor= t); > + } > + } > + > qdev_prop_set_globals(DEVICE(obj)); > } > =20 > diff --git a/hw/xen/xen-common.c b/hw/xen/xen-common.c > index 6ec14c73ca..4532aa8632 100644 > --- a/hw/xen/xen-common.c > +++ b/hw/xen/xen-common.c > @@ -174,18 +174,21 @@ static GlobalProperty xen_compat_props[] =3D { > .driver =3D "migration", > .property =3D "send-section-footer", > .value =3D "off", > - }, > - { /* end of list */ }, > + } > }; > =20 > static void xen_accel_class_init(ObjectClass *oc, void *data) > { > AccelClass *ac =3D ACCEL_CLASS(oc); > + > ac->name =3D "Xen"; > ac->init_machine =3D xen_init; > ac->setup_post =3D xen_setup_post; > ac->allowed =3D &xen_allowed; > - ac->global_props =3D xen_compat_props; > + ac->compat_props =3D g_ptr_array_new(); > + > + compat_props_add(ac->compat_props, > + xen_compat_props, G_N_ELEMENTS(xen_compat_props)); > } > =20 > #define TYPE_XEN_ACCEL ACCEL_CLASS_NAME("xen") > diff --git a/qom/object.c b/qom/object.c > index 17921c0a71..dbdab0aead 100644 > --- a/qom/object.c > +++ b/qom/object.c > @@ -370,6 +370,31 @@ static void object_post_init_with_type(Object *obj, = TypeImpl *ti) > } > } > =20 > +void object_apply_global_props(Object *obj, const GPtrArray *props, Erro= r **errp) > +{ > + Error *err =3D NULL; > + int i; > + > + if (!props) { > + return; > + } > + > + for (i =3D 0; i < props->len; i++) { > + GlobalProperty *p =3D g_ptr_array_index(props, i); > + > + if (object_dynamic_cast(obj, p->driver) =3D=3D NULL) { > + continue; > + } > + p->used =3D true; > + object_property_parse(obj, p->value, p->property, &err); > + if (err !=3D NULL) { > + error_prepend(&err, "can't apply global %s.%s=3D%s: ", > + p->driver, p->property, p->value); > + error_propagate(errp, err); > + } > + } > +} > + > static void object_initialize_with_type(void *data, size_t size, TypeImp= l *type) > { > Object *obj =3D data; > diff --git a/vl.c b/vl.c > index a5ae5f23d2..88ba658572 100644 > --- a/vl.c > +++ b/vl.c > @@ -2968,7 +2968,6 @@ static void user_register_global_props(void) > */ > static void register_global_properties(MachineState *ms) > { > - accel_register_compat_props(ms->accelerator); > machine_register_compat_props(ms); > user_register_global_props(); > }