From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH v2 05/18] x86/pv: clean up emulate_ops.c Date: Fri, 5 May 2017 15:48:23 +0100 Message-ID: <20170505144836.8612-6-wei.liu2@citrix.com> References: <20170505144836.8612-1-wei.liu2@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d6eXC-0000Bw-MT for xen-devel@lists.xenproject.org; Fri, 05 May 2017 14:48:42 +0000 In-Reply-To: <20170505144836.8612-1-wei.liu2@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 , Wei Liu , Jan Beulich List-Id: xen-devel@lists.xenproject.org UmVwbGFjZSBib29sX3Qgd2l0aCBib29sLgoKQ2hhbmdlIGNoZWNrX3N0YWNrX2xpbWl0IHRvIHJl dHVybiBib29sLgoKRml4IHNvbWUgY29kaW5nIHN0eWxlIGlzc3Vlcy4KClVuZGVmIFRPR0dMRV9N T0RFIHdoZW4gaXQgaXMgbm8gbG9uZ2VyIG5lZWRlZC4KClNpZ25lZC1vZmYtYnk6IFdlaSBMaXUg PHdlaS5saXUyQGNpdHJpeC5jb20+Ci0tLQogeGVuL2FyY2gveDg2L3B2L2VtdWxhdGVfb3BzLmMg fCAyOCArKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTUgaW5z ZXJ0aW9ucygrKSwgMTMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L3B2 L2VtdWxhdGVfb3BzLmMgYi94ZW4vYXJjaC94ODYvcHYvZW11bGF0ZV9vcHMuYwppbmRleCA1ZjA5 NjVlMDViLi45N2M4ZDE0ODU5IDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvcHYvZW11bGF0ZV9v cHMuYworKysgYi94ZW4vYXJjaC94ODYvcHYvZW11bGF0ZV9vcHMuYwpAQCAtMTM4LDcgKzEzOCw3 IEBAIHN0YXRpYyBpbnQgcmVhZF9kZXNjcmlwdG9yKHVuc2lnbmVkIGludCBzZWwsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBsb25nICpiYXNlLAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgdW5zaWduZWQgbG9uZyAqbGltaXQsCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICB1bnNpZ25lZCBpbnQgKmFyLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgYm9vbF90 IGluc25fZmV0Y2gpCisgICAgICAgICAgICAgICAgICAgICAgICAgICBib29sIGluc25fZmV0Y2gp CiB7CiAgICAgc3RydWN0IGRlc2Nfc3RydWN0IGRlc2M7CiAKQEAgLTI3NCw3ICsyNzQsNyBAQCBz dGF0aWMgaW50IHByaXZfb3BfcmVhZF9zZWdtZW50KGVudW0geDg2X3NlZ21lbnQgc2VnLAogfQog CiAvKiBQZXJmb3JtIElPUEwgY2hlY2sgYmV0d2VlbiB0aGUgdmNwdSdzIHNoYWRvd2VkIElPUEws IGFuZCB0aGUgYXNzdW1lZCBjcGwuICovCi1zdGF0aWMgYm9vbF90IGlvcGxfb2soY29uc3Qgc3Ry dWN0IHZjcHUgKnYsIGNvbnN0IHN0cnVjdCBjcHVfdXNlcl9yZWdzICpyZWdzKQorc3RhdGljIGJv b2wgaW9wbF9vayhjb25zdCBzdHJ1Y3QgdmNwdSAqdiwgY29uc3Qgc3RydWN0IGNwdV91c2VyX3Jl Z3MgKnJlZ3MpCiB7CiAgICAgdW5zaWduZWQgaW50IGNwbCA9IGd1ZXN0X2tlcm5lbF9tb2RlKHYs IHJlZ3MpID8KICAgICAgICAgKFZNX0FTU0lTVCh2LT5kb21haW4sIGFyY2hpdGVjdHVyYWxfaW9w bCkgPyAwIDogMSkgOiAzOwpAQCAtMzE4LDkgKzMxOCw4IEBAIHN0YXRpYyBpb19lbXVsX3N0dWJf dCAqaW9fZW11bF9zdHViX3NldHVwKHN0cnVjdCBwcml2X29wX2N0eHQgKmN0eHQsIHU4IG9wY29k ZSwKIH0KIAogLyogSGFzIHRoZSBndWVzdCByZXF1ZXN0ZWQgc3VmZmljaWVudCBwZXJtaXNzaW9u IGZvciB0aGlzIEkvTyBhY2Nlc3M/ICovCi1zdGF0aWMgaW50IGd1ZXN0X2lvX29rYXkoCi0gICAg dW5zaWduZWQgaW50IHBvcnQsIHVuc2lnbmVkIGludCBieXRlcywKLSAgICBzdHJ1Y3QgdmNwdSAq diwgc3RydWN0IGNwdV91c2VyX3JlZ3MgKnJlZ3MpCitzdGF0aWMgaW50IGd1ZXN0X2lvX29rYXko dW5zaWduZWQgaW50IHBvcnQsIHVuc2lnbmVkIGludCBieXRlcywKKyAgICAgICAgICAgICAgICAg ICAgICAgICBzdHJ1Y3QgdmNwdSAqdiwgc3RydWN0IGNwdV91c2VyX3JlZ3MgKnJlZ3MpCiB7CiAg ICAgLyogSWYgaW4gdXNlciBtb2RlLCBzd2l0Y2ggdG8ga2VybmVsIG1vZGUganVzdCB0byByZWFk IEkvTyBiaXRtYXAuICovCiAgICAgaW50IHVzZXJfbW9kZSA9ICEodi0+YXJjaC5mbGFncyAmIFRG X2tlcm5lbF9tb2RlKTsKQEAgLTM1MywxMSArMzUyLDEzIEBAIHN0YXRpYyBpbnQgZ3Vlc3RfaW9f b2theSgKICAgICAgICAgICAgIHJldHVybiAxOwogICAgIH0KIAorI3VuZGVmIFRPR0dMRV9NT0RF CiAgICAgcmV0dXJuIDA7CiB9CiAKIHN0YXRpYyB1bnNpZ25lZCBpbnQgY2hlY2tfZ3Vlc3RfaW9f YnJlYWtwb2ludChzdHJ1Y3QgdmNwdSAqdiwKLSAgICB1bnNpZ25lZCBpbnQgcG9ydCwgdW5zaWdu ZWQgaW50IGxlbikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICB1bnNpZ25lZCBpbnQgcG9ydCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICB1bnNpZ25lZCBpbnQgbGVuKQogewogICAgIHVuc2lnbmVkIGludCB3aWR0aCwg aSwgbWF0Y2ggPSAwOwogICAgIHVuc2lnbmVkIGxvbmcgc3RhcnQ7CkBAIC0zOTIsOCArMzkzLDgg QEAgc3RhdGljIHVuc2lnbmVkIGludCBjaGVja19ndWVzdF9pb19icmVha3BvaW50KHN0cnVjdCB2 Y3B1ICp2LAogfQogCiAvKiBIYXMgdGhlIGFkbWluaXN0cmF0b3IgZ3JhbnRlZCBzdWZmaWNpZW50 IHBlcm1pc3Npb24gZm9yIHRoaXMgSS9PIGFjY2Vzcz8gKi8KLXN0YXRpYyBib29sX3QgYWRtaW5f aW9fb2theSh1bnNpZ25lZCBpbnQgcG9ydCwgdW5zaWduZWQgaW50IGJ5dGVzLAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGNvbnN0IHN0cnVjdCBkb21haW4gKmQpCitzdGF0aWMgYm9vbCBh ZG1pbl9pb19va2F5KHVuc2lnbmVkIGludCBwb3J0LCB1bnNpZ25lZCBpbnQgYnl0ZXMsCisgICAg ICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IHN0cnVjdCBkb21haW4gKmQpCiB7CiAgICAgLyoK ICAgICAgKiBQb3J0IDB4Y2Y4IChDT05GSUdfQUREUkVTUykgaXMgb25seSB2aXNpYmxlIGZvciBE V09SRCBhY2Nlc3Nlcy4KQEAgLTQwOSw4ICs0MTAsOCBAQCBzdGF0aWMgYm9vbF90IGFkbWluX2lv X29rYXkodW5zaWduZWQgaW50IHBvcnQsIHVuc2lnbmVkIGludCBieXRlcywKICAgICByZXR1cm4g aW9wb3J0c19hY2Nlc3NfcGVybWl0dGVkKGQsIHBvcnQsIHBvcnQgKyBieXRlcyAtIDEpOwogfQog Ci1zdGF0aWMgYm9vbF90IHBjaV9jZmdfb2soc3RydWN0IGRvbWFpbiAqY3VycmQsIHVuc2lnbmVk IGludCBzdGFydCwKLSAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBpbnQgc2l6ZSwg dWludDMyX3QgKndyaXRlKQorc3RhdGljIGJvb2wgcGNpX2NmZ19vayhzdHJ1Y3QgZG9tYWluICpj dXJyZCwgdW5zaWduZWQgaW50IHN0YXJ0LAorICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25l ZCBpbnQgc2l6ZSwgdWludDMyX3QgKndyaXRlKQogewogICAgIHVpbnQzMl90IG1hY2hpbmVfYmRm OwogCkBAIC01MTgsNyArNTE5LDggQEAgdm9pZCBndWVzdF9pb193cml0ZSh1bnNpZ25lZCBpbnQg cG9ydCwgdW5zaWduZWQgaW50IGJ5dGVzLCB1aW50MzJfdCBkYXRhLAogewogICAgIGlmICggYWRt aW5faW9fb2theShwb3J0LCBieXRlcywgY3VycmQpICkKICAgICB7Ci0gICAgICAgIHN3aXRjaCAo IGJ5dGVzICkgeworICAgICAgICBzd2l0Y2ggKCBieXRlcyApCisgICAgICAgIHsKICAgICAgICAg Y2FzZSAxOgogICAgICAgICAgICAgb3V0YigodWludDhfdClkYXRhLCBwb3J0KTsKICAgICAgICAg ICAgIGlmICggcHZfcG9zdF9vdXRiX2hvb2sgKQpAQCAtMTU4Nyw4ICsxNTg5LDggQEAgc3RhdGlj IGludCByZWFkX2dhdGVfZGVzY3JpcHRvcih1bnNpZ25lZCBpbnQgZ2F0ZV9zZWwsCiAgICAgcmV0 dXJuIDE7CiB9CiAKLXN0YXRpYyBpbmxpbmUgaW50IGNoZWNrX3N0YWNrX2xpbWl0KHVuc2lnbmVk IGludCBhciwgdW5zaWduZWQgaW50IGxpbWl0LAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgdW5zaWduZWQgaW50IGVzcCwgdW5zaWduZWQgaW50IGRlY3IpCitzdGF0aWMgaW5s aW5lIGJvb2wgY2hlY2tfc3RhY2tfbGltaXQodW5zaWduZWQgaW50IGFyLCB1bnNpZ25lZCBpbnQg bGltaXQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgaW50 IGVzcCwgdW5zaWduZWQgaW50IGRlY3IpCiB7CiAgICAgcmV0dXJuICgoKGVzcCAtIGRlY3IpIDwg KGVzcCAtIDEpKSAmJgogICAgICAgICAgICAgKCEoYXIgJiBfU0VHTUVOVF9FQykgPyAoZXNwIC0g MSkgPD0gbGltaXQgOiAoZXNwIC0gZGVjcikgPiBsaW1pdCkpOwotLSAKMi4xMS4wCgoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxp bmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwczovL2xpc3RzLnhlbi5vcmcveGVu LWRldmVsCg==