From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Durrant Subject: [PATCH v5 1/3] x86/viridian: don't put Xen version information in CPUID leaf 2 Date: Wed, 22 Mar 2017 15:28:07 +0000 Message-ID: <1490196489-16021-2-git-send-email-paul.durrant@citrix.com> References: <1490196489-16021-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 1cqiC5-0004my-Nz for xen-devel@lists.xenproject.org; Wed, 22 Mar 2017 15:29:01 +0000 In-Reply-To: <1490196489-16021-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+Cgp2NToKIC0gUmUtd29yayBjb2RlIGFzIHBlciBKYW4ncyBz dWdnZXN0aW9uCiAtIEZpeCBsYWJlbCBpbmRlbnRhdGlvbgoKdjQ6CiAtIE1ha2UgZWxlbWVudHMg b2YgdmlyaWRpYW4tdmVyc2lvbiBwYXJhbWV0ZXIgb3B0aW9uYWwKIC0gVXNlIGN1c3RvbV9wYXJh bSgpCiAtIENvbnN0aWZ5IGEgcG9pbnRlcgoKdjM6CiAtIFVzZSBhIGNvbWJpbmVkIHZlcnNpb24g cGFyYW1ldGVyCgp2MjoKIC0gVXNlIGZ1bGwgdmVyc2lvbiBpbmZvcm1hdGlvbiAoaW5jbHVkaW5n IGJ1aWxkIG51bWJlcikgZnJvbSBXaW5kb3dzCiAgIFNlcnZlciAyMDA4CiAtIEFkZCBjb21tYW5k IGxpbmUgcGFyYW1ldGVycyB0byBhbGxvdyB2ZXJzaW9uIGluZm9ybWF0aW9uIHRvIGJlCiAgIG92 ZXJyaWRkZW4KLS0tCiBkb2NzL21pc2MveGVuLWNvbW1hbmQtbGluZS5tYXJrZG93biB8ICA4ICsr KysrKwogeGVuL2FyY2gveDg2L2h2bS92aXJpZGlhbi5jICAgICAgICAgfCA1NiArKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKy0tCiAyIGZpbGVzIGNoYW5nZWQsIDYyIGluc2VydGlv bnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZG9jcy9taXNjL3hlbi1jb21tYW5k LWxpbmUubWFya2Rvd24gYi9kb2NzL21pc2MveGVuLWNvbW1hbmQtbGluZS5tYXJrZG93bgppbmRl eCBiYWQyMGRiLi5jODFkNjkzIDEwMDY0NAotLS0gYS9kb2NzL21pc2MveGVuLWNvbW1hbmQtbGlu ZS5tYXJrZG93bgorKysgYi9kb2NzL21pc2MveGVuLWNvbW1hbmQtbGluZS5tYXJrZG93bgpAQCAt MTYxNiw2ICsxNjE2LDE0IEBAIFRoZSBvcHRpb25hbCBga2VlcGAgcGFyYW1ldGVyIGNhdXNlcyBY ZW4gdG8gY29udGludWUgdXNpbmcgdGhlIHZnYQogY29uc29sZSBldmVuIGFmdGVyIGRvbTAgaGFz IGJlZW4gc3RhcnRlZC4gIFRoZSBkZWZhdWx0IGJlaGF2aW91ciBpcyB0bwogcmVsaW5xdWlzaCBj b250cm9sIHRvIGRvbTAuCiAKKyMjIyB2aXJpZGlhbi12ZXJzaW9uCis+IGA9IFs8bWFqb3I+XSxb PG1pbm9yPl0sWzxidWlsZD5dYAorCis+IERlZmF1bHQ6IGA2LDAsMHgxNzcyYAorCis8bWFqb3I+ LCA8bWlub3I+IGFuZCA8YnVpbGQ+IG11c3QgYmUgaW50ZWdlcnMuIFRoZSB2YWx1ZXMgd2lsbCBi ZQorZW5jb2RlZCBpbiBndWVzdCBDUFVJRCAweDQwMDAwMDAyIGlmIHZpcmlkaWFuIGVubGlnaHRl bm1lbnRzIGFyZSBlbmFibGVkLgorCiAjIyMgdnBpZCAoSW50ZWwpCiA+IGA9IDxib29sZWFuPmAK IApkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L2h2bS92aXJpZGlhbi5jIGIveGVuL2FyY2gveDg2 L2h2bS92aXJpZGlhbi5jCmluZGV4IGI3NDAyMjQuLmQ1OTI5NGYgMTAwNjQ0Ci0tLSBhL3hlbi9h cmNoL3g4Ni9odm0vdmlyaWRpYW4uYworKysgYi94ZW4vYXJjaC94ODYvaHZtL3ZpcmlkaWFuLmMK QEAgLTE2NCw2ICsxNjQsMTYgQEAgdHlwZWRlZiBzdHJ1Y3QgewogI2RlZmluZSBDUFVJRDZBX01T Ul9CSVRNQVBTICAgICAoMSA8PCAxKQogI2RlZmluZSBDUFVJRDZBX05FU1RFRF9QQUdJTkcgICAo MSA8PCAzKQogCisvKgorICogVmVyc2lvbiBhbmQgYnVpbGQgbnVtYmVyIHJlcG9ydGVkIGJ5IENQ VUlEIGxlYWYgMgorICoKKyAqIFRoZXNlIG51bWJlcnMgYXJlIGNob3NlbiB0byBtYXRjaCB0aGUg dmVyc2lvbiBudW1iZXJzIHJlcG9ydGVkIGJ5CisgKiBXaW5kb3dzIFNlcnZlciAyMDA4LgorICov CitzdGF0aWMgdWludDE2X3QgX19yZWFkX21vc3RseSB2aXJpZGlhbl9tYWpvciA9IDY7CitzdGF0 aWMgdWludDE2X3QgX19yZWFkX21vc3RseSB2aXJpZGlhbl9taW5vciA9IDA7CitzdGF0aWMgdWlu dDMyX3QgX19yZWFkX21vc3RseSB2aXJpZGlhbl9idWlsZCA9IDB4MTc3MjsKKwogdm9pZCBjcHVp ZF92aXJpZGlhbl9sZWF2ZXMoY29uc3Qgc3RydWN0IHZjcHUgKnYsIHVpbnQzMl90IGxlYWYsCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICB1aW50MzJfdCBzdWJsZWFmLCBzdHJ1Y3QgY3B1aWRf bGVhZiAqcmVzKQogewpAQCAtMTk0LDggKzIwNCw4IEBAIHZvaWQgY3B1aWRfdmlyaWRpYW5fbGVh dmVzKGNvbnN0IHN0cnVjdCB2Y3B1ICp2LCB1aW50MzJfdCBsZWFmLAogICAgICAgICAgICBvd24g dmVyc2lvbiBudW1iZXIuICovCiAgICAgICAgIGlmICggZC0+YXJjaC5odm1fZG9tYWluLnZpcmlk aWFuLmd1ZXN0X29zX2lkLnJhdyA9PSAwICkKICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBy ZXMtPmEgPSAxOyAvKiBCdWlsZCBudW1iZXIgKi8KLSAgICAgICAgcmVzLT5iID0gKHhlbl9tYWpv cl92ZXJzaW9uKCkgPDwgMTYpIHwgeGVuX21pbm9yX3ZlcnNpb24oKTsKKyAgICAgICAgcmVzLT5h ID0gdmlyaWRpYW5fYnVpbGQ7CisgICAgICAgIHJlcy0+YiA9ICgodWludDMyX3QpdmlyaWRpYW5f bWFqb3IgPDwgMTYpIHwgdmlyaWRpYW5fbWlub3I7CiAgICAgICAgIHJlcy0+YyA9IDA7IC8qIFNQ ICovCiAgICAgICAgIHJlcy0+ZCA9IDA7IC8qIFNlcnZpY2UgYnJhbmNoIGFuZCBudW1iZXIgKi8K ICAgICAgICAgYnJlYWs7CkBAIC05OTAsNiArMTAwMCw0OCBAQCBzdGF0aWMgaW50IHZpcmlkaWFu X2xvYWRfdmNwdV9jdHh0KHN0cnVjdCBkb21haW4gKmQsIGh2bV9kb21haW5fY29udGV4dF90ICpo KQogSFZNX1JFR0lTVEVSX1NBVkVfUkVTVE9SRShWSVJJRElBTl9WQ1BVLCB2aXJpZGlhbl9zYXZl X3ZjcHVfY3R4dCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgdmlyaWRpYW5fbG9hZF92Y3B1 X2N0eHQsIDEsIEhWTVNSX1BFUl9WQ1BVKTsKIAorc3RhdGljIHZvaWQgX19pbml0IHBhcnNlX3Zp cmlkaWFuX3ZlcnNpb24oY2hhciAqYXJnKQoreworICAgIGNvbnN0IGNoYXIgKnQ7CisgICAgdW5z aWduZWQgaW50IG5bM107CisgICAgdW5zaWduZWQgaW50IGkgPSAwOworCisgICAgblswXSA9IHZp cmlkaWFuX21ham9yOworICAgIG5bMV0gPSB2aXJpZGlhbl9taW5vcjsKKyAgICBuWzJdID0gdmly aWRpYW5fYnVpbGQ7CisKKyAgICB3aGlsZSAoICh0ID0gc3Ryc2VwKCZhcmcsICIsIikpICE9IE5V TEwgKQorICAgIHsKKyAgICAgICAgY29uc3QgY2hhciAqZTsKKworICAgICAgICBpZiAoICp0ID09 ICdcMCcgKQorICAgICAgICAgICAgY29udGludWU7CisKKyAgICAgICAgbltpKytdID0gc2ltcGxl X3N0cnRvdWwodCwgJmUsIDApOworICAgICAgICBpZiAoICplICE9ICdcMCcgKQorICAgICAgICAg ICAgZ290byBmYWlsOworICAgIH0KKyAgICBpZiAoIGkgIT0gMyApCisgICAgICAgIGdvdG8gZmFp bDsKKworICAgIGlmICggKCh0eXBlb2YodmlyaWRpYW5fbWFqb3IpKW5bMF0gIT0gblswXSkgfHwK KyAgICAgICAgICgodHlwZW9mKHZpcmlkaWFuX21pbm9yKSluWzFdICE9IG5bMV0pIHx8CisgICAg ICAgICAoKHR5cGVvZih2aXJpZGlhbl9idWlsZCkpblsyXSAhPSBuWzJdKSApCisgICAgICAgIGdv dG8gZmFpbDsKKworICAgIHZpcmlkaWFuX21ham9yID0gblswXTsKKyAgICB2aXJpZGlhbl9taW5v ciA9IG5bMV07CisgICAgdmlyaWRpYW5fYnVpbGQgPSBuWzJdOworCisgICAgcHJpbnRrKCJ2aXJp ZGlhbi12ZXJzaW9uID0gJSN4LCUjeCwlI3hcbiIsCisgICAgICAgICAgIHZpcmlkaWFuX21ham9y LCB2aXJpZGlhbl9taW5vciwgdmlyaWRpYW5fYnVpbGQpOworICAgIHJldHVybjsKKworIGZhaWw6 CisgICAgcHJpbnRrKFhFTkxPR19XQVJOSU5HICJJbnZhbGlkIHZpcmlkaWFuLXZlcnNpb24sIHVz aW5nIGRlZmF1bHRcbiIpOworfQorY3VzdG9tX3BhcmFtKCJ2aXJpZGlhbi12ZXJzaW9uIiwgcGFy c2VfdmlyaWRpYW5fdmVyc2lvbik7CisKIC8qCiAgKiBMb2NhbCB2YXJpYWJsZXM6CiAgKiBtb2Rl OiBDCi0tIAoyLjEuNAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0 cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=