From mboxrd@z Thu Jan 1 00:00:00 1970 From: George Dunlap Subject: [PATCH 1/3] xen: Some code motion to avoid having to do forward-declaration Date: Fri, 15 Jul 2016 19:02:00 +0100 Message-ID: <1468605722-24239-1-git-send-email-george.dunlap@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bO7RB-0006LL-9N for xen-devel@lists.xenproject.org; Fri, 15 Jul 2016 18:02:09 +0000 List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: Dario Faggioli , George Dunlap , Anshul Makkar , Meng Xu List-Id: xen-devel@lists.xenproject.org Rm9yIHNjaGVkX2NyZWRpdDIsIG1vdmUgdGhlIHZjcHUgaW5zZXJ0IC8gcmVtb3ZlIC8gZnJlZSBm dW5jdGlvbnMgbmVhciB0aGUgZG9tYWluCmluc2VydCAvIHJlbW92ZSAvIGFsbG9jIC8gZnJlZSBm dW5jdGlvbnMgKGFuZCBhZnRlciBjcHVfcGljaykuCgpGb3Igc2NoZWRfcnQsIG1vdmUgcnRfY3B1 X3BpY2soKSBmdXJ0aGVyIHVwLgoKVGhpcyBpcyBwdXJlIGNvZGUgbW90aW9uOyBubyBmdW5jdGlv bmFsIGNoYW5nZS4KClNpZ25lZC1vZmYtYnk6IEdlb3JnZSBEdW5sYXAgPGdlb3JnZS5kdW5sYXBA Y2l0cml4LmNvbT4KLS0tCkNDOiBEYXJpbyBGYWdnaW9saSA8ZGFyaW8uZmFnZ2lvbGlAY2l0cml4 LmNvbT4KQ0M6IEFuc2h1bCBNYWtrYXIgPGFuc2h1bC5tYWtrYXJAY2l0cml4LmNvbT4KQ0M6IE1l bmcgWHUgPG1lbmd4dUBjaXMudXBlbm4uZWR1PgotLS0KIHhlbi9jb21tb24vc2NoZWRfY3JlZGl0 Mi5jIHwgMTE4ICsrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQog eGVuL2NvbW1vbi9zY2hlZF9ydC5jICAgICAgfCAgNDYgKysrKysrKysrLS0tLS0tLS0tCiAyIGZp bGVzIGNoYW5nZWQsIDgyIGluc2VydGlvbnMoKyksIDgyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL3hlbi9jb21tb24vc2NoZWRfY3JlZGl0Mi5jIGIveGVuL2NvbW1vbi9zY2hlZF9jcmVkaXQy LmMKaW5kZXggOGI5NWE0Ny4uM2I5YWEyNyAxMDA2NDQKLS0tIGEveGVuL2NvbW1vbi9zY2hlZF9j cmVkaXQyLmMKKysrIGIveGVuL2NvbW1vbi9zY2hlZF9jcmVkaXQyLmMKQEAgLTk3MSw2NSArOTcx LDYgQEAgcnVucV9kZWFzc2lnbihjb25zdCBzdHJ1Y3Qgc2NoZWR1bGVyICpvcHMsIHN0cnVjdCB2 Y3B1ICp2YykKIH0KIAogc3RhdGljIHZvaWQKLWNzY2hlZDJfdmNwdV9pbnNlcnQoY29uc3Qgc3Ry dWN0IHNjaGVkdWxlciAqb3BzLCBzdHJ1Y3QgdmNwdSAqdmMpCi17Ci0gICAgc3RydWN0IGNzY2hl ZDJfdmNwdSAqc3ZjID0gdmMtPnNjaGVkX3ByaXY7Ci0gICAgc3RydWN0IGNzY2hlZDJfZG9tICog Y29uc3Qgc2RvbSA9IHN2Yy0+c2RvbTsKLSAgICBzcGlubG9ja190ICpsb2NrOwotCi0gICAgcHJp bnRrKCIlczogSW5zZXJ0aW5nICVwdlxuIiwgX19mdW5jX18sIHZjKTsKLQotICAgIEJVR19PTihp c19pZGxlX3ZjcHUodmMpKTsKLQotICAgIC8qIEFkZCB2Y3B1IHRvIHJ1bnF1ZXVlIG9mIGluaXRp YWwgcHJvY2Vzc29yICovCi0gICAgbG9jayA9IHZjcHVfc2NoZWR1bGVfbG9ja19pcnEodmMpOwot Ci0gICAgcnVucV9hc3NpZ24ob3BzLCB2Yyk7Ci0KLSAgICB2Y3B1X3NjaGVkdWxlX3VubG9ja19p cnEobG9jaywgdmMpOwotCi0gICAgc2RvbS0+bnJfdmNwdXMrKzsKLQotICAgIFNDSEVEX1NUQVRf Q1JBTksodmNwdV9pbnNlcnQpOwotCi0gICAgQ1NDSEVEMl9WQ1BVX0NIRUNLKHZjKTsKLX0KLQot c3RhdGljIHZvaWQKLWNzY2hlZDJfZnJlZV92ZGF0YShjb25zdCBzdHJ1Y3Qgc2NoZWR1bGVyICpv cHMsIHZvaWQgKnByaXYpCi17Ci0gICAgc3RydWN0IGNzY2hlZDJfdmNwdSAqc3ZjID0gcHJpdjsK LQotICAgIHhmcmVlKHN2Yyk7Ci19Ci0KLXN0YXRpYyB2b2lkCi1jc2NoZWQyX3ZjcHVfcmVtb3Zl KGNvbnN0IHN0cnVjdCBzY2hlZHVsZXIgKm9wcywgc3RydWN0IHZjcHUgKnZjKQotewotICAgIHN0 cnVjdCBjc2NoZWQyX3ZjcHUgKiBjb25zdCBzdmMgPSBDU0NIRUQyX1ZDUFUodmMpOwotICAgIHN0 cnVjdCBjc2NoZWQyX2RvbSAqIGNvbnN0IHNkb20gPSBzdmMtPnNkb207Ci0KLSAgICBCVUdfT04o IHNkb20gPT0gTlVMTCApOwotICAgIEJVR19PTiggIWxpc3RfZW1wdHkoJnN2Yy0+cnVucV9lbGVt KSApOwotCi0gICAgaWYgKCAhIGlzX2lkbGVfdmNwdSh2YykgKQotICAgIHsKLSAgICAgICAgc3Bp bmxvY2tfdCAqbG9jazsKLQotICAgICAgICBTQ0hFRF9TVEFUX0NSQU5LKHZjcHVfcmVtb3ZlKTsK LQotICAgICAgICAvKiBSZW1vdmUgZnJvbSBydW5xdWV1ZSAqLwotICAgICAgICBsb2NrID0gdmNw dV9zY2hlZHVsZV9sb2NrX2lycSh2Yyk7Ci0KLSAgICAgICAgcnVucV9kZWFzc2lnbihvcHMsIHZj KTsKLQotICAgICAgICB2Y3B1X3NjaGVkdWxlX3VubG9ja19pcnEobG9jaywgdmMpOwotCi0gICAg ICAgIHN2Yy0+c2RvbS0+bnJfdmNwdXMtLTsKLSAgICB9Ci19Ci0KLXN0YXRpYyB2b2lkCiBjc2No ZWQyX3ZjcHVfc2xlZXAoY29uc3Qgc3RydWN0IHNjaGVkdWxlciAqb3BzLCBzdHJ1Y3QgdmNwdSAq dmMpCiB7CiAgICAgc3RydWN0IGNzY2hlZDJfdmNwdSAqIGNvbnN0IHN2YyA9IENTQ0hFRDJfVkNQ VSh2Yyk7CkBAIC0xNjY4LDYgKzE2MDksNjUgQEAgY3NjaGVkMl9kb21fZGVzdHJveShjb25zdCBz dHJ1Y3Qgc2NoZWR1bGVyICpvcHMsIHN0cnVjdCBkb21haW4gKmRvbSkKICAgICBjc2NoZWQyX2Zy ZWVfZG9tZGF0YShvcHMsIENTQ0hFRDJfRE9NKGRvbSkpOwogfQogCitzdGF0aWMgdm9pZAorY3Nj aGVkMl92Y3B1X2luc2VydChjb25zdCBzdHJ1Y3Qgc2NoZWR1bGVyICpvcHMsIHN0cnVjdCB2Y3B1 ICp2YykKK3sKKyAgICBzdHJ1Y3QgY3NjaGVkMl92Y3B1ICpzdmMgPSB2Yy0+c2NoZWRfcHJpdjsK KyAgICBzdHJ1Y3QgY3NjaGVkMl9kb20gKiBjb25zdCBzZG9tID0gc3ZjLT5zZG9tOworICAgIHNw aW5sb2NrX3QgKmxvY2s7CisKKyAgICBwcmludGsoIiVzOiBJbnNlcnRpbmcgJXB2XG4iLCBfX2Z1 bmNfXywgdmMpOworCisgICAgQlVHX09OKGlzX2lkbGVfdmNwdSh2YykpOworCisgICAgLyogQWRk IHZjcHUgdG8gcnVucXVldWUgb2YgaW5pdGlhbCBwcm9jZXNzb3IgKi8KKyAgICBsb2NrID0gdmNw dV9zY2hlZHVsZV9sb2NrX2lycSh2Yyk7CisKKyAgICBydW5xX2Fzc2lnbihvcHMsIHZjKTsKKwor ICAgIHZjcHVfc2NoZWR1bGVfdW5sb2NrX2lycShsb2NrLCB2Yyk7CisKKyAgICBzZG9tLT5ucl92 Y3B1cysrOworCisgICAgU0NIRURfU1RBVF9DUkFOSyh2Y3B1X2luc2VydCk7CisKKyAgICBDU0NI RUQyX1ZDUFVfQ0hFQ0sodmMpOworfQorCitzdGF0aWMgdm9pZAorY3NjaGVkMl9mcmVlX3ZkYXRh KGNvbnN0IHN0cnVjdCBzY2hlZHVsZXIgKm9wcywgdm9pZCAqcHJpdikKK3sKKyAgICBzdHJ1Y3Qg Y3NjaGVkMl92Y3B1ICpzdmMgPSBwcml2OworCisgICAgeGZyZWUoc3ZjKTsKK30KKworc3RhdGlj IHZvaWQKK2NzY2hlZDJfdmNwdV9yZW1vdmUoY29uc3Qgc3RydWN0IHNjaGVkdWxlciAqb3BzLCBz dHJ1Y3QgdmNwdSAqdmMpCit7CisgICAgc3RydWN0IGNzY2hlZDJfdmNwdSAqIGNvbnN0IHN2YyA9 IENTQ0hFRDJfVkNQVSh2Yyk7CisgICAgc3RydWN0IGNzY2hlZDJfZG9tICogY29uc3Qgc2RvbSA9 IHN2Yy0+c2RvbTsKKworICAgIEJVR19PTiggc2RvbSA9PSBOVUxMICk7CisgICAgQlVHX09OKCAh bGlzdF9lbXB0eSgmc3ZjLT5ydW5xX2VsZW0pICk7CisKKyAgICBpZiAoICEgaXNfaWRsZV92Y3B1 KHZjKSApCisgICAgeworICAgICAgICBzcGlubG9ja190ICpsb2NrOworCisgICAgICAgIFNDSEVE X1NUQVRfQ1JBTksodmNwdV9yZW1vdmUpOworCisgICAgICAgIC8qIFJlbW92ZSBmcm9tIHJ1bnF1 ZXVlICovCisgICAgICAgIGxvY2sgPSB2Y3B1X3NjaGVkdWxlX2xvY2tfaXJxKHZjKTsKKworICAg ICAgICBydW5xX2RlYXNzaWduKG9wcywgdmMpOworCisgICAgICAgIHZjcHVfc2NoZWR1bGVfdW5s b2NrX2lycShsb2NrLCB2Yyk7CisKKyAgICAgICAgc3ZjLT5zZG9tLT5ucl92Y3B1cy0tOworICAg IH0KK30KKwogLyogSG93IGxvbmcgc2hvdWxkIHdlIGxldCB0aGlzIHZjcHUgcnVuIGZvcj8gKi8K IHN0YXRpYyBzX3RpbWVfdAogY3NjaGVkMl9ydW50aW1lKGNvbnN0IHN0cnVjdCBzY2hlZHVsZXIg Km9wcywgaW50IGNwdSwgc3RydWN0IGNzY2hlZDJfdmNwdSAqc25leHQpCmRpZmYgLS1naXQgYS94 ZW4vY29tbW9uL3NjaGVkX3J0LmMgYi94ZW4vY29tbW9uL3NjaGVkX3J0LmMKaW5kZXggOTg1MjRh Ni4uYmQzYTJhMCAxMDA2NDQKLS0tIGEveGVuL2NvbW1vbi9zY2hlZF9ydC5jCisrKyBiL3hlbi9j b21tb24vc2NoZWRfcnQuYwpAQCAtNTgyLDYgKzU4MiwyOSBAQCByZXBscV9yZWluc2VydChjb25z dCBzdHJ1Y3Qgc2NoZWR1bGVyICpvcHMsIHN0cnVjdCBydF92Y3B1ICpzdmMpCiB9CiAKIC8qCisg KiBQaWNrIGEgdmFsaWQgQ1BVIGZvciB0aGUgdmNwdSB2YworICogVmFsaWQgQ1BVIG9mIGEgdmNw dSBpcyBpbnRlc2VjdGlvbiBvZiB2Y3B1J3MgYWZmaW5pdHkKKyAqIGFuZCBhdmFpbGFibGUgY3B1 cworICovCitzdGF0aWMgaW50CitydF9jcHVfcGljayhjb25zdCBzdHJ1Y3Qgc2NoZWR1bGVyICpv cHMsIHN0cnVjdCB2Y3B1ICp2YykKK3sKKyAgICBjcHVtYXNrX3QgY3B1czsKKyAgICBjcHVtYXNr X3QgKm9ubGluZTsKKyAgICBpbnQgY3B1OworCisgICAgb25saW5lID0gY3B1cG9vbF9kb21haW5f Y3B1bWFzayh2Yy0+ZG9tYWluKTsKKyAgICBjcHVtYXNrX2FuZCgmY3B1cywgb25saW5lLCB2Yy0+ Y3B1X2hhcmRfYWZmaW5pdHkpOworCisgICAgY3B1ID0gY3B1bWFza190ZXN0X2NwdSh2Yy0+cHJv Y2Vzc29yLCAmY3B1cykKKyAgICAgICAgICAgID8gdmMtPnByb2Nlc3NvcgorICAgICAgICAgICAg OiBjcHVtYXNrX2N5Y2xlKHZjLT5wcm9jZXNzb3IsICZjcHVzKTsKKyAgICBBU1NFUlQoICFjcHVt YXNrX2VtcHR5KCZjcHVzKSAmJiBjcHVtYXNrX3Rlc3RfY3B1KGNwdSwgJmNwdXMpICk7CisKKyAg ICByZXR1cm4gY3B1OworfQorCisvKgogICogSW5pdC9GcmVlIHJlbGF0ZWQgY29kZQogICovCiBz dGF0aWMgaW50CkBAIC04OTQsMjkgKzkxNyw2IEBAIHJ0X3ZjcHVfcmVtb3ZlKGNvbnN0IHN0cnVj dCBzY2hlZHVsZXIgKm9wcywgc3RydWN0IHZjcHUgKnZjKQogfQogCiAvKgotICogUGljayBhIHZh bGlkIENQVSBmb3IgdGhlIHZjcHUgdmMKLSAqIFZhbGlkIENQVSBvZiBhIHZjcHUgaXMgaW50ZXNl Y3Rpb24gb2YgdmNwdSdzIGFmZmluaXR5Ci0gKiBhbmQgYXZhaWxhYmxlIGNwdXMKLSAqLwotc3Rh dGljIGludAotcnRfY3B1X3BpY2soY29uc3Qgc3RydWN0IHNjaGVkdWxlciAqb3BzLCBzdHJ1Y3Qg dmNwdSAqdmMpCi17Ci0gICAgY3B1bWFza190IGNwdXM7Ci0gICAgY3B1bWFza190ICpvbmxpbmU7 Ci0gICAgaW50IGNwdTsKLQotICAgIG9ubGluZSA9IGNwdXBvb2xfZG9tYWluX2NwdW1hc2sodmMt PmRvbWFpbik7Ci0gICAgY3B1bWFza19hbmQoJmNwdXMsIG9ubGluZSwgdmMtPmNwdV9oYXJkX2Fm ZmluaXR5KTsKLQotICAgIGNwdSA9IGNwdW1hc2tfdGVzdF9jcHUodmMtPnByb2Nlc3NvciwgJmNw dXMpCi0gICAgICAgICAgICA/IHZjLT5wcm9jZXNzb3IKLSAgICAgICAgICAgIDogY3B1bWFza19j eWNsZSh2Yy0+cHJvY2Vzc29yLCAmY3B1cyk7Ci0gICAgQVNTRVJUKCAhY3B1bWFza19lbXB0eSgm Y3B1cykgJiYgY3B1bWFza190ZXN0X2NwdShjcHUsICZjcHVzKSApOwotCi0gICAgcmV0dXJuIGNw dTsKLX0KLQotLyoKICAqIEJ1cm4gYnVkZ2V0IGluIG5hbm9zZWNvbmQgZ3JhbnVsYXJpdHkKICAq Lwogc3RhdGljIHZvaWQKLS0gCjIuMS40CgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMu eGVuLm9yZwpodHRwczovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg==