From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Durrant Subject: [PATCH v3 2/6] x86/viridian: don't put Xen version information in CPUID leaf 2 Date: Tue, 21 Mar 2017 18:17:18 +0000 Message-ID: <1490120242-3587-3-git-send-email-paul.durrant@citrix.com> References: <1490120242-3587-1-git-send-email-paul.durrant@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 1cqOLZ-0000Uk-Ew for xen-devel@lists.xenproject.org; Tue, 21 Mar 2017 18:17:29 +0000 In-Reply-To: <1490120242-3587-1-git-send-email-paul.durrant@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: Andrew Cooper , Paul Durrant , Jan Beulich List-Id: xen-devel@lists.xenproject.org VGhlIEh5cGVydmlzb3IgVG9wIExldmVsIEZ1bmN0aW9uYWwgU3BlY2lmaWNhdGlvbiB2NS4wYSBz dGF0ZXMgaW4gc2VjdGlvbgoyLjU6CgoiVGhlIGh5cGVydmlzb3IgdmVyc2lvbiBpbmZvcm1hdGlv biBpcyBlbmNvZGVkIGluIGxlYWYgMHg0MDAwMDAwMi4gVHdvCnZlcnNpb24gbnVtYmVycyBhcmUg cHJvdmlkZWQ6IHRoZSBtYWluIHZlcnNpb24gYW5kIHRoZSBzZXJ2aWNlIHZlcnNpb24uClRoZSBt YWluIHZlcnNpb24gaW5jbHVkZXMgYSBtYWpvciBhbmQgbWlub3IgdmVyc2lvbiBudW1iZXIgYW5k IGEgYnVpbGQKbnVtYmVyLiBUaGVzZSBjb3JyZXNwb25kIHRvIE1pY3Jvc29mdCBXaW5kb3dzIHJl bGVhc2UgbnVtYmVycy4iCgpJdCBhbHNvIGdvZXMgb24gdG8gYWR2aXNlIGNsaWVudHMgKGkuZS4g Z3Vlc3QgdmVyc2lvbnMgb2YgV2luZG93cykgdG8gdXNlCnRoZSBmb2xsb3dpbmcgYWxnb3JpdGht IHRvIGRldGVybWluZSBjb21wYXRpYmlsaXR5IHdpdGggdGhlIGh5cGVydmlzb3IKZW5saWdodGVu bWVudHM6CgppZiA8eW91ci1tYWluLXZlcnNpb24+IGdyZWF0ZXIgdGhhbiA8aHlwZXJ2aXNvci1t YWluLXZlcnNpb24+CnsKCXlvdXIgdmVyc2lvbiBpcyBjb21wYXRpYmxlCn0KZWxzZSBpZiA8eW91 ci1tYWluLXZlcnNpb24+IGVxdWFsIHRvIDxoeXBlcnZpc29yLW1haW4tdmVyc2lvbj4gYW5kCiA8 eW91ci1zZXJ2aWNlLXZlcnNpb24+IGdyZWF0ZXIgdGhhbiBvciBlcXVhbCB0byA8aHlwZXJ2aXNv ci1zZXJ2aWNlLXZlcnNpb24+CnsKCXlvdXIgdmVyc2lvbiBpcyBjb21wYXRpYmxlCn0KZWxzZQp7 Cgl5b3VyIHZlcnNpb24gaXMgTk9UIGNvbXBhdGlibGUKfQoKU28sIGNsZWFybHkgcHV0dGluZyBY ZW4gaHlwZXJ2aXNvciB2ZXJzaW9uIGluZm9ybWF0aW9uIGluIHRoYXQgbGVhZiBpcwpzcHVyaW91 cywgYnV0IHdlIHByb2JhYmx5IGdldCBhd2F5IHdpdGggaXQgYmVjYXVzZSBYZW4ncyBtYWpvciB2 ZXJzaW9uCmlzIGxvd2VyIHRoYW4gdGhlIG1ham9yIHZlcnNpb24gb2YgV2luZG93cyBpbiB3aGlj aCBIeXBlci1WIGZpcnN0CmFwcGVhcmVkIChTZXJ2ZXIgMjAwOCkuCgpUaGlzIHBhdGNoIGNoYW5n ZXMgdGhlIGxlYWYgdG8gdXNlIHRoZSBrZXJuZWwgbWFqb3IgYW5kIG1pbm9yCnZlcnNpb25zLCBh bmQgYnVpbGQgbnVtYmVyIGZyb20gV2luZG93cyBTZXJ2ZXIgMjAwOCAoNjQtYml0KSBieSBkZWZh dWx0LgpUaGVzZSBkZWZhdWx0IHZhbHVlcyBjYW4gYmUgb3ZlcnJpZGVuIGZyb20gdGhlIFhlbiBj b21tYW5kIGxpbmUgdXNpbmcgbmV3Cid2aXJpZGlhbi12ZXJzaW9uJyBwYXJhbWV0ZXIuCgpTaWdu ZWQtb2ZmLWJ5OiBQYXVsIER1cnJhbnQgPHBhdWwuZHVycmFudEBjaXRyaXguY29tPgotLS0KQ2M6 IEphbiBCZXVsaWNoIDxqYmV1bGljaEBzdXNlLmNvbT4KQ2M6IEFuZHJldyBDb29wZXIgPGFuZHJl dy5jb29wZXIzQGNpdHJpeC5jb20+Cgp2MzoKIC0gVXNlIGEgY29tYmluZWQgdmVyc2lvbiBwYXJh bWV0ZXIKCnYyOgogLSBVc2UgZnVsbCB2ZXJzaW9uIGluZm9ybWF0aW9uIChpbmNsdWRpbmcgYnVp bGQgbnVtYmVyKSBmcm9tIFdpbmRvd3MKICAgU2VydmVyIDIwMDgKIC0gQWRkIGNvbW1hbmQgbGlu ZSBwYXJhbWV0ZXJzIHRvIGFsbG93IHZlcnNpb24gaW5mb3JtYXRpb24gdG8gYmUKICAgb3ZlcnJp ZGRlbgotLS0KIGRvY3MvbWlzYy94ZW4tY29tbWFuZC1saW5lLm1hcmtkb3duIHwgIDggKysrKysr CiB4ZW4vYXJjaC94ODYvaHZtL3ZpcmlkaWFuLmMgICAgICAgICB8IDUwICsrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrLS0KIDIgZmlsZXMgY2hhbmdlZCwgNTYgaW5zZXJ0aW9ucygr KSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kb2NzL21pc2MveGVuLWNvbW1hbmQtbGlu ZS5tYXJrZG93biBiL2RvY3MvbWlzYy94ZW4tY29tbWFuZC1saW5lLm1hcmtkb3duCmluZGV4IGJh ZDIwZGIuLmYwMjllNjYgMTAwNjQ0Ci0tLSBhL2RvY3MvbWlzYy94ZW4tY29tbWFuZC1saW5lLm1h cmtkb3duCisrKyBiL2RvY3MvbWlzYy94ZW4tY29tbWFuZC1saW5lLm1hcmtkb3duCkBAIC0xNjE2 LDYgKzE2MTYsMTQgQEAgVGhlIG9wdGlvbmFsIGBrZWVwYCBwYXJhbWV0ZXIgY2F1c2VzIFhlbiB0 byBjb250aW51ZSB1c2luZyB0aGUgdmdhCiBjb25zb2xlIGV2ZW4gYWZ0ZXIgZG9tMCBoYXMgYmVl biBzdGFydGVkLiAgVGhlIGRlZmF1bHQgYmVoYXZpb3VyIGlzIHRvCiByZWxpbnF1aXNoIGNvbnRy b2wgdG8gZG9tMC4KIAorIyMjIHZpcmlkaWFuLXZlcnNpb24KKz4gYD0gPG1ham9yPiw8bWlub3I+ LDxidWlsZD5gCisKKz4gRGVmYXVsdDogYDYsMCwxNzcyYAorCis8bWFqb3I+LCA8bWlub3I+IGFu ZCA8YnVpbGQ+IG11c3QgYmUgaW50ZWdlcnMgc3BlY2lmaWVkIGluIGhleGFkZWNpbWFsLiBUaGUg dmFsdWVzIHdpbGwgYmUKK2VuY29kZWQgaW4gZ3Vlc3QgQ1BVSUQgMHg0MDAwMDAwMiBpZiB2aXJp ZGlhbiBlbmxpZ2h0ZW5tZW50cyBhcmUgZW5hYmxlZC4KKwogIyMjIHZwaWQgKEludGVsKQogPiBg PSA8Ym9vbGVhbj5gCiAKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9odm0vdmlyaWRpYW4uYyBi L3hlbi9hcmNoL3g4Ni9odm0vdmlyaWRpYW4uYwppbmRleCBhNzFmOTI4Li44YTVjODMxIDEwMDY0 NAotLS0gYS94ZW4vYXJjaC94ODYvaHZtL3ZpcmlkaWFuLmMKKysrIGIveGVuL2FyY2gveDg2L2h2 bS92aXJpZGlhbi5jCkBAIC0xMDYsNiArMTA2LDE5IEBAIHR5cGVkZWYgc3RydWN0IHsKICNkZWZp bmUgQ1BVSUQ2QV9NU1JfQklUTUFQUyAgICAgKDEgPDwgMSkKICNkZWZpbmUgQ1BVSUQ2QV9ORVNU RURfUEFHSU5HICAgKDEgPDwgMykKIAorLyoKKyAqIFZlcnNpb24gYW5kIGJ1aWxkIG51bWJlciBy ZXBvcnRlZCBieSBDUFVJRCBsZWFmIDIKKyAqCisgKiBUaGVzZSBudW1iZXJzIGFyZSBjaG9zZW4g dG8gbWF0Y2ggdGhlIHZlcnNpb24gbnVtYmVycyByZXBvcnRlZCBieQorICogV2luZG93cyBTZXJ2 ZXIgMjAwOC4KKyAqLworc3RhdGljIGNoYXIgX19pbml0ZGF0YSB2aXJpZGlhbl92ZXJzaW9uW3Np emVvZigiMHhWVlZWLDB4VlZWViwweFZWVlZWVlZWIildID0gIiI7CitzdHJpbmdfcGFyYW0oInZp cmlkaWFuLXZlcnNpb24iLCB2aXJpZGlhbl92ZXJzaW9uKTsKKworc3RhdGljIHVpbnQxNl90IHZp cmlkaWFuX21ham9yID0gNjsKK3N0YXRpYyB1aW50MTZfdCB2aXJpZGlhbl9taW5vciA9IDA7Citz dGF0aWMgdWludDMyX3QgdmlyaWRpYW5fYnVpbGQgPSAweDE3NzI7CisKIHZvaWQgY3B1aWRfdmly aWRpYW5fbGVhdmVzKGNvbnN0IHN0cnVjdCB2Y3B1ICp2LCB1aW50MzJfdCBsZWFmLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgdWludDMyX3Qgc3VibGVhZiwgc3RydWN0IGNwdWlkX2xlYWYg KnJlcykKIHsKQEAgLTEzNCw4ICsxNDcsOCBAQCB2b2lkIGNwdWlkX3ZpcmlkaWFuX2xlYXZlcyhj b25zdCBzdHJ1Y3QgdmNwdSAqdiwgdWludDMyX3QgbGVhZiwKICAgICAgICAgICAgb3duIHZlcnNp b24gbnVtYmVyLiAqLwogICAgICAgICBpZiAoIGQtPmFyY2guaHZtX2RvbWFpbi52aXJpZGlhbi5n dWVzdF9vc19pZC5yYXcgPT0gMCApCiAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgcmVzLT5h ID0gMTsgLyogQnVpbGQgbnVtYmVyICovCi0gICAgICAgIHJlcy0+YiA9ICh4ZW5fbWFqb3JfdmVy c2lvbigpIDw8IDE2KSB8IHhlbl9taW5vcl92ZXJzaW9uKCk7CisgICAgICAgIHJlcy0+YSA9IHZp cmlkaWFuX2J1aWxkOworICAgICAgICByZXMtPmIgPSAoKHVpbnQzMl90KXZpcmlkaWFuX21ham9y IDw8IDE2KSB8IHZpcmlkaWFuX21pbm9yOwogICAgICAgICByZXMtPmMgPSAwOyAvKiBTUCAqLwog ICAgICAgICByZXMtPmQgPSAwOyAvKiBTZXJ2aWNlIGJyYW5jaCBhbmQgbnVtYmVyICovCiAgICAg ICAgIGJyZWFrOwpAQCAtOTEwLDYgKzkyMywzOSBAQCBzdGF0aWMgaW50IHZpcmlkaWFuX2xvYWRf dmNwdV9jdHh0KHN0cnVjdCBkb21haW4gKmQsIGh2bV9kb21haW5fY29udGV4dF90ICpoKQogSFZN X1JFR0lTVEVSX1NBVkVfUkVTVE9SRShWSVJJRElBTl9WQ1BVLCB2aXJpZGlhbl9zYXZlX3ZjcHVf Y3R4dCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgdmlyaWRpYW5fbG9hZF92Y3B1X2N0eHQs IDEsIEhWTVNSX1BFUl9WQ1BVKTsKIAorc3RhdGljIGludCBfX2luaXQgdmlyaWRpYW5faW5pdCh2 b2lkKQoreworICAgIGNoYXIgKnQsICp2ID0gdmlyaWRpYW5fdmVyc2lvbjsKKyAgICB1bnNpZ25l ZCBpbnQgblszXSwgaSA9IDA7CisKKyAgICBpZiAoICp2ID09ICdcMCcgKQorICAgICAgICByZXR1 cm4gMDsKKworICAgIHdoaWxlICggKHQgPSBzdHJzZXAoJnYsICIsIikpICE9IE5VTEwgKQorICAg IHsKKyAgICAgICAgY29uc3QgY2hhciAqZTsKKworICAgICAgICBuW2krK10gPSBzaW1wbGVfc3Ry dG91bCh0LCAmZSwgMTYpOworICAgICAgICBpZiAoICplICE9ICdcMCcgKQorICAgICAgICAgICAg Z290byBmYWlsOworICAgIH0KKyAgICBpZiAoIGkgIT0gMyApCisgICAgICAgIGdvdG8gZmFpbDsK KworICAgIGlmIChuWzBdID4gMHhmZmZmIHx8IG5bMV0gPiAweGZmZmYpCisgICAgICAgIGdvdG8g ZmFpbDsKKworICAgIHZpcmlkaWFuX21ham9yID0gblswXTsKKyAgICB2aXJpZGlhbl9taW5vciA9 IG5bMV07CisgICAgdmlyaWRpYW5fYnVpbGQgPSBuWzJdOworICAgIHJldHVybiAwOworCitmYWls OgorICAgIHByaW50ayhYRU5MT0dfV0FSTklORyAiSW52YWxpZCB2aXJpZGlhbi12ZXJzaW9uLCB1 c2luZyBkZWZhdWx0XG4iKTsKKyAgICByZXR1cm4gMDsKK30KK19faW5pdGNhbGwodmlyaWRpYW5f aW5pdCk7CisKIC8qCiAgKiBMb2NhbCB2YXJpYWJsZXM6CiAgKiBtb2RlOiBDCi0tIAoyLjEuNAoK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZl bCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4u b3JnL3hlbi1kZXZlbAo=