From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH 3/6] x86/cpuid: Handle leaf 0 in guest_cpuid() Date: Wed, 18 Jan 2017 19:40:55 +0000 Message-ID: <1484768458-13117-4-git-send-email-andrew.cooper3@citrix.com> References: <1484768458-13117-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: <1484768458-13117-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 Q2FsY3VsYXRlIGEgZG9tYWlucyB4ODZfdmVuZG9yIGVhcmx5IGluIHJlY2FsY3VsYXRlX2NwdWlk X3BvbGljeSgpOyBzdWJzZXF1ZW50CnBhdGNoZXMgbmVlZCB0byBtYWtlIG90aGVyIHJlY2FsY3Vs YXRpb24gZGVjaXNpb25zIGJhc2VkIG9uIGl0LgoKU2lnbmVkLW9mZi1ieTogQW5kcmV3IENvb3Bl ciA8YW5kcmV3LmNvb3BlcjNAY2l0cml4LmNvbT4KLS0tCkNDOiBKYW4gQmV1bGljaCA8SkJldWxp Y2hAc3VzZS5jb20+Ci0tLQogeGVuL2FyY2gveDg2L2NwdWlkLmMgICAgICAgIHwgMTMgKysrKysr KysrKysrLQogeGVuL2FyY2gveDg2L2RvbWN0bC5jICAgICAgIHwgMTAgKystLS0tLS0tLQogeGVu L2luY2x1ZGUvYXNtLXg4Ni9jcHVpZC5oIHwgIDQgKysrLQogMyBmaWxlcyBjaGFuZ2VkLCAxNyBp bnNlcnRpb25zKCspLCAxMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYv Y3B1aWQuYyBiL3hlbi9hcmNoL3g4Ni9jcHVpZC5jCmluZGV4IDA3NmZhYjMuLjg1YzgyOWQgMTAw NjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9jcHVpZC5jCisrKyBiL3hlbi9hcmNoL3g4Ni9jcHVpZC5j CkBAIC0zNTUsNiArMzU1LDkgQEAgdm9pZCByZWNhbGN1bGF0ZV9jcHVpZF9wb2xpY3koc3RydWN0 IGRvbWFpbiAqZCkKICAgICB1aW50MzJfdCBmc1tGU0NBUElOVFNdLCBtYXhfZnNbRlNDQVBJTlRT XTsKICAgICB1bnNpZ25lZCBpbnQgaTsKIAorICAgIHAtPng4Nl92ZW5kb3IgPSBnZXRfY3B1X3Zl bmRvcihwLT5iYXNpYy52ZW5kb3JfZWJ4LCBwLT5iYXNpYy52ZW5kb3JfZWN4LAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBwLT5iYXNpYy52ZW5kb3JfZWR4LCBnY3ZfZ3Vlc3Qp OworCiAgICAgcC0+YmFzaWMubWF4X2xlYWYgICA9IG1pbihwLT5iYXNpYy5tYXhfbGVhZiwgICBt YXgtPmJhc2ljLm1heF9sZWFmKTsKICAgICBwLT5mZWF0Lm1heF9zdWJsZWFmID0gbWluKHAtPmZl YXQubWF4X3N1YmxlYWYsIG1heC0+ZmVhdC5tYXhfc3VibGVhZik7CiAgICAgcC0+ZXh0ZC5tYXhf bGVhZiAgICA9IG1pbihwLT5leHRkLm1heF9sZWFmLCAgICBtYXgtPmV4dGQubWF4X2xlYWYpOwpA QCAtNjc3LDYgKzY4MCw3IEBAIHN0YXRpYyB2b2lkIHB2X2NwdWlkKHVpbnQzMl90IGxlYWYsIHVp bnQzMl90IHN1YmxlYWYsIHN0cnVjdCBjcHVpZF9sZWFmICpyZXMpCiAgICAgICAgICpyZXMgPSBF TVBUWV9MRUFGOwogICAgICAgICBicmVhazsKIAorICAgIGNhc2UgMHgwOgogICAgIGNhc2UgMHg3 OgogICAgIGNhc2UgWFNUQVRFX0NQVUlEOgogICAgICAgICBBU1NFUlRfVU5SRUFDSEFCTEUoKTsK QEAgLTgyNSw2ICs4MjksNyBAQCBzdGF0aWMgdm9pZCBodm1fY3B1aWQodWludDMyX3QgbGVhZiwg dWludDMyX3Qgc3VibGVhZiwgc3RydWN0IGNwdWlkX2xlYWYgKnJlcykKICAgICAgICAgICAgIHJl cy0+YSA9IDA7CiAgICAgICAgIGJyZWFrOwogCisgICAgY2FzZSAweDA6CiAgICAgY2FzZSAweDc6 CiAgICAgY2FzZSBYU1RBVEVfQ1BVSUQ6CiAgICAgICAgIEFTU0VSVF9VTlJFQUNIQUJMRSgpOwpA QCAtODUwLDcgKzg1NSw5IEBAIHZvaWQgZ3Vlc3RfY3B1aWQoY29uc3Qgc3RydWN0IHZjcHUgKnYs IHVpbnQzMl90IGxlYWYsCiAgICAgc3dpdGNoICggbGVhZiApCiAgICAgewogICAgIGNhc2UgMCAu Li4gQ1BVSURfR1VFU1RfTlJfQkFTSUMgLSAxOgotICAgICAgICBpZiAoIGxlYWYgPiBwLT5iYXNp Yy5tYXhfbGVhZiApCisgICAgICAgIEFTU0VSVChwLT5iYXNpYy5tYXhfbGVhZiA8IEFSUkFZX1NJ WkUocC0+YmFzaWMucmF3KSk7CisgICAgICAgIGlmICggbGVhZiA+IG1pbl90KHVpbnQzMl90LCBw LT5iYXNpYy5tYXhfbGVhZiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgQVJSQVlfU0laRShw LT5iYXNpYy5yYXcpIC0gMSkgKQogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIHN3aXRj aCAoIGxlYWYgKQpAQCAtODczLDYgKzg4MCwxMCBAQCB2b2lkIGd1ZXN0X2NwdWlkKGNvbnN0IHN0 cnVjdCB2Y3B1ICp2LCB1aW50MzJfdCBsZWFmLAogCiAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAg ICAgICBnb3RvIGxlZ2FjeTsKKworICAgICAgICBjYXNlIDB4MDoKKyAgICAgICAgICAgICpyZXMg PSBwLT5iYXNpYy5yYXdbbGVhZl07CisgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAg ICAgICBicmVhazsKIApkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L2RvbWN0bC5jIGIveGVuL2Fy Y2gveDg2L2RvbWN0bC5jCmluZGV4IGEzZjUxZjMuLjhlNTI1OWYgMTAwNjQ0Ci0tLSBhL3hlbi9h cmNoL3g4Ni9kb21jdGwuYworKysgYi94ZW4vYXJjaC94ODYvZG9tY3RsLmMKQEAgLTkyLDcgKzky LDcgQEAgc3RhdGljIGludCB1cGRhdGVfZG9tYWluX2NwdWlkX2luZm8oc3RydWN0IGRvbWFpbiAq ZCwKIHsKICAgICBzdHJ1Y3QgY3B1aWRfcG9saWN5ICpwID0gZC0+YXJjaC5jcHVpZDsKICAgICBj b25zdCBzdHJ1Y3QgY3B1aWRfbGVhZiBsZWFmID0geyBjdGwtPmVheCwgY3RsLT5lYngsIGN0bC0+ ZWN4LCBjdGwtPmVkeCB9OwotICAgIGludCByYzsKKyAgICBpbnQgcmMsIG9sZF92ZW5kb3IgPSBw LT54ODZfdmVuZG9yOwogCiAgICAgLyoKICAgICAgKiBTa2lwIHVwZGF0ZSBmb3IgbGVhdmVzIHdl IGRvbid0IGNhcmUgYWJvdXQuICBUaGlzIGF2b2lkcyB0aGUgb3ZlcmhlYWQKQEAgLTE1NSwxMSAr MTU1LDcgQEAgc3RhdGljIGludCB1cGRhdGVfZG9tYWluX2NwdWlkX2luZm8oc3RydWN0IGRvbWFp biAqZCwKIAogICAgIHN3aXRjaCAoIGN0bC0+aW5wdXRbMF0gKQogICAgIHsKLSAgICBjYXNlIDA6 IHsKLSAgICAgICAgaW50IG9sZF92ZW5kb3IgPSBwLT54ODZfdmVuZG9yOwotCi0gICAgICAgIHAt Png4Nl92ZW5kb3IgPSBnZXRfY3B1X3ZlbmRvcihjdGwtPmVieCwgY3RsLT5lY3gsIGN0bC0+ZWR4 LCBnY3ZfZ3Vlc3QpOwotCisgICAgY2FzZSAwOgogICAgICAgICBpZiAoIGlzX2h2bV9kb21haW4o ZCkgJiYgKHAtPng4Nl92ZW5kb3IgIT0gb2xkX3ZlbmRvcikgKQogICAgICAgICB7CiAgICAgICAg ICAgICBzdHJ1Y3QgdmNwdSAqdjsKQEAgLTE2Nyw5ICsxNjMsNyBAQCBzdGF0aWMgaW50IHVwZGF0 ZV9kb21haW5fY3B1aWRfaW5mbyhzdHJ1Y3QgZG9tYWluICpkLAogICAgICAgICAgICAgZm9yX2Vh Y2hfdmNwdSggZCwgdiApCiAgICAgICAgICAgICAgICAgaHZtX3VwZGF0ZV9ndWVzdF92ZW5kb3Io dik7CiAgICAgICAgIH0KLQogICAgICAgICBicmVhazsKLSAgICB9CiAKICAgICBjYXNlIDE6CiAg ICAgICAgIGlmICggaXNfcHZfZG9tYWluKGQpICYmICgobGV2ZWxsaW5nX2NhcHMgJiBMQ0FQXzFj ZCkgPT0gTENBUF8xY2QpICkKZGlmZiAtLWdpdCBhL3hlbi9pbmNsdWRlL2FzbS14ODYvY3B1aWQu aCBiL3hlbi9pbmNsdWRlL2FzbS14ODYvY3B1aWQuaAppbmRleCBlNTE0MGNhLi4yOTlhMDI2IDEw MDY0NAotLS0gYS94ZW4vaW5jbHVkZS9hc20teDg2L2NwdWlkLmgKKysrIGIveGVuL2luY2x1ZGUv YXNtLXg4Ni9jcHVpZC5oCkBAIC04MSw2ICs4MSw3IEBAIHN0cnVjdCBjcHVpZF9wb2xpY3kKICAg ICAgKiAgIC0gQWxsIG9mIHRoZSBmZWF0IGFuZCB4c3RhdGUgdW5pb25zCiAgICAgICogICAtIG1h eF97LHN1Yn1sZWFmCiAgICAgICogICAtIEFsbCBGRUFUVVJFU0VUXyogd29yZHMKKyAgICAgKiAg IC0gTG93IHNob3J0IHZlbmRvciBpbmZvbWF0aW9uCiAgICAgICoKICAgICAgKiBQZXItZG9tYWlu IG9iamVjdHM6CiAgICAgICoKQEAgLTg4LDYgKzg5LDcgQEAgc3RydWN0IGNwdWlkX3BvbGljeQog ICAgICAqICAgLSBBbGwgb2YgdGhlIGZlYXQgYW5kIHhzdGF0ZSB1bmlvbnMKICAgICAgKiAgIC0g bWF4X3ssc3VifWxlYWYKICAgICAgKiAgIC0gQWxsIEZFQVRVUkVTRVRfKiB3b3JkcworICAgICAq ICAgLSBMb3cgc2hvcnQgdmVuZG9yIGluZm9tYXRpb24KICAgICAgKgogICAgICAqIEV2ZXJ5dGhp bmcgZWxzZSBzaG91bGQgYmUgY29uc2lkZXJlZCBpbmFjY3VyYXRlLCBhbmQgbm90IG5lY2Vzc2Vy aWx5IDAuCiAgICAgICovCkBAIC0xMDEsNyArMTAzLDcgQEAgc3RydWN0IGNwdWlkX3BvbGljeQog ICAgICAgICBzdHJ1Y3QgY3B1aWRfbGVhZiByYXdbQ1BVSURfR1VFU1RfTlJfQkFTSUNdOwogICAg ICAgICBzdHJ1Y3QgewogICAgICAgICAgICAgLyogTGVhZiAweDAgLSBNYXggYW5kIHZlbmRvci4g Ki8KLSAgICAgICAgICAgIHVpbnQzMl90IG1heF9sZWFmLCAvKiBiICovOjMyLCAvKiBjICovOjMy LCAvKiBkICovOjMyOworICAgICAgICAgICAgdWludDMyX3QgbWF4X2xlYWYsIHZlbmRvcl9lYngs IHZlbmRvcl9lY3gsIHZlbmRvcl9lZHg7CiAKICAgICAgICAgICAgIC8qIExlYWYgMHgxIC0gRmFt aWx5L21vZGVsL3N0ZXBwaW5nIGFuZCBmZWF0dXJlcy4gKi8KICAgICAgICAgICAgIHVpbnQzMl90 IHJhd19mbXMsIC8qIGIgKi86MzI7Ci0tIAoyLjEuNAoKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVs QGxpc3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=