From mboxrd@z Thu Jan 1 00:00:00 1970 From: Anthony PERARD Subject: [PATCH v4 2/3] hw/acpi: Move acpi_set_pci_info to pcihp Date: Wed, 6 Sep 2017 14:40:32 +0100 Message-ID: <20170906134033.13348-3-anthony.perard@citrix.com> References: <20170906134033.13348-1-anthony.perard@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dpaZZ-00062s-NP for xen-devel@lists.xenproject.org; Wed, 06 Sep 2017 13:40:53 +0000 In-Reply-To: <20170906134033.13348-1-anthony.perard@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: qemu-devel@nongnu.org Cc: Eduardo Habkost , "Michael S. Tsirkin" , Paolo Bonzini , Igor Mammedov , Anthony PERARD , xen-devel@lists.xenproject.org, Richard Henderson List-Id: xen-devel@lists.xenproject.org SFcgcGFydCBvZiBBQ1BJIFBDSSBob3RwbHVnIGluIFFFTVUgZGVwZW5kcyBvbiBBQ1BJX1BDSUhQ X1BST1BfQlNFTApiZWluZyBzZXQgb24gYSBQQ0kgYnVzIHRoYXQgc3VwcG9ydHMgQUNQSSBob3Rw bHVnLiBJdCBzaG91bGQgd29yawpyZWdhcmRsZXNzIG9mIHRoZSBzb3VyY2Ugb2YgQUNQSSB0YWJs ZXMgKFFFTVUgZ2VuZXJhdG9yL2xlZ2FjeSBTZWFCSU9TL1hlbikuClNvIG1vdmUgQUNQSV9QQ0lI UF9QUk9QX0JTRUwgaW5pdGlhbGl6YXRpb24gaW50byBIVyBBQ1BJIGltcGxlbWVudGF0aW9uCnBh cnQgZnJvbSBRRU1VJ3MgQUNQSSB0YWJsZSBnZW5lcmF0b3IuCgpUbyBkbyBQQ0kgcGFzc3Rocm91 Z2ggd2l0aCBYZW4sIHRoZSBwcm9wZXJ0eSBBQ1BJX1BDSUhQX1BST1BfQlNFTCBuZWVkcwp0byBi ZSBzZXQsIGJ1dCB0aGlzIHdhcyBkb25lIG9ubHkgd2hlbiBBQ1BJIHRhYmxlcyBhcmUgYnVpbHQg d2hpY2ggaXMKbm90IG5lZWRlZCBmb3IgYSBYZW4gZ3Vlc3QuIFRoZSBuZWVkIGZvciB0aGUgcHJv cGVydHkgc3RhcnRzIHdpdGggY29tbWl0CiJwYzogcGNpaHA6IGF2b2lkIGFkZGluZyBBQ1BJX1BD SUhQX1BST1BfQlNFTCB0d2ljZSIKKGYwYzlkNjRhNjhiNzc2Mzc0ZWM0NzMyNDI0YTNlMjc3NTNj ZTM3YjYpLgoKQWRkaW5nIGZpbmRfaTQ0MGZ4IGludG8gc3R1YnMgc28gdGhhdCBtaXBzLXNvZnRt bXUgdGFyZ2V0IGNhbiBiZSBidWlsdC4KClJlcG9ydGVkLWJ5OiBTYW5kZXIgRWlrZWxlbmJvb20g PGxpbnV4QGVpa2VsZW5ib29tLml0PgpTaWduZWQtb2ZmLWJ5OiBBbnRob255IFBFUkFSRCA8YW50 aG9ueS5wZXJhcmRAY2l0cml4LmNvbT4KCi0tLQpDaGFuZ2VzIGluIFY0OgogIC0gY2FsbCBhY3Bp X3NldF9wY2lfaW5mbyBvbmx5IG9uY2UKICAtIEFkZCBhIHN0dWIgb2YgZmluZF9pNDQwZnggKGZv ciBtaXBzX3NvZnRtbXUgdGFyZ2V0KQoKQ2hhbmdlcyBpbiBWMzoKICAtIG1vdmUgYWNwaV9zZXRf cGNpX2luZm8gdG8gcGNpaHAgaW5zdGVhZAoKQ2hhbmdlcyBpbiBWMjoKICAtIGNoZWNrIGZvciBh Y3BpX2VuYWJsZWQgYmVmb3JlIGNhbGxpbmcgYWNwaV9zZXRfcGNpX2luZm8uCiAgLSBzZXQgdGhl IHByb3BlcnR5IG9uIHRoZSByb290IGJ1cyBvbmx5LgotLS0KIGh3L2FjcGkvcGNpaHAuYyAgICAg ICB8IDM4ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiBody9pMzg2L2Fj cGktYnVpbGQuYyAgfCAzMiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogc3R1YnMv TWFrZWZpbGUub2JqcyAgIHwgIDEgKwogc3R1YnMvcGNpLWhvc3QtcGlpeC5jIHwgIDYgKysrKysr CiA0IGZpbGVzIGNoYW5nZWQsIDQ1IGluc2VydGlvbnMoKyksIDMyIGRlbGV0aW9ucygtKQogY3Jl YXRlIG1vZGUgMTAwNjQ0IHN0dWJzL3BjaS1ob3N0LXBpaXguYwoKZGlmZiAtLWdpdCBhL2h3L2Fj cGkvcGNpaHAuYyBiL2h3L2FjcGkvcGNpaHAuYwppbmRleCA5ZGIzYzJlYWYyLi43ZGE1MWMwNTY5 IDEwMDY0NAotLS0gYS9ody9hY3BpL3BjaWhwLmMKKysrIGIvaHcvYWNwaS9wY2locC5jCkBAIC03 NSw2ICs3NSw0MyBAQCBzdGF0aWMgaW50IGFjcGlfcGNpaHBfZ2V0X2JzZWwoUENJQnVzICpidXMp CiAgICAgfQogfQogCisvKiBBc3NpZ24gQlNFTCBwcm9wZXJ0eSB0byBhbGwgYnVzZXMuICBJbiB0 aGUgZnV0dXJlLCB0aGlzIGNhbiBiZSBjaGFuZ2VkCisgKiB0byBvbmx5IGFzc2lnbiB0byBidXNl cyB0aGF0IHN1cHBvcnQgaG90cGx1Zy4KKyAqLworc3RhdGljIHZvaWQgKmFjcGlfc2V0X2JzZWwo UENJQnVzICpidXMsIHZvaWQgKm9wYXF1ZSkKK3sKKyAgICB1bnNpZ25lZCAqYnNlbF9hbGxvYyA9 IG9wYXF1ZTsKKyAgICB1bnNpZ25lZCAqYnVzX2JzZWw7CisKKyAgICBpZiAocWJ1c19pc19ob3Rw bHVnZ2FibGUoQlVTKGJ1cykpKSB7CisgICAgICAgIGJ1c19ic2VsID0gZ19tYWxsb2Moc2l6ZW9m ICpidXNfYnNlbCk7CisKKyAgICAgICAgKmJ1c19ic2VsID0gKCpic2VsX2FsbG9jKSsrOworICAg ICAgICBvYmplY3RfcHJvcGVydHlfYWRkX3VpbnQzMl9wdHIoT0JKRUNUKGJ1cyksIEFDUElfUENJ SFBfUFJPUF9CU0VMLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYnVz X2JzZWwsICZlcnJvcl9hYm9ydCk7CisgICAgfQorCisgICAgcmV0dXJuIGJzZWxfYWxsb2M7Cit9 CisKK3N0YXRpYyB2b2lkIGFjcGlfc2V0X3BjaV9pbmZvKHZvaWQpCit7CisgICAgc3RhdGljIGJv b2wgYnNlbF9pc19zZXQ7CisgICAgUENJQnVzICpidXM7CisgICAgdW5zaWduZWQgYnNlbF9hbGxv YyA9IEFDUElfUENJSFBfQlNFTF9ERUZBVUxUOworCisgICAgaWYgKGJzZWxfaXNfc2V0KSB7Cisg ICAgICAgIHJldHVybjsKKyAgICB9CisgICAgYnNlbF9pc19zZXQgPSB0cnVlOworCisgICAgYnVz ID0gZmluZF9pNDQwZngoKTsgLyogVE9ETzogUTM1IHN1cHBvcnQgKi8KKyAgICBpZiAoYnVzKSB7 CisgICAgICAgIC8qIFNjYW4gYWxsIFBDSSBidXNlcy4gU2V0IHByb3BlcnR5IHRvIGVuYWJsZSBh Y3BpIGJhc2VkIGhvdHBsdWcuICovCisgICAgICAgIHBjaV9mb3JfZWFjaF9idXNfZGVwdGhfZmly c3QoYnVzLCBhY3BpX3NldF9ic2VsLCBOVUxMLCAmYnNlbF9hbGxvYyk7CisgICAgfQorfQorCiBz dGF0aWMgdm9pZCBhY3BpX3BjaWhwX3Rlc3RfaG90cGx1Z19idXMoUENJQnVzICpidXMsIHZvaWQg Km9wYXF1ZSkKIHsKICAgICBBY3BpUGNpSHBGaW5kICpmaW5kID0gb3BhcXVlOwpAQCAtMTc3LDYg KzIxNCw3IEBAIHN0YXRpYyB2b2lkIGFjcGlfcGNpaHBfdXBkYXRlKEFjcGlQY2lIcFN0YXRlICpz KQogCiB2b2lkIGFjcGlfcGNpaHBfcmVzZXQoQWNwaVBjaUhwU3RhdGUgKnMpCiB7CisgICAgYWNw aV9zZXRfcGNpX2luZm8oKTsKICAgICBhY3BpX3BjaWhwX3VwZGF0ZShzKTsKIH0KIApkaWZmIC0t Z2l0IGEvaHcvaTM4Ni9hY3BpLWJ1aWxkLmMgYi9ody9pMzg2L2FjcGktYnVpbGQuYwppbmRleCA5 OGRkNDI0Njc4Li40ZDE5ZDkxZTFiIDEwMDY0NAotLS0gYS9ody9pMzg2L2FjcGktYnVpbGQuYwor KysgYi9ody9pMzg2L2FjcGktYnVpbGQuYwpAQCAtNDkzLDM2ICs0OTMsNiBAQCBidWlsZF9tYWR0 KEdBcnJheSAqdGFibGVfZGF0YSwgQklPU0xpbmtlciAqbGlua2VyLCBQQ01hY2hpbmVTdGF0ZSAq cGNtcykKICAgICAgICAgICAgICAgICAgdGFibGVfZGF0YS0+bGVuIC0gbWFkdF9zdGFydCwgMSwg TlVMTCwgTlVMTCk7CiB9CiAKLS8qIEFzc2lnbiBCU0VMIHByb3BlcnR5IHRvIGFsbCBidXNlcy4g IEluIHRoZSBmdXR1cmUsIHRoaXMgY2FuIGJlIGNoYW5nZWQKLSAqIHRvIG9ubHkgYXNzaWduIHRv IGJ1c2VzIHRoYXQgc3VwcG9ydCBob3RwbHVnLgotICovCi1zdGF0aWMgdm9pZCAqYWNwaV9zZXRf YnNlbChQQ0lCdXMgKmJ1cywgdm9pZCAqb3BhcXVlKQotewotICAgIHVuc2lnbmVkICpic2VsX2Fs bG9jID0gb3BhcXVlOwotICAgIHVuc2lnbmVkICpidXNfYnNlbDsKLQotICAgIGlmIChxYnVzX2lz X2hvdHBsdWdnYWJsZShCVVMoYnVzKSkpIHsKLSAgICAgICAgYnVzX2JzZWwgPSBnX21hbGxvYyhz aXplb2YgKmJ1c19ic2VsKTsKLQotICAgICAgICAqYnVzX2JzZWwgPSAoKmJzZWxfYWxsb2MpKys7 Ci0gICAgICAgIG9iamVjdF9wcm9wZXJ0eV9hZGRfdWludDMyX3B0cihPQkpFQ1QoYnVzKSwgQUNQ SV9QQ0lIUF9QUk9QX0JTRUwsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBidXNfYnNlbCwgJmVycm9yX2Fib3J0KTsKLSAgICB9Ci0KLSAgICByZXR1cm4gYnNlbF9hbGxv YzsKLX0KLQotc3RhdGljIHZvaWQgYWNwaV9zZXRfcGNpX2luZm8odm9pZCkKLXsKLSAgICBQQ0lC dXMgKmJ1cyA9IGZpbmRfaTQ0MGZ4KCk7IC8qIFRPRE86IFEzNSBzdXBwb3J0ICovCi0gICAgdW5z aWduZWQgYnNlbF9hbGxvYyA9IEFDUElfUENJSFBfQlNFTF9ERUZBVUxUOwotCi0gICAgaWYgKGJ1 cykgewotICAgICAgICAvKiBTY2FuIGFsbCBQQ0kgYnVzZXMuIFNldCBwcm9wZXJ0eSB0byBlbmFi bGUgYWNwaSBiYXNlZCBob3RwbHVnLiAqLwotICAgICAgICBwY2lfZm9yX2VhY2hfYnVzX2RlcHRo X2ZpcnN0KGJ1cywgYWNwaV9zZXRfYnNlbCwgTlVMTCwgJmJzZWxfYWxsb2MpOwotICAgIH0KLX0K LQogc3RhdGljIHZvaWQgYnVpbGRfYXBwZW5kX3BjaWhwX25vdGlmeV9lbnRyeShBbWwgKm1ldGhv ZCwgaW50IHNsb3QpCiB7CiAgICAgQW1sICppZl9jdHg7CkBAIC0yODg4LDggKzI4NTgsNiBAQCB2 b2lkIGFjcGlfc2V0dXAodm9pZCkKIAogICAgIGJ1aWxkX3N0YXRlID0gZ19tYWxsb2MwKHNpemVv ZiAqYnVpbGRfc3RhdGUpOwogCi0gICAgYWNwaV9zZXRfcGNpX2luZm8oKTsKLQogICAgIGFjcGlf YnVpbGRfdGFibGVzX2luaXQoJnRhYmxlcyk7CiAgICAgYWNwaV9idWlsZCgmdGFibGVzLCBNQUNI SU5FKHBjbXMpKTsKIApkaWZmIC0tZ2l0IGEvc3R1YnMvTWFrZWZpbGUub2JqcyBiL3N0dWJzL01h a2VmaWxlLm9ianMKaW5kZXggZTY5YzIxN2FmZi4uNGEzMzQ5NTkxMSAxMDA2NDQKLS0tIGEvc3R1 YnMvTWFrZWZpbGUub2JqcworKysgYi9zdHVicy9NYWtlZmlsZS5vYmpzCkBAIC00MCwzICs0MCw0 IEBAIHN0dWItb2JqLXkgKz0gcGNfbWFkdF9jcHVfZW50cnkubwogc3R1Yi1vYmoteSArPSB2bWdl bmlkLm8KIHN0dWItb2JqLXkgKz0geGVuLWNvbW1vbi5vCiBzdHViLW9iai15ICs9IHhlbi1odm0u bworc3R1Yi1vYmoteSArPSBwY2ktaG9zdC1waWl4Lm8KZGlmZiAtLWdpdCBhL3N0dWJzL3BjaS1o b3N0LXBpaXguYyBiL3N0dWJzL3BjaS1ob3N0LXBpaXguYwpuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwLi42ZWQ4MWIxZjIxCi0tLSAvZGV2L251bGwKKysrIGIvc3R1YnMvcGNp LWhvc3QtcGlpeC5jCkBAIC0wLDAgKzEsNiBAQAorI2luY2x1ZGUgInFlbXUvb3NkZXAuaCIKKyNp bmNsdWRlICJody9pMzg2L3BjLmgiCitQQ0lCdXMgKmZpbmRfaTQ0MGZ4KHZvaWQpCit7CisgICAg cmV0dXJuIE5VTEw7Cit9Ci0tIApBbnRob255IFBFUkFSRAoKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRl dmVsQGxpc3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=