From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH v3 12/28] xen/x86: Improve disabling of features which have dependencies Date: Tue, 15 Mar 2016 15:35:08 +0000 Message-ID: <1458056124-8024-13-git-send-email-andrew.cooper3@citrix.com> References: <1458056124-8024-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: <1458056124-8024-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 List-Id: xen-devel@lists.xenproject.org QVBJQyBhbmQgWFNBVkUgaGF2ZSBkZXBlbmRlbnQgZmVhdHVyZXMsIHdoaWNoIGFsc28gbmVlZCBk aXNhYmxpbmcgaWYgWGVuCmNob29zZXMgdG8gZGlzYWJsZSBhIGZlYXR1cmUuCgpVc2Ugc2V0dXBf Y2xlYXJfY3B1X2NhcCgpIHJhdGhlciB0aGFuIGNsZWFyX2JpdCgpLCBhcyBpdCB0YWtlcyBjYXJl IG9mCmRlcGVuZGVudCBmZWF0dXJlcyBhcyB3ZWxsLgoKU2lnbmVkLW9mZi1ieTogQW5kcmV3IENv b3BlciA8YW5kcmV3LmNvb3BlcjNAY2l0cml4LmNvbT4KUmV2aWV3ZWQtYnk6IEphbiBCZXVsaWNo IDxKQmV1bGljaEBzdXNlLmNvbT4KLS0tCnYyOiBNb3ZlIGJvb2xlYW5fcGFyYW0oKSBhZGphY2Vu dCB0byB1c2VfeHNhdmUgaW4geHN0YXRlX2luaXQoKQotLS0KIHhlbi9hcmNoL3g4Ni9hcGljLmMg ICAgICAgfCAgMiArLQogeGVuL2FyY2gveDg2L2NwdS9jb21tb24uYyB8IDEyICsrKy0tLS0tLS0t LQogeGVuL2FyY2gveDg2L3hzdGF0ZS5jICAgICB8ICA2ICsrKysrLQogMyBmaWxlcyBjaGFuZ2Vk LCA5IGluc2VydGlvbnMoKyksIDExIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9hcmNo L3g4Ni9hcGljLmMgYi94ZW4vYXJjaC94ODYvYXBpYy5jCmluZGV4IGI5NjAxYWQuLjhkZjViZDMg MTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9hcGljLmMKKysrIGIveGVuL2FyY2gveDg2L2FwaWMu YwpAQCAtMTM0OSw3ICsxMzQ5LDcgQEAgdm9pZCBwbXVfYXBpY19pbnRlcnJ1cHQoc3RydWN0IGNw dV91c2VyX3JlZ3MgKnJlZ3MpCiBpbnQgX19pbml0IEFQSUNfaW5pdF91bmlwcm9jZXNzb3IgKHZv aWQpCiB7CiAgICAgaWYgKGVuYWJsZV9sb2NhbF9hcGljIDwgMCkKLSAgICAgICAgX19jbGVhcl9i aXQoWDg2X0ZFQVRVUkVfQVBJQywgYm9vdF9jcHVfZGF0YS54ODZfY2FwYWJpbGl0eSk7CisgICAg ICAgIHNldHVwX2NsZWFyX2NwdV9jYXAoWDg2X0ZFQVRVUkVfQVBJQyk7CiAKICAgICBpZiAoIXNt cF9mb3VuZF9jb25maWcgJiYgIWNwdV9oYXNfYXBpYykgewogICAgICAgICBza2lwX2lvYXBpY19z ZXR1cCA9IDE7CmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvY3B1L2NvbW1vbi5jIGIveGVuL2Fy Y2gveDg2L2NwdS9jb21tb24uYwppbmRleCBjYjFjYWIzLi5hMzI1ZGMwIDEwMDY0NAotLS0gYS94 ZW4vYXJjaC94ODYvY3B1L2NvbW1vbi5jCisrKyBiL3hlbi9hcmNoL3g4Ni9jcHUvY29tbW9uLmMK QEAgLTE2LDkgKzE2LDYgQEAKIAogI2luY2x1ZGUgImNwdS5oIgogCi1zdGF0aWMgYm9vbF90IHVz ZV94c2F2ZSA9IDE7Ci1ib29sZWFuX3BhcmFtKCJ4c2F2ZSIsIHVzZV94c2F2ZSk7Ci0KIGJvb2xf dCBvcHRfYXJhdCA9IDE7CiBib29sZWFuX3BhcmFtKCJhcmF0Iiwgb3B0X2FyYXQpOwogCkBAIC0z NDEsMTIgKzMzOCw2IEBAIHZvaWQgaWRlbnRpZnlfY3B1KHN0cnVjdCBjcHVpbmZvX3g4NiAqYykK IAlpZiAodGhpc19jcHUtPmNfaW5pdCkKIAkJdGhpc19jcHUtPmNfaW5pdChjKTsKIAotICAgICAg ICAvKiBJbml0aWFsaXplIHhzYXZlL3hyc3RvciBmZWF0dXJlcyAqLwotCWlmICggIXVzZV94c2F2 ZSApCi0JCV9fY2xlYXJfYml0KFg4Nl9GRUFUVVJFX1hTQVZFLCBib290X2NwdV9kYXRhLng4Nl9j YXBhYmlsaXR5KTsKLQotCWlmICggY3B1X2hhc194c2F2ZSApCi0JCXhzdGF0ZV9pbml0KGMpOwog CiAgICAJaWYgKCAhb3B0X3BrdSApCiAJCXNldHVwX2NsZWFyX2NwdV9jYXAoWDg2X0ZFQVRVUkVf UEtVKTsKQEAgLTM3MSw2ICszNjIsOSBAQCB2b2lkIGlkZW50aWZ5X2NwdShzdHJ1Y3QgY3B1aW5m b194ODYgKmMpCiAKIAkvKiBOb3cgdGhlIGZlYXR1cmUgZmxhZ3MgYmV0dGVyIHJlZmxlY3QgYWN0 dWFsIENQVSBmZWF0dXJlcyEgKi8KIAorCWlmICggY3B1X2hhc194c2F2ZSApCisJCXhzdGF0ZV9p bml0KGMpOworCiAjaWZkZWYgTk9JU1lfQ0FQUwogCXByaW50ayhLRVJOX0RFQlVHICJDUFU6IEFm dGVyIGFsbCBpbml0cywgY2FwczoiKTsKIAlmb3IgKGkgPSAwOyBpIDwgTkNBUElOVFM7IGkrKykK ZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni94c3RhdGUuYyBiL3hlbi9hcmNoL3g4Ni94c3RhdGUu YwppbmRleCBhNWVkOWU1Li5kY2NjYjlmIDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYveHN0YXRl LmMKKysrIGIveGVuL2FyY2gveDg2L3hzdGF0ZS5jCkBAIC01MTMsMTEgKzUxMywxNSBAQCB1bnNp Z25lZCBpbnQgeHN0YXRlX2N0eHRfc2l6ZSh1NjQgeGNyMCkKIC8qIENvbGxlY3QgdGhlIGluZm9y bWF0aW9uIG9mIHByb2Nlc3NvcidzIGV4dGVuZGVkIHN0YXRlICovCiB2b2lkIHhzdGF0ZV9pbml0 KHN0cnVjdCBjcHVpbmZvX3g4NiAqYykKIHsKKyAgICBzdGF0aWMgYm9vbF90IF9faW5pdGRhdGEg dXNlX3hzYXZlID0gMTsKKyAgICBib29sZWFuX3BhcmFtKCJ4c2F2ZSIsIHVzZV94c2F2ZSk7CisK ICAgICBib29sX3QgYnNwID0gYyA9PSAmYm9vdF9jcHVfZGF0YTsKICAgICB1MzIgZWF4LCBlYngs IGVjeCwgZWR4OwogICAgIHU2NCBmZWF0dXJlX21hc2s7CiAKLSAgICBpZiAoIGJvb3RfY3B1X2Rh dGEuY3B1aWRfbGV2ZWwgPCBYU1RBVEVfQ1BVSUQgKQorICAgIGlmICggKGJzcCAmJiAhdXNlX3hz YXZlKSB8fAorICAgICAgICAgYm9vdF9jcHVfZGF0YS5jcHVpZF9sZXZlbCA8IFhTVEFURV9DUFVJ RCApCiAgICAgewogICAgICAgICBCVUdfT04oIWJzcCk7CiAgICAgICAgIHNldHVwX2NsZWFyX2Nw dV9jYXAoWDg2X0ZFQVRVUkVfWFNBVkUpOwotLSAKMi4xLjQKCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1k ZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHA6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=