From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH 2/2] x86/vmx: Drop enum handler_return Date: Wed, 6 Dec 2017 20:06:28 +0000 Message-ID: <1512590788-16808-2-git-send-email-andrew.cooper3@citrix.com> References: <1512590788-16808-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: <1512590788-16808-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 , Kevin Tian , Jun Nakajima , Jan Beulich List-Id: xen-devel@lists.xenproject.org VGhleSBhcmUgc3RyYWlnaHQgYWxpYXNlcyBvZiB0aGUgbW9yZSBjb21tb24gWDg2RU1VTF8qIGNv bnN0YW50cy4gIFdoaWxlCmFkanVzdGluZyB0aGVzZSwgZml4IHRoZSBjYXNlIGluZGVudGF0aW9u IHdoZXJlIGFwcHJvcHJpYXRlLgoKTm8gZnVuY3Rpb25hbCBjaGFuZ2UsIGNvbmZpcm1lZCBieSBk aWZmJ2luZyB0aGUgY29tcGlsZWQgYmluYXJ5LgoKU2lnbmVkLW9mZi1ieTogQW5kcmV3IENvb3Bl ciA8YW5kcmV3LmNvb3BlcjNAY2l0cml4LmNvbT4KLS0tCkNDOiBKYW4gQmV1bGljaCA8SkJldWxp Y2hAc3VzZS5jb20+CkNDOiBKdW4gTmFrYWppbWEgPGp1bi5uYWthamltYUBpbnRlbC5jb20+CkND OiBLZXZpbiBUaWFuIDxrZXZpbi50aWFuQGludGVsLmNvbT4KLS0tCiB4ZW4vYXJjaC94ODYvaHZt L3ZteC92bXguYyB8IDY2ICsrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAzMSBpbnNlcnRpb25zKCspLCAzNSBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvaHZtL3ZteC92bXguYyBiL3hlbi9hcmNoL3g4Ni9o dm0vdm14L3ZteC5jCmluZGV4IDQyNjkwMmIuLmVhOThhNGUgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNo L3g4Ni9odm0vdm14L3ZteC5jCisrKyBiL3hlbi9hcmNoL3g4Ni9odm0vdm14L3ZteC5jCkBAIC02 Miw4ICs2Miw2IEBACiBzdGF0aWMgYm9vbF90IF9faW5pdGRhdGEgb3B0X2ZvcmNlX2VwdDsKIGJv b2xlYW5fcGFyYW0oImZvcmNlLWVwdCIsIG9wdF9mb3JjZV9lcHQpOwogCi1lbnVtIGhhbmRsZXJf cmV0dXJuIHsgSE5ETF9kb25lLCBITkRMX3VuaGFuZGxlZCwgSE5ETF9leGNlcHRpb25fcmFpc2Vk IH07Ci0KIHN0YXRpYyB2b2lkIHZteF9jdHh0X3N3aXRjaF9mcm9tKHN0cnVjdCB2Y3B1ICp2KTsK IHN0YXRpYyB2b2lkIHZteF9jdHh0X3N3aXRjaF90byhzdHJ1Y3QgdmNwdSAqdik7CiAKQEAgLTQ4 NSw4ICs0ODMsNyBAQCBzdGF0aWMgdm9pZCB2bXhfdmNwdV9kZXN0cm95KHN0cnVjdCB2Y3B1ICp2 KQogICAgIHBhc3NpdmVfZG9tYWluX2Rlc3Ryb3kodik7CiB9CiAKLXN0YXRpYyBlbnVtIGhhbmRs ZXJfcmV0dXJuCi1sb25nX21vZGVfZG9fbXNyX3JlYWQodW5zaWduZWQgaW50IG1zciwgdWludDY0 X3QgKm1zcl9jb250ZW50KQorc3RhdGljIGludCBsb25nX21vZGVfZG9fbXNyX3JlYWQodW5zaWdu ZWQgaW50IG1zciwgdWludDY0X3QgKm1zcl9jb250ZW50KQogewogICAgIHN0cnVjdCB2Y3B1ICp2 ID0gY3VycmVudDsKIApAQCAtNTIxLDE2ICs1MTgsMTUgQEAgbG9uZ19tb2RlX2RvX21zcl9yZWFk KHVuc2lnbmVkIGludCBtc3IsIHVpbnQ2NF90ICptc3JfY29udGVudCkKICAgICAgICAgYnJlYWs7 CiAKICAgICBkZWZhdWx0OgotICAgICAgICByZXR1cm4gSE5ETF91bmhhbmRsZWQ7CisgICAgICAg IHJldHVybiBYODZFTVVMX1VOSEFORExFQUJMRTsKICAgICB9CiAKICAgICBIVk1fREJHX0xPRyhE QkdfTEVWRUxfTVNSLCAibXNyICUjeCBjb250ZW50ICUjIlBSSXg2NCwgbXNyLCAqbXNyX2NvbnRl bnQpOwogCi0gICAgcmV0dXJuIEhORExfZG9uZTsKKyAgICByZXR1cm4gWDg2RU1VTF9PS0FZOwog fQogCi1zdGF0aWMgZW51bSBoYW5kbGVyX3JldHVybgotbG9uZ19tb2RlX2RvX21zcl93cml0ZSh1 bnNpZ25lZCBpbnQgbXNyLCB1aW50NjRfdCBtc3JfY29udGVudCkKK3N0YXRpYyBpbnQgbG9uZ19t b2RlX2RvX21zcl93cml0ZSh1bnNpZ25lZCBpbnQgbXNyLCB1aW50NjRfdCBtc3JfY29udGVudCkK IHsKICAgICBzdHJ1Y3QgdmNwdSAqdiA9IGN1cnJlbnQ7CiAKQEAgLTU3NywxMyArNTczLDEzIEBA IGxvbmdfbW9kZV9kb19tc3Jfd3JpdGUodW5zaWduZWQgaW50IG1zciwgdWludDY0X3QgbXNyX2Nv bnRlbnQpCiAgICAgICAgIGJyZWFrOwogCiAgICAgZGVmYXVsdDoKLSAgICAgICAgcmV0dXJuIEhO RExfdW5oYW5kbGVkOworICAgICAgICByZXR1cm4gWDg2RU1VTF9VTkhBTkRMRUFCTEU7CiAgICAg fQogCi0gICAgcmV0dXJuIEhORExfZG9uZTsKKyAgICByZXR1cm4gWDg2RU1VTF9PS0FZOwogCiAg Z3BfZmF1bHQ6Ci0gICAgcmV0dXJuIEhORExfZXhjZXB0aW9uX3JhaXNlZDsKKyAgICByZXR1cm4g WDg2RU1VTF9FWENFUFRJT047CiB9CiAKIC8qCkBAIC0yOTM3LDEyICsyOTMzLDEyIEBAIHN0YXRp YyBpbnQgdm14X21zcl9yZWFkX2ludGVyY2VwdCh1bnNpZ25lZCBpbnQgbXNyLCB1aW50NjRfdCAq bXNyX2NvbnRlbnQpCiAgICAgICAgICAgICBnb3RvIGRvbmU7CiAgICAgICAgIHN3aXRjaCAoIGxv bmdfbW9kZV9kb19tc3JfcmVhZChtc3IsIG1zcl9jb250ZW50KSApCiAgICAgICAgIHsKLSAgICAg ICAgICAgIGNhc2UgSE5ETF91bmhhbmRsZWQ6Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAg ICAgICAgICBjYXNlIEhORExfZXhjZXB0aW9uX3JhaXNlZDoKLSAgICAgICAgICAgICAgICByZXR1 cm4gWDg2RU1VTF9FWENFUFRJT047Ci0gICAgICAgICAgICBjYXNlIEhORExfZG9uZToKLSAgICAg ICAgICAgICAgICBnb3RvIGRvbmU7CisgICAgICAgIGNhc2UgWDg2RU1VTF9VTkhBTkRMRUFCTEU6 CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBYODZFTVVMX0VYQ0VQVElPTjoKKyAg ICAgICAgICAgIHJldHVybiBYODZFTVVMX0VYQ0VQVElPTjsKKyAgICAgICAgY2FzZSBYODZFTVVM X09LQVk6CisgICAgICAgICAgICBnb3RvIGRvbmU7CiAgICAgICAgIH0KIAogICAgICAgICBpZiAo IHZteF9yZWFkX2d1ZXN0X21zcihtc3IsIG1zcl9jb250ZW50KSA9PSAwICkKQEAgLTMxNjEsMjQg KzMxNTcsMjQgQEAgc3RhdGljIGludCB2bXhfbXNyX3dyaXRlX2ludGVyY2VwdCh1bnNpZ25lZCBp bnQgbXNyLCB1aW50NjRfdCBtc3JfY29udGVudCkKIAogICAgICAgICBzd2l0Y2ggKCBsb25nX21v ZGVfZG9fbXNyX3dyaXRlKG1zciwgbXNyX2NvbnRlbnQpICkKICAgICAgICAgewotICAgICAgICAg ICAgY2FzZSBITkRMX3VuaGFuZGxlZDoKLSAgICAgICAgICAgICAgICBpZiAoICh2bXhfd3JpdGVf Z3Vlc3RfbXNyKG1zciwgbXNyX2NvbnRlbnQpICE9IDApICYmCi0gICAgICAgICAgICAgICAgICAg ICAhaXNfbGFzdF9icmFuY2hfbXNyKG1zcikgKQotICAgICAgICAgICAgICAgICAgICBzd2l0Y2gg KCB3cm1zcl9oeXBlcnZpc29yX3JlZ3MobXNyLCBtc3JfY29udGVudCkgKQotICAgICAgICAgICAg ICAgICAgICB7Ci0gICAgICAgICAgICAgICAgICAgIGNhc2UgLUVSRVNUQVJUOgotICAgICAgICAg ICAgICAgICAgICAgICAgcmV0dXJuIFg4NkVNVUxfUkVUUlk7Ci0gICAgICAgICAgICAgICAgICAg IGNhc2UgMDoKLSAgICAgICAgICAgICAgICAgICAgY2FzZSAxOgotICAgICAgICAgICAgICAgICAg ICAgICAgYnJlYWs7Ci0gICAgICAgICAgICAgICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgICAg ICAgICAgICAgICBnb3RvIGdwX2ZhdWx0OwotICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAg ICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBjYXNlIEhORExfZXhjZXB0aW9uX3JhaXNlZDoK LSAgICAgICAgICAgICAgICByZXR1cm4gWDg2RU1VTF9FWENFUFRJT047Ci0gICAgICAgICAgICBj YXNlIEhORExfZG9uZToKLSAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBYODZF TVVMX1VOSEFORExFQUJMRToKKyAgICAgICAgICAgIGlmICggKHZteF93cml0ZV9ndWVzdF9tc3Io bXNyLCBtc3JfY29udGVudCkgIT0gMCkgJiYKKyAgICAgICAgICAgICAgICAgIWlzX2xhc3RfYnJh bmNoX21zcihtc3IpICkKKyAgICAgICAgICAgICAgICBzd2l0Y2ggKCB3cm1zcl9oeXBlcnZpc29y X3JlZ3MobXNyLCBtc3JfY29udGVudCkgKQorICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAg ICAgICBjYXNlIC1FUkVTVEFSVDoKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIFg4NkVNVUxf UkVUUlk7CisgICAgICAgICAgICAgICAgY2FzZSAwOgorICAgICAgICAgICAgICAgIGNhc2UgMToK KyAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgZGVmYXVsdDoKKyAg ICAgICAgICAgICAgICAgICAgZ290byBncF9mYXVsdDsKKyAgICAgICAgICAgICAgICB9CisgICAg ICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBYODZFTVVMX0VYQ0VQVElPTjoKKyAgICAgICAg ICAgIHJldHVybiBYODZFTVVMX0VYQ0VQVElPTjsKKyAgICAgICAgY2FzZSBYODZFTVVMX09LQVk6 CisgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgICAgICBicmVhazsKICAgICB9Ci0t IAoyLjEuNAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f Clhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0 dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw=