From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH v3 07/24] x86/emul: Clean up the naming of the retire union Date: Wed, 30 Nov 2016 13:50:24 +0000 Message-ID: <1480513841-7565-8-git-send-email-andrew.cooper3@citrix.com> References: <1480513841-7565-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: <1480513841-7565-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 , Paul Durrant , Jan Beulich List-Id: xen-devel@lists.xenproject.org UmVuYW1lIGJ5dGUgdG8gcmF3LCBhcyB0aGUgZmllbGQgYmVpbmcgYSBzaW5nbGUgYnl0ZSBsb25n IGlzIGFuIGltcGxlbWVudGF0aW9uCmRldGFpbC4gIE1ha2UgdGhlIGJpdGZpZWxkcyBwYXJ0IG9m IGFuIGFub255bW91cyBzdHJ1Y3QgdG8gcmVtb3ZlIHRoZSAuZmxhZ3MKcXVhbGlmaWVyLiAgQ2hh bmdlIHRoZSB0eXBlcyBvZiB0aGUgZmxhZ3MgdG8gYmVpbmcgYm9vbGVhbnMsIHRvIG1hdGNoIHRo ZWlyCnVzZS4KCk5vIGZ1bmN0aW9uYWwgY2hhbmdlLgoKU2lnbmVkLW9mZi1ieTogQW5kcmV3IENv b3BlciA8YW5kcmV3LmNvb3BlcjNAY2l0cml4LmNvbT4KLS0tCkNDOiBKYW4gQmV1bGljaCA8SkJl dWxpY2hAc3VzZS5jb20+CkNDOiBQYXVsIER1cnJhbnQgPHBhdWwuZHVycmFudEBjaXRyaXguY29t PgoKdjM6CiAqIE5ldwotLS0KIHhlbi9hcmNoL3g4Ni9odm0vZW11bGF0ZS5jICAgICAgICAgICAg IHwgIDYgKysrLS0tCiB4ZW4vYXJjaC94ODYveDg2X2VtdWxhdGUveDg2X2VtdWxhdGUuYyB8IDEw ICsrKysrLS0tLS0KIHhlbi9hcmNoL3g4Ni94ODZfZW11bGF0ZS94ODZfZW11bGF0ZS5oIHwgMTAg KysrKystLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCAxMyBpbnNlcnRpb25zKCspLCAxMyBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvaHZtL2VtdWxhdGUuYyBiL3hlbi9hcmNo L3g4Ni9odm0vZW11bGF0ZS5jCmluZGV4IGJjMjU5ZWMuLmZlNjI1MDAgMTAwNjQ0Ci0tLSBhL3hl bi9hcmNoL3g4Ni9odm0vZW11bGF0ZS5jCisrKyBiL3hlbi9hcmNoL3g4Ni9odm0vZW11bGF0ZS5j CkBAIC0xNzkxLDEzICsxNzkxLDEzIEBAIHN0YXRpYyBpbnQgX2h2bV9lbXVsYXRlX29uZShzdHJ1 Y3QgaHZtX2VtdWxhdGVfY3R4dCAqaHZtZW11bF9jdHh0LAogICAgIG5ld19pbnRyX3NoYWRvdyA9 IGh2bWVtdWxfY3R4dC0+aW50cl9zaGFkb3c7CiAKICAgICAvKiBNT1YtU1MgaW5zdHJ1Y3Rpb24g dG9nZ2xlcyBNT1YtU1Mgc2hhZG93LCBlbHNlIHdlIGp1c3QgY2xlYXIgaXQuICovCi0gICAgaWYg KCBodm1lbXVsX2N0eHQtPmN0eHQucmV0aXJlLmZsYWdzLm1vdl9zcyApCisgICAgaWYgKCBodm1l bXVsX2N0eHQtPmN0eHQucmV0aXJlLm1vdl9zcyApCiAgICAgICAgIG5ld19pbnRyX3NoYWRvdyBe PSBIVk1fSU5UUl9TSEFET1dfTU9WX1NTOwogICAgIGVsc2UKICAgICAgICAgbmV3X2ludHJfc2hh ZG93ICY9IH5IVk1fSU5UUl9TSEFET1dfTU9WX1NTOwogCiAgICAgLyogU1RJIGluc3RydWN0aW9u IHRvZ2dsZXMgU1RJIHNoYWRvdywgZWxzZSB3ZSBqdXN0IGNsZWFyIGl0LiAqLwotICAgIGlmICgg aHZtZW11bF9jdHh0LT5jdHh0LnJldGlyZS5mbGFncy5zdGkgKQorICAgIGlmICggaHZtZW11bF9j dHh0LT5jdHh0LnJldGlyZS5zdGkgKQogICAgICAgICBuZXdfaW50cl9zaGFkb3cgXj0gSFZNX0lO VFJfU0hBRE9XX1NUSTsKICAgICBlbHNlCiAgICAgICAgIG5ld19pbnRyX3NoYWRvdyAmPSB+SFZN X0lOVFJfU0hBRE9XX1NUSTsKQEAgLTE4MDgsNyArMTgwOCw3IEBAIHN0YXRpYyBpbnQgX2h2bV9l bXVsYXRlX29uZShzdHJ1Y3QgaHZtX2VtdWxhdGVfY3R4dCAqaHZtZW11bF9jdHh0LAogICAgICAg ICBodm1fZnVuY3Muc2V0X2ludGVycnVwdF9zaGFkb3coY3VyciwgbmV3X2ludHJfc2hhZG93KTsK ICAgICB9CiAKLSAgICBpZiAoIGh2bWVtdWxfY3R4dC0+Y3R4dC5yZXRpcmUuZmxhZ3MuaGx0ICYm CisgICAgaWYgKCBodm1lbXVsX2N0eHQtPmN0eHQucmV0aXJlLmhsdCAmJgogICAgICAgICAgIWh2 bV9sb2NhbF9ldmVudHNfbmVlZF9kZWxpdmVyeShjdXJyKSApCiAgICAgewogICAgICAgICBodm1f aGx0KHJlZ3MtPmVmbGFncyk7CmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYveDg2X2VtdWxhdGUv eDg2X2VtdWxhdGUuYyBiL3hlbi9hcmNoL3g4Ni94ODZfZW11bGF0ZS94ODZfZW11bGF0ZS5jCmlu ZGV4IDljMjhlZDQuLjQxNjgxMmUgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni94ODZfZW11bGF0 ZS94ODZfZW11bGF0ZS5jCisrKyBiL3hlbi9hcmNoL3g4Ni94ODZfZW11bGF0ZS94ODZfZW11bGF0 ZS5jCkBAIC0xOTA1LDcgKzE5MDUsNyBAQCB4ODZfZGVjb2RlKAogICAgIHN0YXRlLT5laXAgPSBj dHh0LT5yZWdzLT5laXA7CiAKICAgICAvKiBJbml0aWFsaXNlIG91dHB1dCBzdGF0ZSBpbiB4ODZf ZW11bGF0ZV9jdHh0ICovCi0gICAgY3R4dC0+cmV0aXJlLmJ5dGUgPSAwOworICAgIGN0eHQtPnJl dGlyZS5yYXcgPSAwOwogCiAgICAgb3BfYnl0ZXMgPSBkZWZfb3BfYnl0ZXMgPSBhZF9ieXRlcyA9 IGRlZl9hZF9ieXRlcyA9IGN0eHQtPmFkZHJfc2l6ZS84OwogICAgIGlmICggb3BfYnl0ZXMgPT0g OCApCkBAIC0yNjY4LDcgKzI2NjgsNyBAQCB4ODZfZW11bGF0ZSgKIAogICAgIGNhc2UgMHgxNzog LyogcG9wICUlc3MgKi8KICAgICAgICAgc3JjLnZhbCA9IHg4Nl9zZWdfc3M7Ci0gICAgICAgIGN0 eHQtPnJldGlyZS5mbGFncy5tb3Zfc3MgPSAxOworICAgICAgICBjdHh0LT5yZXRpcmUubW92X3Nz ID0gMTsKICAgICAgICAgZ290byBwb3Bfc2VnOwogCiAgICAgY2FzZSAweDFlOiAvKiBwdXNoICUl ZHMgKi8KQEAgLTI5OTYsNyArMjk5Niw3IEBAIHg4Nl9lbXVsYXRlKAogICAgICAgICBpZiAoIChy YyA9IGxvYWRfc2VnKHNlZywgc3JjLnZhbCwgMCwgTlVMTCwgY3R4dCwgb3BzKSkgIT0gMCApCiAg ICAgICAgICAgICBnb3RvIGRvbmU7CiAgICAgICAgIGlmICggc2VnID09IHg4Nl9zZWdfc3MgKQot ICAgICAgICAgICAgY3R4dC0+cmV0aXJlLmZsYWdzLm1vdl9zcyA9IDE7CisgICAgICAgICAgICBj dHh0LT5yZXRpcmUubW92X3NzID0gMTsKICAgICAgICAgZHN0LnR5cGUgPSBPUF9OT05FOwogICAg ICAgICBicmVhazsKIApAQCAtNDAzMyw3ICs0MDMzLDcgQEAgeDg2X2VtdWxhdGUoCiAKICAgICBj YXNlIDB4ZjQ6IC8qIGhsdCAqLwogICAgICAgICBnZW5lcmF0ZV9leGNlcHRpb25faWYoIW1vZGVf cmluZzAoKSwgRVhDX0dQLCAwKTsKLSAgICAgICAgY3R4dC0+cmV0aXJlLmZsYWdzLmhsdCA9IDE7 CisgICAgICAgIGN0eHQtPnJldGlyZS5obHQgPSAxOwogICAgICAgICBicmVhazsKIAogICAgIGNh c2UgMHhmNTogLyogY21jICovCkBAIC00MjQ3LDcgKzQyNDcsNyBAQCB4ODZfZW11bGF0ZSgKICAg ICAgICAgaWYgKCAhKF9yZWdzLmVmbGFncyAmIEVGTEdfSUYpICkKICAgICAgICAgewogICAgICAg ICAgICAgX3JlZ3MuZWZsYWdzIHw9IEVGTEdfSUY7Ci0gICAgICAgICAgICBjdHh0LT5yZXRpcmUu ZmxhZ3Muc3RpID0gMTsKKyAgICAgICAgICAgIGN0eHQtPnJldGlyZS5zdGkgPSAxOwogICAgICAg ICB9CiAgICAgICAgIGJyZWFrOwogCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYveDg2X2VtdWxh dGUveDg2X2VtdWxhdGUuaCBiL3hlbi9hcmNoL3g4Ni94ODZfZW11bGF0ZS94ODZfZW11bGF0ZS5o CmluZGV4IGIwZjAzMDQuLmVmMzk2MDEgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni94ODZfZW11 bGF0ZS94ODZfZW11bGF0ZS5oCisrKyBiL3hlbi9hcmNoL3g4Ni94ODZfZW11bGF0ZS94ODZfZW11 bGF0ZS5oCkBAIC00NjgsMTIgKzQ2OCwxMiBAQCBzdHJ1Y3QgeDg2X2VtdWxhdGVfY3R4dAogCiAg ICAgLyogUmV0aXJlbWVudCBzdGF0ZSwgc2V0IGJ5IHRoZSBlbXVsYXRvciAodmFsaWQgb25seSBv biBYODZFTVVMX09LQVkpLiAqLwogICAgIHVuaW9uIHsKKyAgICAgICAgdWludDhfdCByYXc7CiAg ICAgICAgIHN0cnVjdCB7Ci0gICAgICAgICAgICB1aW50OF90IGhsdDoxOyAgICAgICAgICAvKiBJ bnN0cnVjdGlvbiBITFRlZC4gKi8KLSAgICAgICAgICAgIHVpbnQ4X3QgbW92X3NzOjE7ICAgICAg IC8qIEluc3RydWN0aW9uIHNldHMgTU9WLVNTIGlycSBzaGFkb3cuICovCi0gICAgICAgICAgICB1 aW50OF90IHN0aToxOyAgICAgICAgICAvKiBJbnN0cnVjdGlvbiBzZXRzIFNUSSBpcnEgc2hhZG93 LiAqLwotICAgICAgICB9IGZsYWdzOwotICAgICAgICB1aW50OF90IGJ5dGU7CisgICAgICAgICAg ICBib29sIGhsdDoxOyAgICAgICAgICAvKiBJbnN0cnVjdGlvbiBITFRlZC4gKi8KKyAgICAgICAg ICAgIGJvb2wgbW92X3NzOjE7ICAgICAgIC8qIEluc3RydWN0aW9uIHNldHMgTU9WLVNTIGlycSBz aGFkb3cuICovCisgICAgICAgICAgICBib29sIHN0aToxOyAgICAgICAgICAvKiBJbnN0cnVjdGlv biBzZXRzIFNUSSBpcnEgc2hhZG93LiAqLworICAgICAgICB9OwogICAgIH0gcmV0aXJlOwogfTsK IAotLSAKMi4xLjQKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHBz Oi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK