From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH 1/3] xen/vcpu: Rename the common interfaces for consistency Date: Thu, 6 Sep 2018 20:25:32 +0100 Message-ID: <1536261934-1236-2-git-send-email-andrew.cooper3@citrix.com> References: <1536261934-1236-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: <1536261934-1236-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: Stefano Stabellini , Wei Liu , Andrew Cooper , Julien Grall , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= List-Id: xen-devel@lists.xenproject.org VGhlIHZjcHUgZnVuY3Rpb25zIGFyZSBmYXIgbGVzcyBjb25zaXN0ZW50IHRoYW4gdGhlIGRvbWFp biBzaWRlIG9mIHRoaW5ncywgYW5kCmluIHBhcnRpY3VsYXIsIGhhcyB2Y3B1X2Rlc3Ryb3koKSBm b3IgYXJjaGl0ZWN0dXJlIHNwZWNpZmljIGZ1bmN0aW9uYWxpdHkuCgpQZXJmb3JtIHRoZSBmb2xs b3dpbmcgcmVuYW1lczoKCiAgKiBhbGxvY192Y3B1ICAgICAgPT4gdmNwdV9jcmVhdGUKICAqIHZj cHVfaW5pdGlhbGlzZSA9PiBhcmNoX3ZjcHVfY3JlYXRlCiAgKiB2Y3B1X2Rlc3Ryb3kgICAgPT4g YXJjaF92Y3B1X2Rlc3Ryb3kKCndoaWNoIG1ha2VzIHRoZSB2Y3B1IGhpZXJhcmNoeSBjb25zaXN0 ZW50IHdpdGggdGhlIGRvbWFpbiBoaWVyYXJjaHkuCgpObyBmdW5jdGlvbmFsIGNoYW5nZS4KClNp Z25lZC1vZmYtYnk6IEFuZHJldyBDb29wZXIgPGFuZHJldy5jb29wZXIzQGNpdHJpeC5jb20+Ci0t LQpDQzogSmFuIEJldWxpY2ggPEpCZXVsaWNoQHN1c2UuY29tPgpDQzogV2VpIExpdSA8d2VpLmxp dTJAY2l0cml4LmNvbT4KQ0M6IFJvZ2VyIFBhdSBNb25uw6kgPHJvZ2VyLnBhdUBjaXRyaXguY29t PgpDQzogU3RlZmFubyBTdGFiZWxsaW5pIDxzc3RhYmVsbGluaUBrZXJuZWwub3JnPgpDQzogSnVs aWVuIEdyYWxsIDxqdWxpZW4uZ3JhbGxAYXJtLmNvbT4KLS0tCiB4ZW4vYXJjaC9hcm0vZG9tYWlu LmMgICAgICAgfCAgNiArKystLS0KIHhlbi9hcmNoL2FybS9kb21haW5fYnVpbGQuYyB8ICA0ICsr LS0KIHhlbi9hcmNoL3g4Ni9kb20wX2J1aWxkLmMgICB8ICAyICstCiB4ZW4vYXJjaC94ODYvZG9t YWluLmMgICAgICAgfCAgNCArKy0tCiB4ZW4vY29tbW9uL2RvbWFpbi5jICAgICAgICAgfCAgNiAr KystLS0KIHhlbi9jb21tb24vZG9tY3RsLmMgICAgICAgICB8ICAyICstCiB4ZW4vY29tbW9uL3Nj aGVkdWxlLmMgICAgICAgfCAgNCArKy0tCiB4ZW4vaW5jbHVkZS94ZW4vZG9tYWluLmggICAgfCAx MCArKysrKy0tLS0tCiA4IGZpbGVzIGNoYW5nZWQsIDE5IGluc2VydGlvbnMoKyksIDE5IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL2FybS9kb21haW4uYyBiL3hlbi9hcmNoL2Fy bS9kb21haW4uYwppbmRleCA0YmFlY2MyLi5mZWViYmY1IDEwMDY0NAotLS0gYS94ZW4vYXJjaC9h cm0vZG9tYWluLmMKKysrIGIveGVuL2FyY2gvYXJtL2RvbWFpbi5jCkBAIC01MzgsNyArNTM4LDcg QEAgdm9pZCBmcmVlX3ZjcHVfc3RydWN0KHN0cnVjdCB2Y3B1ICp2KQogICAgIGZyZWVfeGVuaGVh cF9wYWdlcyh2LCBnZXRfb3JkZXJfZnJvbV9ieXRlcyhzaXplb2YoKnYpKSk7CiB9CiAKLWludCB2 Y3B1X2luaXRpYWxpc2Uoc3RydWN0IHZjcHUgKnYpCitpbnQgYXJjaF92Y3B1X2NyZWF0ZShzdHJ1 Y3QgdmNwdSAqdikKIHsKICAgICBpbnQgcmMgPSAwOwogCkBAIC01ODMsMTEgKzU4MywxMSBAQCBp bnQgdmNwdV9pbml0aWFsaXNlKHN0cnVjdCB2Y3B1ICp2KQogICAgIHJldHVybiByYzsKIAogZmFp bDoKLSAgICB2Y3B1X2Rlc3Ryb3kodik7CisgICAgYXJjaF92Y3B1X2Rlc3Ryb3kodik7CiAgICAg cmV0dXJuIHJjOwogfQogCi12b2lkIHZjcHVfZGVzdHJveShzdHJ1Y3QgdmNwdSAqdikKK3ZvaWQg YXJjaF92Y3B1X2Rlc3Ryb3koc3RydWN0IHZjcHUgKnYpCiB7CiAgICAgdmNwdV90aW1lcl9kZXN0 cm95KHYpOwogICAgIHZjcHVfdmdpY19mcmVlKHYpOwpkaWZmIC0tZ2l0IGEveGVuL2FyY2gvYXJt L2RvbWFpbl9idWlsZC5jIGIveGVuL2FyY2gvYXJtL2RvbWFpbl9idWlsZC5jCmluZGV4IDJhMzgz YzguLjUwNTdhZDggMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL2FybS9kb21haW5fYnVpbGQuYworKysg Yi94ZW4vYXJjaC9hcm0vZG9tYWluX2J1aWxkLmMKQEAgLTc0LDcgKzc0LDcgQEAgdW5zaWduZWQg aW50IF9faW5pdCBkb20wX21heF92Y3B1cyh2b2lkKQogCiBzdHJ1Y3QgdmNwdSAqX19pbml0IGFs bG9jX2RvbTBfdmNwdTAoc3RydWN0IGRvbWFpbiAqZG9tMCkKIHsKLSAgICByZXR1cm4gYWxsb2Nf dmNwdShkb20wLCAwLCAwKTsKKyAgICByZXR1cm4gdmNwdV9jcmVhdGUoZG9tMCwgMCwgMCk7CiB9 CiAKIHN0YXRpYyB1bnNpZ25lZCBpbnQgX19pbml0IGdldF8xMV9hbGxvY2F0aW9uX3NpemUocGFk ZHJfdCBzaXplKQpAQCAtMjIzMiw3ICsyMjMyLDcgQEAgaW50IF9faW5pdCBjb25zdHJ1Y3RfZG9t MChzdHJ1Y3QgZG9tYWluICpkKQogICAgIGZvciAoIGkgPSAxLCBjcHUgPSAwOyBpIDwgZC0+bWF4 X3ZjcHVzOyBpKysgKQogICAgIHsKICAgICAgICAgY3B1ID0gY3B1bWFza19jeWNsZShjcHUsICZj cHVfb25saW5lX21hcCk7Ci0gICAgICAgIGlmICggYWxsb2NfdmNwdShkLCBpLCBjcHUpID09IE5V TEwgKQorICAgICAgICBpZiAoIHZjcHVfY3JlYXRlKGQsIGksIGNwdSkgPT0gTlVMTCApCiAgICAg ICAgIHsKICAgICAgICAgICAgIHByaW50aygiRmFpbGVkIHRvIGFsbG9jYXRlIGRvbTAgdmNwdSAl ZCBvbiBwY3B1ICVkXG4iLCBpLCBjcHUpOwogICAgICAgICAgICAgYnJlYWs7CmRpZmYgLS1naXQg YS94ZW4vYXJjaC94ODYvZG9tMF9idWlsZC5jIGIveGVuL2FyY2gveDg2L2RvbTBfYnVpbGQuYwpp bmRleCA0MjNmZGVjLi44NmViN2RiIDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvZG9tMF9idWls ZC5jCisrKyBiL3hlbi9hcmNoL3g4Ni9kb20wX2J1aWxkLmMKQEAgLTEzNCw3ICsxMzQsNyBAQCBz dHJ1Y3QgdmNwdSAqX19pbml0IGRvbTBfc2V0dXBfdmNwdShzdHJ1Y3QgZG9tYWluICpkLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgaW50IHByZXZfY3B1KQog ewogICAgIHVuc2lnbmVkIGludCBjcHUgPSBjcHVtYXNrX2N5Y2xlKHByZXZfY3B1LCAmZG9tMF9j cHVzKTsKLSAgICBzdHJ1Y3QgdmNwdSAqdiA9IGFsbG9jX3ZjcHUoZCwgdmNwdV9pZCwgY3B1KTsK KyAgICBzdHJ1Y3QgdmNwdSAqdiA9IHZjcHVfY3JlYXRlKGQsIHZjcHVfaWQsIGNwdSk7CiAKICAg ICBpZiAoIHYgKQogICAgIHsKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9kb21haW4uYyBiL3hl bi9hcmNoL3g4Ni9kb21haW4uYwppbmRleCAzMTNlYmIzLi5kNjdhMDQ3IDEwMDY0NAotLS0gYS94 ZW4vYXJjaC94ODYvZG9tYWluLmMKKysrIGIveGVuL2FyY2gveDg2L2RvbWFpbi5jCkBAIC0zMjIs NyArMzIyLDcgQEAgdm9pZCBmcmVlX3ZjcHVfc3RydWN0KHN0cnVjdCB2Y3B1ICp2KQogICAgIGZy ZWVfeGVuaGVhcF9wYWdlKHYpOwogfQogCi1pbnQgdmNwdV9pbml0aWFsaXNlKHN0cnVjdCB2Y3B1 ICp2KQoraW50IGFyY2hfdmNwdV9jcmVhdGUoc3RydWN0IHZjcHUgKnYpCiB7CiAgICAgc3RydWN0 IGRvbWFpbiAqZCA9IHYtPmRvbWFpbjsKICAgICBpbnQgcmM7CkBAIC0zODIsNyArMzgyLDcgQEAg aW50IHZjcHVfaW5pdGlhbGlzZShzdHJ1Y3QgdmNwdSAqdikKICAgICByZXR1cm4gcmM7CiB9CiAK LXZvaWQgdmNwdV9kZXN0cm95KHN0cnVjdCB2Y3B1ICp2KQordm9pZCBhcmNoX3ZjcHVfZGVzdHJv eShzdHJ1Y3QgdmNwdSAqdikKIHsKICAgICB4ZnJlZSh2LT5hcmNoLnZtX2V2ZW50KTsKICAgICB2 LT5hcmNoLnZtX2V2ZW50ID0gTlVMTDsKZGlmZiAtLWdpdCBhL3hlbi9jb21tb24vZG9tYWluLmMg Yi94ZW4vY29tbW9uL2RvbWFpbi5jCmluZGV4IDc4YzQ1MGUuLjE0YzhkMDAgMTAwNjQ0Ci0tLSBh L3hlbi9jb21tb24vZG9tYWluLmMKKysrIGIveGVuL2NvbW1vbi9kb21haW4uYwpAQCAtMTIzLDcg KzEyMyw3IEBAIHN0YXRpYyB2b2lkIHZjcHVfaW5mb19yZXNldChzdHJ1Y3QgdmNwdSAqdikKICAg ICB2LT52Y3B1X2luZm9fbWZuID0gSU5WQUxJRF9NRk47CiB9CiAKLXN0cnVjdCB2Y3B1ICphbGxv Y192Y3B1KAorc3RydWN0IHZjcHUgKnZjcHVfY3JlYXRlKAogICAgIHN0cnVjdCBkb21haW4gKmQs IHVuc2lnbmVkIGludCB2Y3B1X2lkLCB1bnNpZ25lZCBpbnQgY3B1X2lkKQogewogICAgIHN0cnVj dCB2Y3B1ICp2OwpAQCAtMTY1LDcgKzE2NSw3IEBAIHN0cnVjdCB2Y3B1ICphbGxvY192Y3B1KAog ICAgIGlmICggc2NoZWRfaW5pdF92Y3B1KHYsIGNwdV9pZCkgIT0gMCApCiAgICAgICAgIGdvdG8g ZmFpbF93cTsKIAotICAgIGlmICggdmNwdV9pbml0aWFsaXNlKHYpICE9IDAgKQorICAgIGlmICgg YXJjaF92Y3B1X2NyZWF0ZSh2KSAhPSAwICkKICAgICB7CiAgICAgICAgIHNjaGVkX2Rlc3Ryb3lf dmNwdSh2KTsKICBmYWlsX3dxOgpAQCAtODcwLDcgKzg3MCw3IEBAIHN0YXRpYyB2b2lkIGNvbXBs ZXRlX2RvbWFpbl9kZXN0cm95KHN0cnVjdCByY3VfaGVhZCAqaGVhZCkKICAgICAgICAgaWYgKCAo diA9IGQtPnZjcHVbaV0pID09IE5VTEwgKQogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAg IHRhc2tsZXRfa2lsbCgmdi0+Y29udGludWVfaHlwZXJjYWxsX3Rhc2tsZXQpOwotICAgICAgICB2 Y3B1X2Rlc3Ryb3kodik7CisgICAgICAgIGFyY2hfdmNwdV9kZXN0cm95KHYpOwogICAgICAgICBz Y2hlZF9kZXN0cm95X3ZjcHUodik7CiAgICAgICAgIGRlc3Ryb3lfd2FpdHF1ZXVlX3ZjcHUodik7 CiAgICAgfQpkaWZmIC0tZ2l0IGEveGVuL2NvbW1vbi9kb21jdGwuYyBiL3hlbi9jb21tb24vZG9t Y3RsLmMKaW5kZXggZWQwNDdiNy4uMmZhY2JkYiAxMDA2NDQKLS0tIGEveGVuL2NvbW1vbi9kb21j dGwuYworKysgYi94ZW4vY29tbW9uL2RvbWN0bC5jCkBAIC01NzEsNyArNTcxLDcgQEAgbG9uZyBk b19kb21jdGwoWEVOX0dVRVNUX0hBTkRMRV9QQVJBTSh4ZW5fZG9tY3RsX3QpIHVfZG9tY3RsKQog ICAgICAgICAgICAgICAgIGNwdW1hc2tfYW55KG9ubGluZSkgOgogICAgICAgICAgICAgICAgIGNw dW1hc2tfY3ljbGUoZC0+dmNwdVtpLTFdLT5wcm9jZXNzb3IsIG9ubGluZSk7CiAKLSAgICAgICAg ICAgIGlmICggYWxsb2NfdmNwdShkLCBpLCBjcHUpID09IE5VTEwgKQorICAgICAgICAgICAgaWYg KCB2Y3B1X2NyZWF0ZShkLCBpLCBjcHUpID09IE5VTEwgKQogICAgICAgICAgICAgICAgIGdvdG8g bWF4dmNwdV9vdXQ7CiAgICAgICAgIH0KIApkaWZmIC0tZ2l0IGEveGVuL2NvbW1vbi9zY2hlZHVs ZS5jIGIveGVuL2NvbW1vbi9zY2hlZHVsZS5jCmluZGV4IDA1MjgxZDYuLjFlZjViZTkgMTAwNjQ0 Ci0tLSBhL3hlbi9jb21tb24vc2NoZWR1bGUuYworKysgYi94ZW4vY29tbW9uL3NjaGVkdWxlLmMK QEAgLTE2NDUsNyArMTY0NSw3IEBAIHN0YXRpYyBpbnQgY3B1X3NjaGVkdWxlX3VwKHVuc2lnbmVk IGludCBjcHUpCiAgICAgICAgIHJldHVybiAwOwogCiAgICAgaWYgKCBpZGxlX3ZjcHVbY3B1XSA9 PSBOVUxMICkKLSAgICAgICAgYWxsb2NfdmNwdShpZGxlX3ZjcHVbMF0tPmRvbWFpbiwgY3B1LCBj cHUpOworICAgICAgICB2Y3B1X2NyZWF0ZShpZGxlX3ZjcHVbMF0tPmRvbWFpbiwgY3B1LCBjcHUp OwogICAgIGVsc2UKICAgICB7CiAgICAgICAgIHN0cnVjdCB2Y3B1ICppZGxlID0gaWRsZV92Y3B1 W2NwdV07CkBAIC0xODE3LDcgKzE4MTcsNyBAQCB2b2lkIF9faW5pdCBzY2hlZHVsZXJfaW5pdCh2 b2lkKQogICAgIEJVR19PTihJU19FUlIoaWRsZV9kb21haW4pKTsKICAgICBpZGxlX2RvbWFpbi0+ dmNwdSA9IGlkbGVfdmNwdTsKICAgICBpZGxlX2RvbWFpbi0+bWF4X3ZjcHVzID0gbnJfY3B1X2lk czsKLSAgICBpZiAoIGFsbG9jX3ZjcHUoaWRsZV9kb21haW4sIDAsIDApID09IE5VTEwgKQorICAg IGlmICggdmNwdV9jcmVhdGUoaWRsZV9kb21haW4sIDAsIDApID09IE5VTEwgKQogICAgICAgICBC VUcoKTsKICAgICB0aGlzX2NwdShzY2hlZHVsZV9kYXRhKS5zY2hlZF9wcml2ID0gU0NIRURfT1Ao Jm9wcywgYWxsb2NfcGRhdGEsIDApOwogICAgIEJVR19PTihJU19FUlIodGhpc19jcHUoc2NoZWR1 bGVfZGF0YSkuc2NoZWRfcHJpdikpOwpkaWZmIC0tZ2l0IGEveGVuL2luY2x1ZGUveGVuL2RvbWFp bi5oIGIveGVuL2luY2x1ZGUveGVuL2RvbWFpbi5oCmluZGV4IDU1OTM0OTUuLjZkZjZhNTggMTAw NjQ0Ci0tLSBhL3hlbi9pbmNsdWRlL3hlbi9kb21haW4uaAorKysgYi94ZW4vaW5jbHVkZS94ZW4v ZG9tYWluLmgKQEAgLTEzLDcgKzEzLDcgQEAgdHlwZWRlZiB1bmlvbiB7CiAgICAgc3RydWN0IGNv bXBhdF92Y3B1X2d1ZXN0X2NvbnRleHQgKmNtcDsKIH0gdmNwdV9ndWVzdF9jb250ZXh0X3UgX19h dHRyaWJ1dGVfXygoX190cmFuc3BhcmVudF91bmlvbl9fKSk7CiAKLXN0cnVjdCB2Y3B1ICphbGxv Y192Y3B1KAorc3RydWN0IHZjcHUgKnZjcHVfY3JlYXRlKAogICAgIHN0cnVjdCBkb21haW4gKmQs IHVuc2lnbmVkIGludCB2Y3B1X2lkLCB1bnNpZ25lZCBpbnQgY3B1X2lkKTsKIAogdW5zaWduZWQg aW50IGRvbTBfbWF4X3ZjcHVzKHZvaWQpOwpAQCAtNDcsMTMgKzQ3LDEzIEBAIHZvaWQgZnJlZV9w aXJxX3N0cnVjdCh2b2lkICopOwogCiAvKgogICogSW5pdGlhbGlzZS9kZXN0cm95IGFyY2gtc3Bl Y2lmaWMgZGV0YWlscyBvZiBhIFZDUFUuCi0gKiAgLSB2Y3B1X2luaXRpYWxpc2UoKSBpcyBjYWxs ZWQgYWZ0ZXIgdGhlIGJhc2ljIGdlbmVyaWMgZmllbGRzIG9mIHRoZQorICogIC0gYXJjaF92Y3B1 X2NyZWF0ZSgpIGlzIGNhbGxlZCBhZnRlciB0aGUgYmFzaWMgZ2VuZXJpYyBmaWVsZHMgb2YgdGhl CiAgKiAgICBWQ1BVIHN0cnVjdHVyZSBhcmUgaW5pdGlhbGlzZWQuIE1hbnkgb3BlcmF0aW9ucyBj YW4gYmUgYXBwbGllZCB0byB0aGUKICAqICAgIFZDUFUgYXQgdGhpcyBwb2ludCAoZS5nLiwgdmNw dV9wYXVzZSgpKS4KLSAqICAtIHZjcHVfZGVzdHJveSgpIGlzIGNhbGxlZCBvbmx5IGlmIHZjcHVf aW5pdGlhbGlzZSgpIHByZXZpb3VzbHkgc3VjY2VlZGVkLgorICogIC0gYXJjaF92Y3B1X2Rlc3Ry b3koKSBpcyBjYWxsZWQgb25seSBpZiBhcmNoX3ZjcHVfY3JlYXRlKCkgcHJldmlvdXNseSBzdWNj ZWVkZWQuCiAgKi8KLWludCAgdmNwdV9pbml0aWFsaXNlKHN0cnVjdCB2Y3B1ICp2KTsKLXZvaWQg dmNwdV9kZXN0cm95KHN0cnVjdCB2Y3B1ICp2KTsKK2ludCAgYXJjaF92Y3B1X2NyZWF0ZShzdHJ1 Y3QgdmNwdSAqdik7Cit2b2lkIGFyY2hfdmNwdV9kZXN0cm95KHN0cnVjdCB2Y3B1ICp2KTsKIAog aW50IG1hcF92Y3B1X2luZm8oc3RydWN0IHZjcHUgKnYsIHVuc2lnbmVkIGxvbmcgZ2ZuLCB1bnNp Z25lZCBvZmZzZXQpOwogdm9pZCB1bm1hcF92Y3B1X2luZm8oc3RydWN0IHZjcHUgKnYpOwotLSAK Mi4xLjQKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpY ZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRw czovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs