From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH 07/10] x86/cpuid: Handle leaf 0xa in guest_cpuid() Date: Mon, 20 Feb 2017 11:00:31 +0000 Message-ID: <1487588434-4359-8-git-send-email-andrew.cooper3@citrix.com> References: <1487588434-4359-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: <1487588434-4359-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: Andrew Cooper , Jan Beulich List-Id: xen-devel@lists.xenproject.org TGVhZiAweGEgaXMgcmVzZXJ2ZWQgYnkgQU1ELCBhbmQgb25seSBleHBvc2VkIHRvIEludGVsIGd1 ZXN0cyB3aGVuIHZQTVUgaXMKZW5hYmxlZC4gIExlYXZlIHRoZSBsb2dpYyBhcy13YXMsIHJlYWR5 IHRvIGJlIGNsZWFuZWQgdXAgd2hlbiBmdXJ0aGVyCnRvb2xzdGFjayBpbmZyYXN0cnVjdHVyZSBp cyBpbiBwbGFjZS4KClNpZ25lZC1vZmYtYnk6IEFuZHJldyBDb29wZXIgPGFuZHJldy5jb29wZXIz QGNpdHJpeC5jb20+Ci0tLQpDQzogSmFuIEJldWxpY2ggPEpCZXVsaWNoQHN1c2UuY29tPgotLS0K IHhlbi9hcmNoL3g4Ni9jcHVpZC5jIHwgNDMgKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE2IGluc2VydGlvbnMoKyksIDI3IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9jcHVpZC5jIGIveGVuL2FyY2gveDg2 L2NwdWlkLmMKaW5kZXggMmE1ZTAxMS4uYzhkYWRhYiAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2 L2NwdWlkLmMKKysrIGIveGVuL2FyY2gveDg2L2NwdWlkLmMKQEAgLTIwOCw3ICsyMDgsNyBAQCBz dGF0aWMgdm9pZCByZWNhbGN1bGF0ZV9taXNjKHN0cnVjdCBjcHVpZF9wb2xpY3kgKnApCiAKICAg ICAgICAgemVyb19sZWF2ZXMocC0+YmFzaWMucmF3LCAweDIsIDB4Myk7CiAgICAgICAgIG1lbXNl dChwLT5jYWNoZS5yYXcsIDAsIHNpemVvZihwLT5jYWNoZS5yYXcpKTsKLSAgICAgICAgcC0+YmFz aWMucmF3WzB4OV0gPSBFTVBUWV9MRUFGOworICAgICAgICB6ZXJvX2xlYXZlcyhwLT5iYXNpYy5y YXcsIDB4OSwgMHhhKTsKIAogICAgICAgICBwLT5leHRkLnZlbmRvcl9lYnggPSBwLT5iYXNpYy52 ZW5kb3JfZWJ4OwogICAgICAgICBwLT5leHRkLnZlbmRvcl9lY3ggPSBwLT5iYXNpYy52ZW5kb3Jf ZWN4OwpAQCAtNjM0LDIyICs2MzQsMTEgQEAgc3RhdGljIHZvaWQgcHZfY3B1aWQodWludDMyX3Qg bGVhZiwgdWludDMyX3Qgc3VibGVhZiwgc3RydWN0IGNwdWlkX2xlYWYgKnJlcykKIAogICAgIHN3 aXRjaCAoIGxlYWYgKQogICAgIHsKLSAgICBjYXNlIDB4MDAwMDAwMGE6IC8qIEFyY2hpdGVjdHVy YWwgUGVyZm9ybWFuY2UgTW9uaXRvciBGZWF0dXJlcyAoSW50ZWwpICovCi0gICAgICAgIGlmICgg Ym9vdF9jcHVfZGF0YS54ODZfdmVuZG9yICE9IFg4Nl9WRU5ET1JfSU5URUwgfHwKLSAgICAgICAg ICAgICAhdnBtdV9lbmFibGVkKGN1cnIpICkKLSAgICAgICAgICAgIGdvdG8gdW5zdXBwb3J0ZWQ7 Ci0KLSAgICAgICAgLyogUmVwb3J0IGF0IG1vc3QgdmVyc2lvbiAzIHNpbmNlIHRoYXQncyBhbGwg d2UgY3VycmVudGx5IGVtdWxhdGUuICovCi0gICAgICAgIGlmICggKHJlcy0+YSAmIDB4ZmYpID4g MyApCi0gICAgICAgICAgICByZXMtPmEgPSAocmVzLT5hICYgfjB4ZmYpIHwgMzsKLSAgICAgICAg YnJlYWs7Ci0KICAgICBjYXNlIDB4MDAwMDAwMGI6IC8qIEV4dGVuZGVkIFRvcG9sb2d5IEVudW1l cmF0aW9uICovCi0gICAgdW5zdXBwb3J0ZWQ6CiAgICAgICAgICpyZXMgPSBFTVBUWV9MRUFGOwog ICAgICAgICBicmVhazsKIAotICAgIGNhc2UgMHgwIC4uLiAweDk6CisgICAgY2FzZSAweDAgLi4u IDB4YToKICAgICBjYXNlIDB4YyAuLi4gWFNUQVRFX0NQVUlEOgogICAgIGNhc2UgMHg4MDAwMDAw MCAuLi4gMHhmZmZmZmZmZjoKICAgICAgICAgQVNTRVJUX1VOUkVBQ0hBQkxFKCk7CkBAIC02NzEs MTkgKzY2MCw3IEBAIHN0YXRpYyB2b2lkIGh2bV9jcHVpZCh1aW50MzJfdCBsZWFmLCB1aW50MzJf dCBzdWJsZWFmLCBzdHJ1Y3QgY3B1aWRfbGVhZiAqcmVzKQogICAgICAgICByZXMtPmQgPSB2LT52 Y3B1X2lkICogMjsKICAgICAgICAgYnJlYWs7CiAKLSAgICBjYXNlIDB4MDAwMDAwMGE6IC8qIEFy Y2hpdGVjdHVyYWwgUGVyZm9ybWFuY2UgTW9uaXRvciBGZWF0dXJlcyAoSW50ZWwpICovCi0gICAg ICAgIGlmICggYm9vdF9jcHVfZGF0YS54ODZfdmVuZG9yICE9IFg4Nl9WRU5ET1JfSU5URUwgfHwg IXZwbXVfZW5hYmxlZCh2KSApCi0gICAgICAgIHsKLSAgICAgICAgICAgICpyZXMgPSBFTVBUWV9M RUFGOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIH0KLQotICAgICAgICAvKiBSZXBvcnQg YXQgbW9zdCB2ZXJzaW9uIDMgc2luY2UgdGhhdCdzIGFsbCB3ZSBjdXJyZW50bHkgZW11bGF0ZSAq LwotICAgICAgICBpZiAoIChyZXMtPmEgJiAweGZmKSA+IDMgKQotICAgICAgICAgICAgcmVzLT5h ID0gKHJlcy0+YSAmIH4weGZmKSB8IDM7Ci0gICAgICAgIGJyZWFrOwotCi0gICAgY2FzZSAweDAg Li4uIDB4OToKKyAgICBjYXNlIDB4MCAuLi4gMHhhOgogICAgIGNhc2UgMHhjIC4uLiBYU1RBVEVf Q1BVSUQ6CiAgICAgY2FzZSAweDgwMDAwMDAwIC4uLiAweGZmZmZmZmZmOgogICAgICAgICBBU1NF UlRfVU5SRUFDSEFCTEUoKTsKQEAgLTc0NCw3ICs3MjEsNyBAQCB2b2lkIGd1ZXN0X2NwdWlkKGNv bnN0IHN0cnVjdCB2Y3B1ICp2LCB1aW50MzJfdCBsZWFmLAogCiAgICAgICAgIGNhc2UgMHgwIC4u LiAweDM6CiAgICAgICAgIGNhc2UgMHg1IC4uLiAweDY6Ci0gICAgICAgIGNhc2UgMHg4IC4uLiAw eDk6CisgICAgICAgIGNhc2UgMHg4IC4uLiAweGE6CiAgICAgICAgIGNhc2UgMHhjOgogICAgICAg ICAgICAgKnJlcyA9IHAtPmJhc2ljLnJhd1tsZWFmXTsKICAgICAgICAgICAgIGJyZWFrOwpAQCAt OTcwLDYgKzk0NywxOCBAQCB2b2lkIGd1ZXN0X2NwdWlkKGNvbnN0IHN0cnVjdCB2Y3B1ICp2LCB1 aW50MzJfdCBsZWFmLAogICAgICAgICB9CiAgICAgICAgIGJyZWFrOwogCisgICAgY2FzZSAweGE6 CisgICAgICAgIC8qIFRPRE86IFJld29yayB2UE1VIGNvbnRyb2wgaW4gdGVybXMgb2YgdG9vbHN0 YWNrIGNob2ljZXMuICovCisgICAgICAgIGlmICggYm9vdF9jcHVfZGF0YS54ODZfdmVuZG9yICE9 IFg4Nl9WRU5ET1JfSU5URUwgfHwgIXZwbXVfZW5hYmxlZCh2KSApCisgICAgICAgICAgICAqcmVz ID0gRU1QVFlfTEVBRjsKKyAgICAgICAgZWxzZQorICAgICAgICB7CisgICAgICAgICAgICAvKiBS ZXBvcnQgYXQgbW9zdCB2MyBzaW5jZSB0aGF0J3MgYWxsIHdlIGN1cnJlbnRseSBlbXVsYXRlLiAq LworICAgICAgICAgICAgaWYgKCAocmVzLT5hICYgMHhmZikgPiAzICkKKyAgICAgICAgICAgICAg ICByZXMtPmEgPSAocmVzLT5hICYgfjB4ZmYpIHwgMzsKKyAgICAgICAgfQorICAgICAgICBicmVh azsKKwogICAgIGNhc2UgWFNUQVRFX0NQVUlEOgogICAgICAgICBzd2l0Y2ggKCBzdWJsZWFmICkK ICAgICAgICAgewotLSAKMi4xLjQKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4u b3JnCmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK