From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH v2 2/7] x86/alt: Clean up struct alt_instr and its users Date: Mon, 26 Feb 2018 11:34:59 +0000 Message-ID: <1519644904-11349-3-git-send-email-andrew.cooper3@citrix.com> References: <1519644904-11349-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: <1519644904-11349-1-git-send-email-andrew.cooper3@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: Xen-devel Cc: Andrew Cooper List-Id: xen-devel@lists.xenproject.org ICogUmVuYW1lIHNvbWUgZmllbGRzIGZvciBjb25zaXN0ZW5jeSBhbmQgY2xhcml0eSwgYW5kIHVz ZSBzdGFuZGFyZCB0eXBlcy4KICogRG9uJ3Qgb3BlbmNvZGUgdGhlIHVzZSBvZiBBTFRfe09SSUcs UkVQTH1fUFRSKCkuCgpObyBmdW5jdGlvbmFsIGNoYW5nZS4KClNpZ25lZC1vZmYtYnk6IEFuZHJl dyBDb29wZXIgPGFuZHJldy5jb29wZXIzQGNpdHJpeC5jb20+ClJldmlld2VkLWJ5OiBXZWkgTGl1 IDx3ZWkubGl1MkBjaXRyaXguY29tPgpSZXZpZXdlZC1ieTogUm9nZXIgUGF1IE1vbm7DqSA8cm9n ZXIucGF1QGNpdHJpeC5jb20+ClJldmlld2VkLWJ5OiBKYW4gQmV1bGljaCA8amJldWxpY2hAc3Vz ZS5jb20+ClJldmlld2VkLWJ5OiBLb25yYWQgUnplc3p1dGVrIFdpbGsgPGtvbnJhZC53aWxrQG9y YWNsZS5jb20+Ci0tLQp2MjoKICogQ2hhbmdlIG1vcmUgdHlwZXMgdG8gc3RhbmRhcmQgb25lcwot LS0KIHhlbi9hcmNoL3g4Ni9hbHRlcm5hdGl2ZS5jICAgICAgICB8IDI0ICsrKysrKysrKysrKy0t LS0tLS0tLS0tLQogeGVuL2luY2x1ZGUvYXNtLXg4Ni9hbHRlcm5hdGl2ZS5oIHwgMTQgKysrKysr Ky0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMTkgaW5zZXJ0aW9ucygrKSwgMTkgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L2FsdGVybmF0aXZlLmMgYi94ZW4vYXJjaC94 ODYvYWx0ZXJuYXRpdmUuYwppbmRleCA1YzhiNmY2Li41MWNhNTNlIDEwMDY0NAotLS0gYS94ZW4v YXJjaC94ODYvYWx0ZXJuYXRpdmUuYworKysgYi94ZW4vYXJjaC94ODYvYWx0ZXJuYXRpdmUuYwpA QCAtMTYzLDggKzE2Myw2IEBAIHZvaWQgaW5pdF9vcl9saXZlcGF0Y2ggYXBwbHlfYWx0ZXJuYXRp dmVzKGNvbnN0IHN0cnVjdCBhbHRfaW5zdHIgKnN0YXJ0LAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgY29uc3Qgc3RydWN0IGFsdF9pbnN0ciAqZW5kKQogewogICAg IGNvbnN0IHN0cnVjdCBhbHRfaW5zdHIgKmE7Ci0gICAgdTggKmluc3RyLCAqcmVwbGFjZW1lbnQ7 Ci0gICAgdTggaW5zbmJ1ZltNQVhfUEFUQ0hfTEVOXTsKIAogICAgIHByaW50ayhLRVJOX0lORk8g ImFsdCB0YWJsZSAlcCAtPiAlcFxuIiwgc3RhcnQsIGVuZCk7CiAKQEAgLTE3OSwyMyArMTc3LDI1 IEBAIHZvaWQgaW5pdF9vcl9saXZlcGF0Y2ggYXBwbHlfYWx0ZXJuYXRpdmVzKGNvbnN0IHN0cnVj dCBhbHRfaW5zdHIgKnN0YXJ0LAogICAgICAqLwogICAgIGZvciAoIGEgPSBzdGFydDsgYSA8IGVu ZDsgYSsrICkKICAgICB7Ci0gICAgICAgIGluc3RyID0gKHU4ICopJmEtPmluc3RyX29mZnNldCAr IGEtPmluc3RyX29mZnNldDsKLSAgICAgICAgcmVwbGFjZW1lbnQgPSAodTggKikmYS0+cmVwbF9v ZmZzZXQgKyBhLT5yZXBsX29mZnNldDsKLSAgICAgICAgQlVHX09OKGEtPnJlcGxhY2VtZW50bGVu ID4gYS0+aW5zdHJsZW4pOwotICAgICAgICBCVUdfT04oYS0+aW5zdHJsZW4gPiBzaXplb2YoaW5z bmJ1ZikpOworICAgICAgICB1aW50OF90ICpvcmlnID0gQUxUX09SSUdfUFRSKGEpOworICAgICAg ICB1aW50OF90ICpyZXBsID0gQUxUX1JFUExfUFRSKGEpOworICAgICAgICB1aW50OF90IGJ1ZltN QVhfUEFUQ0hfTEVOXTsKKworICAgICAgICBCVUdfT04oYS0+cmVwbF9sZW4gPiBhLT5vcmlnX2xl bik7CisgICAgICAgIEJVR19PTihhLT5vcmlnX2xlbiA+IHNpemVvZihidWYpKTsKICAgICAgICAg QlVHX09OKGEtPmNwdWlkID49IE5DQVBJTlRTICogMzIpOworCiAgICAgICAgIGlmICggIWJvb3Rf Y3B1X2hhcyhhLT5jcHVpZCkgKQogICAgICAgICAgICAgY29udGludWU7CiAKLSAgICAgICAgbWVt Y3B5KGluc25idWYsIHJlcGxhY2VtZW50LCBhLT5yZXBsYWNlbWVudGxlbik7CisgICAgICAgIG1l bWNweShidWYsIHJlcGwsIGEtPnJlcGxfbGVuKTsKIAogICAgICAgICAvKiAweGU4LzB4ZTkgYXJl IHJlbGF0aXZlIGJyYW5jaGVzOyBmaXggdGhlIG9mZnNldC4gKi8KLSAgICAgICAgaWYgKCBhLT5y ZXBsYWNlbWVudGxlbiA+PSA1ICYmICgqaW5zbmJ1ZiAmIDB4ZmUpID09IDB4ZTggKQotICAgICAg ICAgICAgKihzMzIgKikoaW5zbmJ1ZiArIDEpICs9IHJlcGxhY2VtZW50IC0gaW5zdHI7CisgICAg ICAgIGlmICggYS0+cmVwbF9sZW4gPj0gNSAmJiAoKmJ1ZiAmIDB4ZmUpID09IDB4ZTggKQorICAg ICAgICAgICAgKihpbnQzMl90ICopKGJ1ZiArIDEpICs9IHJlcGwgLSBvcmlnOwogCi0gICAgICAg IGFkZF9ub3BzKGluc25idWYgKyBhLT5yZXBsYWNlbWVudGxlbiwKLSAgICAgICAgICAgICAgICAg YS0+aW5zdHJsZW4gLSBhLT5yZXBsYWNlbWVudGxlbik7Ci0gICAgICAgIHRleHRfcG9rZShpbnN0 ciwgaW5zbmJ1ZiwgYS0+aW5zdHJsZW4pOworICAgICAgICBhZGRfbm9wcyhidWYgKyBhLT5yZXBs X2xlbiwgYS0+b3JpZ19sZW4gLSBhLT5yZXBsX2xlbik7CisgICAgICAgIHRleHRfcG9rZShvcmln LCBidWYsIGEtPm9yaWdfbGVuKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL3hlbi9pbmNsdWRl L2FzbS14ODYvYWx0ZXJuYXRpdmUuaCBiL3hlbi9pbmNsdWRlL2FzbS14ODYvYWx0ZXJuYXRpdmUu aAppbmRleCAzMjVhMjlmLi5kOTcwNmZkIDEwMDY0NAotLS0gYS94ZW4vaW5jbHVkZS9hc20teDg2 L2FsdGVybmF0aXZlLmgKKysrIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9hbHRlcm5hdGl2ZS5oCkBA IC05LDE1ICs5LDE1IEBACiAjaW5jbHVkZSA8eGVuL3R5cGVzLmg+CiAKIHN0cnVjdCBhbHRfaW5z dHIgewotICAgIHMzMiBpbnN0cl9vZmZzZXQ7ICAgICAgIC8qIG9yaWdpbmFsIGluc3RydWN0aW9u ICovCi0gICAgczMyIHJlcGxfb2Zmc2V0OyAgICAgICAgLyogb2Zmc2V0IHRvIHJlcGxhY2VtZW50 IGluc3RydWN0aW9uICovCi0gICAgdTE2IGNwdWlkOyAgICAgICAgICAgICAgLyogY3B1aWQgYml0 IHNldCBmb3IgcmVwbGFjZW1lbnQgKi8KLSAgICB1OCAgaW5zdHJsZW47ICAgICAgICAgICAvKiBs ZW5ndGggb2Ygb3JpZ2luYWwgaW5zdHJ1Y3Rpb24gKi8KLSAgICB1OCAgcmVwbGFjZW1lbnRsZW47 ICAgICAvKiBsZW5ndGggb2YgbmV3IGluc3RydWN0aW9uLCA8PSBpbnN0cmxlbiAqLworICAgIGlu dDMyX3QgIG9yaWdfb2Zmc2V0OyAgIC8qIG9yaWdpbmFsIGluc3RydWN0aW9uICovCisgICAgaW50 MzJfdCAgcmVwbF9vZmZzZXQ7ICAgLyogb2Zmc2V0IHRvIHJlcGxhY2VtZW50IGluc3RydWN0aW9u ICovCisgICAgdWludDE2X3QgY3B1aWQ7ICAgICAgICAgLyogY3B1aWQgYml0IHNldCBmb3IgcmVw bGFjZW1lbnQgKi8KKyAgICB1aW50OF90ICBvcmlnX2xlbjsgICAgICAvKiBsZW5ndGggb2Ygb3Jp Z2luYWwgaW5zdHJ1Y3Rpb24gKi8KKyAgICB1aW50OF90ICByZXBsX2xlbjsgICAgICAvKiBsZW5n dGggb2YgbmV3IGluc3RydWN0aW9uLCA8PSBpbnN0cmxlbiAqLwogfTsKIAotI2RlZmluZSBfX0FM VF9QVFIoYSxmKSAgICAgICgodTggKikoKHZvaWQgKikmKGEpLT5mICsgKGEpLT5mKSkKLSNkZWZp bmUgQUxUX09SSUdfUFRSKGEpICAgICBfX0FMVF9QVFIoYSwgaW5zdHJfb2Zmc2V0KQorI2RlZmlu ZSBfX0FMVF9QVFIoYSxmKSAgICAgICgodWludDhfdCAqKSgodm9pZCAqKSYoYSktPmYgKyAoYSkt PmYpKQorI2RlZmluZSBBTFRfT1JJR19QVFIoYSkgICAgIF9fQUxUX1BUUihhLCBvcmlnX29mZnNl dCkKICNkZWZpbmUgQUxUX1JFUExfUFRSKGEpICAgICBfX0FMVF9QVFIoYSwgcmVwbF9vZmZzZXQp CiAKIGV4dGVybiB2b2lkIGFkZF9ub3BzKHZvaWQgKmluc25zLCB1bnNpZ25lZCBpbnQgbGVuKTsK LS0gCjIuMS40CgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcK aHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA==