From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH 3/6] x86/vpmu: Remove core2_no_vpmu_ops Date: Wed, 16 Nov 2016 12:31:47 +0000 Message-ID: <1479299510-700-4-git-send-email-andrew.cooper3@citrix.com> References: <1479299510-700-1-git-send-email-andrew.cooper3@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1479299510-700-1-git-send-email-andrew.cooper3@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: Xen-devel Cc: Kevin Tian , Andrew Cooper , Boris Ostrovsky , Jun Nakajima , Jan Beulich List-Id: xen-devel@lists.xenproject.org Y29yZTJfbm9fdnBtdV9vcHMgZXhpc3RzIHNvbGVseSB0byB3b3JrIGFyb3VuZCB0aGUgZGVmYXVs dC1sZWFraW5nIG9mIENQVUlEL01TUgp2YWx1ZXMgaW4gWGVuLgoKV2l0aCBDUFVJRCBoYW5kbGlu ZyByZW1vdmVkIGZyb20gYXJjaF92cG11X29wcywgdGhlIFJETVNSIGhhbmRsaW5nIGlzIHRoZSBs YXN0CnJlbWFpbmluZyBob29rLiAgU2luY2UgY29yZTJfbm9fdnBtdV9vcHMncyBpbnRyb2R1Y3Rp b24gaW4gYy9zIDI1MjUwZWQ3ICJ2cG11CmludGVsOiBBZGQgY3B1aWQgaGFuZGxpbmcgd2hlbiB2 cG11IGRpc2FibGVkIiwgYSBsb3Qgb2Ygd29yayBoYXMgYmVlbiBkb25lIGFuZAp0aGUgbm9wIHBh dGggaW4gdnBtdV9kb19tc3IoKSBub3cgc3VmZmljZXMuCgp2cG11X2RvX21zcigpIGFsc28gZmFs bHMgaW50byB0aGUgbm9wIHBhdGggZm9yIHVuLWNvbmZpZ3VyZWQgb3IgdW5wcml2aWxlZ2VkCmRv bWFpbnMsIHdoaWNoIGVuYWJsZXMgdGhlIHJlbW92YWwgdGhlIGR1cGxpY2F0ZSBsb2dpYyBpbiBw cml2X29wX3JlYWRfbXNyKCkuCgpGaW5hbGx5LCBtYWtlIGFsbCBhcmNoX3ZwbXVfb3BzIHN0cnVj dHVyZXMgY29uc3QgYXMgdGhleSBhcmUgbmV2ZXIgbW9kaWZpZWQsCmFuZCBtYWtlIHRoZW0gc3Rh dGljIGFzIHRoZXkgYXJlIG5vdCByZWZlcnJlZCB0byBleHRlcm5hbGx5LgoKU2lnbmVkLW9mZi1i eTogQW5kcmV3IENvb3BlciA8YW5kcmV3LmNvb3BlcjNAY2l0cml4LmNvbT4KLS0tCkNDOiBKYW4g QmV1bGljaCA8SkJldWxpY2hAc3VzZS5jb20+CkNDOiBCb3JpcyBPc3Ryb3Zza3kgPGJvcmlzLm9z dHJvdnNreUBvcmFjbGUuY29tPgpDQzogSnVuIE5ha2FqaW1hIDxqdW4ubmFrYWppbWFAaW50ZWwu Y29tPgpDQzogS2V2aW4gVGlhbiA8a2V2aW4udGlhbkBpbnRlbC5jb20+Ci0tLQogeGVuL2FyY2gv eDg2L2NwdS92cG11LmMgICAgICAgfCAgMyArKy0KIHhlbi9hcmNoL3g4Ni9jcHUvdnBtdV9hbWQu YyAgIHwgIDIgKy0KIHhlbi9hcmNoL3g4Ni9jcHUvdnBtdV9pbnRlbC5jIHwgMjIgKy0tLS0tLS0t LS0tLS0tLS0tLS0tLQogeGVuL2FyY2gveDg2L3RyYXBzLmMgICAgICAgICAgfCAgNiArLS0tLS0K IHhlbi9pbmNsdWRlL2FzbS14ODYvdnBtdS5oICAgIHwgIDIgKy0KIDUgZmlsZXMgY2hhbmdlZCwg NiBpbnNlcnRpb25zKCspLCAyOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94 ODYvY3B1L3ZwbXUuYyBiL3hlbi9hcmNoL3g4Ni9jcHUvdnBtdS5jCmluZGV4IGE1NDJmNGQuLjFm ODIyY2EgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9jcHUvdnBtdS5jCisrKyBiL3hlbi9hcmNo L3g4Ni9jcHUvdnBtdS5jCkBAIC0xMzYsOSArMTM2LDEwIEBAIGludCB2cG11X2RvX21zcih1bnNp Z25lZCBpbnQgbXNyLCB1aW50NjRfdCAqbXNyX2NvbnRlbnQsCiAgICAgY29uc3Qgc3RydWN0IGFy Y2hfdnBtdV9vcHMgKm9wczsKICAgICBpbnQgcmV0ID0gMDsKIAorICAgIC8qIERvbid0IGxlYWsg UE1VIE1TUnMgdG8gdW5wcml2aWxlZ2VkIGRvbWFpbnMuICovCiAgICAgaWYgKCBsaWtlbHkodnBt dV9tb2RlID09IFhFTlBNVV9NT0RFX09GRikgfHwKICAgICAgICAgICgodnBtdV9tb2RlICYgWEVO UE1VX01PREVfQUxMKSAmJgotICAgICAgICAgICFpc19oYXJkd2FyZV9kb21haW4oY3VycmVudC0+ ZG9tYWluKSkgKQorICAgICAgICAgICFpc19oYXJkd2FyZV9kb21haW4oY3Vyci0+ZG9tYWluKSkg KQogICAgICAgICAgZ290byBub3A7CiAKICAgICB2cG11ID0gdmNwdV92cG11KGN1cnIpOwpkaWZm IC0tZ2l0IGEveGVuL2FyY2gveDg2L2NwdS92cG11X2FtZC5jIGIveGVuL2FyY2gveDg2L2NwdS92 cG11X2FtZC5jCmluZGV4IDU1ZDAzYjMuLmJhZTgxYTkgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4 Ni9jcHUvdnBtdV9hbWQuYworKysgYi94ZW4vYXJjaC94ODYvY3B1L3ZwbXVfYW1kLmMKQEAgLTQ4 OCw3ICs0ODgsNyBAQCBzdGF0aWMgdm9pZCBhbWRfdnBtdV9kdW1wKGNvbnN0IHN0cnVjdCB2Y3B1 ICp2KQogICAgIH0KIH0KIAotc3RydWN0IGFyY2hfdnBtdV9vcHMgYW1kX3ZwbXVfb3BzID0gewor Y29uc3Qgc3RhdGljIHN0cnVjdCBhcmNoX3ZwbXVfb3BzIGFtZF92cG11X29wcyA9IHsKICAgICAu ZG9fd3Jtc3IgPSBhbWRfdnBtdV9kb193cm1zciwKICAgICAuZG9fcmRtc3IgPSBhbWRfdnBtdV9k b19yZG1zciwKICAgICAuZG9faW50ZXJydXB0ID0gYW1kX3ZwbXVfZG9faW50ZXJydXB0LApkaWZm IC0tZ2l0IGEveGVuL2FyY2gveDg2L2NwdS92cG11X2ludGVsLmMgYi94ZW4vYXJjaC94ODYvY3B1 L3ZwbXVfaW50ZWwuYwppbmRleCBlM2YyNWM4Li5iYWJlNGNiIDEwMDY0NAotLS0gYS94ZW4vYXJj aC94ODYvY3B1L3ZwbXVfaW50ZWwuYworKysgYi94ZW4vYXJjaC94ODYvY3B1L3ZwbXVfaW50ZWwu YwpAQCAtODY1LDcgKzg2NSw3IEBAIHN0YXRpYyB2b2lkIGNvcmUyX3ZwbXVfZGVzdHJveShzdHJ1 Y3QgdmNwdSAqdikKICAgICB2cG11X2NsZWFyKHZwbXUpOwogfQogCi1zdHJ1Y3QgYXJjaF92cG11 X29wcyBjb3JlMl92cG11X29wcyA9IHsKK2NvbnN0IHN0YXRpYyBzdHJ1Y3QgYXJjaF92cG11X29w cyBjb3JlMl92cG11X29wcyA9IHsKICAgICAuZG9fd3Jtc3IgPSBjb3JlMl92cG11X2RvX3dybXNy LAogICAgIC5kb19yZG1zciA9IGNvcmUyX3ZwbXVfZG9fcmRtc3IsCiAgICAgLmRvX2ludGVycnVw dCA9IGNvcmUyX3ZwbXVfZG9faW50ZXJydXB0LApAQCAtODc1LDMyICs4NzUsMTIgQEAgc3RydWN0 IGFyY2hfdnBtdV9vcHMgY29yZTJfdnBtdV9vcHMgPSB7CiAgICAgLmFyY2hfdnBtdV9kdW1wID0g Y29yZTJfdnBtdV9kdW1wCiB9OwogCi0vKgotICogSWYgaXRzIGEgdnBtdSBtc3Igc2V0IGl0IHRv IDAuCi0gKi8KLXN0YXRpYyBpbnQgY29yZTJfbm9fdnBtdV9kb19yZG1zcih1bnNpZ25lZCBpbnQg bXNyLCB1aW50NjRfdCAqbXNyX2NvbnRlbnQpCi17Ci0gICAgaW50IHR5cGUgPSAtMSwgaW5kZXgg PSAtMTsKLSAgICBpZiAoICFpc19jb3JlMl92cG11X21zcihtc3IsICZ0eXBlLCAmaW5kZXgpICkK LSAgICAgICAgcmV0dXJuIC1FSU5WQUw7Ci0gICAgKm1zcl9jb250ZW50ID0gMDsKLSAgICByZXR1 cm4gMDsKLX0KLQotLyoKLSAqIFRoZXNlIGZ1bmN0aW9ucyBhcmUgdXNlZCBpbiBjYXNlIHZwbXUg aXMgbm90IGVuYWJsZWQuCi0gKi8KLXN0cnVjdCBhcmNoX3ZwbXVfb3BzIGNvcmUyX25vX3ZwbXVf b3BzID0gewotICAgIC5kb19yZG1zciA9IGNvcmUyX25vX3ZwbXVfZG9fcmRtc3IsCi19OwotCiBp bnQgdm14X3ZwbXVfaW5pdGlhbGlzZShzdHJ1Y3QgdmNwdSAqdikKIHsKICAgICBzdHJ1Y3QgdnBt dV9zdHJ1Y3QgKnZwbXUgPSB2Y3B1X3ZwbXUodik7CiAgICAgdTY0IG1zcl9jb250ZW50OwogICAg IHN0YXRpYyBib29sX3QgZHNfd2FybmVkOwogCi0gICAgdnBtdS0+YXJjaF92cG11X29wcyA9ICZj b3JlMl9ub192cG11X29wczsKICAgICBpZiAoIHZwbXVfbW9kZSA9PSBYRU5QTVVfTU9ERV9PRkYg KQogICAgICAgICByZXR1cm4gMDsKIApkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L3RyYXBzLmMg Yi94ZW4vYXJjaC94ODYvdHJhcHMuYwppbmRleCA1OWU2YjE2Li5jZGNlNzJkIDEwMDY0NAotLS0g YS94ZW4vYXJjaC94ODYvdHJhcHMuYworKysgYi94ZW4vYXJjaC94ODYvdHJhcHMuYwpAQCAtMjUz MiwxMSArMjUzMiw3IEBAIHN0YXRpYyBpbnQgcHJpdl9vcF9yZWFkX21zcih1bnNpZ25lZCBpbnQg cmVnLCB1aW50NjRfdCAqdmFsLAogICAgIGNhc2UgTVNSX0s3X0VWTlRTRUwwLi4uTVNSX0s3X1BF UkZDVFIzOgogICAgICAgICAgICAgaWYgKCB2cG11X21zciB8fCAoYm9vdF9jcHVfZGF0YS54ODZf dmVuZG9yID09IFg4Nl9WRU5ET1JfQU1EKSApCiAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAg ICAgLyogRG9uJ3QgbGVhayBQTVUgTVNScyB0byB1bnByaXZpbGVnZWQgZG9tYWlucy4gKi8KLSAg ICAgICAgICAgICAgICBpZiAoICh2cG11X21vZGUgJiBYRU5QTVVfTU9ERV9BTEwpICYmCi0gICAg ICAgICAgICAgICAgICAgICAhaXNfaGFyZHdhcmVfZG9tYWluKGN1cnJkKSApCi0gICAgICAgICAg ICAgICAgICAgICp2YWwgPSAwOwotICAgICAgICAgICAgICAgIGVsc2UgaWYgKCB2cG11X2RvX3Jk bXNyKHJlZywgdmFsKSApCisgICAgICAgICAgICAgICAgaWYgKCB2cG11X2RvX3JkbXNyKHJlZywg dmFsKSApCiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgIHJldHVy biBYODZFTVVMX09LQVk7CiAgICAgICAgICAgICB9CmRpZmYgLS1naXQgYS94ZW4vaW5jbHVkZS9h c20teDg2L3ZwbXUuaCBiL3hlbi9pbmNsdWRlL2FzbS14ODYvdnBtdS5oCmluZGV4IGQxZGRhNGIu LmU1MDYxOGYgMTAwNjQ0Ci0tLSBhL3hlbi9pbmNsdWRlL2FzbS14ODYvdnBtdS5oCisrKyBiL3hl bi9pbmNsdWRlL2FzbS14ODYvdnBtdS5oCkBAIC02MCw3ICs2MCw3IEBAIHN0cnVjdCB2cG11X3N0 cnVjdCB7CiAgICAgdTMyIGh3X2xhcGljX2x2dHBjOwogICAgIHZvaWQgKmNvbnRleHQ7ICAgICAg LyogTWF5IGJlIHNoYXJlZCB3aXRoIFBWIGd1ZXN0ICovCiAgICAgdm9pZCAqcHJpdl9jb250ZXh0 OyAvKiBoeXBlcnZpc29yLW9ubHkgKi8KLSAgICBzdHJ1Y3QgYXJjaF92cG11X29wcyAqYXJjaF92 cG11X29wczsKKyAgICBjb25zdCBzdHJ1Y3QgYXJjaF92cG11X29wcyAqYXJjaF92cG11X29wczsK ICAgICBzdHJ1Y3QgeGVuX3BtdV9kYXRhICp4ZW5wbXVfZGF0YTsKICAgICBzcGlubG9ja190IHZw bXVfbG9jazsKIH07Ci0tIAoyLjEuNAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhl bi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=