From mboxrd@z Thu Jan 1 00:00:00 1970 From: George Dunlap Subject: [PATCH v2 1/3] xen: Some code motion to avoid having to do forward-declaration Date: Mon, 25 Jul 2016 16:28:11 +0100 Message-ID: <1469460493-18842-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.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bRjdu-0000BZ-TN for xen-devel@lists.xenproject.org; Mon, 25 Jul 2016 17:26:15 +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 Y2l0cml4LmNvbT4KUmV2aWV3ZWQtYnk6IE1lbmcgWHUgPG1lbmd4dUBjaXMudXBlbm4uZWR1PuKA iwotLS0KdjI6Ci0gUmViYXNlIG9uIHRvcCBvZiBEYXJpbydzIHNlcmllcwoKSSd2ZSByZXRhaW5l ZCBNZW5nIFh1J3MgUmV2aWV3ZWQtYnkgc2luY2UgdGhlIHNjaGVkX3J0IHBhcnQgZGlkbid0IGNo YW5nZS4KCkNDOiBEYXJpbyBGYWdnaW9saSA8ZGFyaW8uZmFnZ2lvbGlAY2l0cml4LmNvbT4KQ0M6 IEFuc2h1bCBNYWtrYXIgPGFuc2h1bC5tYWtrYXJAY2l0cml4LmNvbT4KQ0M6IE1lbmcgWHUgPG1l bmd4dUBjaXMudXBlbm4uZWR1PgotLS0KIHhlbi9jb21tb24vc2NoZWRfY3JlZGl0Mi5jIHwgMTA2 ICsrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogeGVuL2NvbW1v bi9zY2hlZF9ydC5jICAgICAgfCAgNDYgKysrKysrKysrKy0tLS0tLS0tLS0KIDIgZmlsZXMgY2hh bmdlZCwgNzYgaW5zZXJ0aW9ucygrKSwgNzYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEveGVu L2NvbW1vbi9zY2hlZF9jcmVkaXQyLmMgYi94ZW4vY29tbW9uL3NjaGVkX2NyZWRpdDIuYwppbmRl eCAxZDc5ZGUwLi4zZDI3MTZhIDEwMDY0NAotLS0gYS94ZW4vY29tbW9uL3NjaGVkX2NyZWRpdDIu YworKysgYi94ZW4vY29tbW9uL3NjaGVkX2NyZWRpdDIuYwpAQCAtMTM0OCw1OSArMTM0OCw2IEBA IHJ1bnFfZGVhc3NpZ24oY29uc3Qgc3RydWN0IHNjaGVkdWxlciAqb3BzLCBzdHJ1Y3QgdmNwdSAq dmMpCiB9CiAKIHN0YXRpYyB2b2lkCi1jc2NoZWQyX3ZjcHVfaW5zZXJ0KGNvbnN0IHN0cnVjdCBz Y2hlZHVsZXIgKm9wcywgc3RydWN0IHZjcHUgKnZjKQotewotICAgIHN0cnVjdCBjc2NoZWQyX3Zj cHUgKnN2YyA9IHZjLT5zY2hlZF9wcml2OwotICAgIHN0cnVjdCBjc2NoZWQyX2RvbSAqIGNvbnN0 IHNkb20gPSBzdmMtPnNkb207Ci0gICAgc3BpbmxvY2tfdCAqbG9jazsKLQotICAgIEFTU0VSVCgh aXNfaWRsZV92Y3B1KHZjKSk7Ci0gICAgQVNTRVJUKGxpc3RfZW1wdHkoJnN2Yy0+cnVucV9lbGVt KSk7Ci0KLSAgICAvKiBBZGQgdmNwdSB0byBydW5xdWV1ZSBvZiBpbml0aWFsIHByb2Nlc3NvciAq LwotICAgIGxvY2sgPSB2Y3B1X3NjaGVkdWxlX2xvY2tfaXJxKHZjKTsKLQotICAgIHJ1bnFfYXNz aWduKG9wcywgdmMpOwotCi0gICAgdmNwdV9zY2hlZHVsZV91bmxvY2tfaXJxKGxvY2ssIHZjKTsK LQotICAgIHNkb20tPm5yX3ZjcHVzKys7Ci0KLSAgICBTQ0hFRF9TVEFUX0NSQU5LKHZjcHVfaW5z ZXJ0KTsKLQotICAgIENTQ0hFRDJfVkNQVV9DSEVDSyh2Yyk7Ci19Ci0KLXN0YXRpYyB2b2lkCi1j c2NoZWQyX2ZyZWVfdmRhdGEoY29uc3Qgc3RydWN0IHNjaGVkdWxlciAqb3BzLCB2b2lkICpwcml2 KQotewotICAgIHN0cnVjdCBjc2NoZWQyX3ZjcHUgKnN2YyA9IHByaXY7Ci0KLSAgICB4ZnJlZShz dmMpOwotfQotCi1zdGF0aWMgdm9pZAotY3NjaGVkMl92Y3B1X3JlbW92ZShjb25zdCBzdHJ1Y3Qg c2NoZWR1bGVyICpvcHMsIHN0cnVjdCB2Y3B1ICp2YykKLXsKLSAgICBzdHJ1Y3QgY3NjaGVkMl92 Y3B1ICogY29uc3Qgc3ZjID0gQ1NDSEVEMl9WQ1BVKHZjKTsKLSAgICBzcGlubG9ja190ICpsb2Nr OwotCi0gICAgQVNTRVJUKCFpc19pZGxlX3ZjcHUodmMpKTsKLSAgICBBU1NFUlQobGlzdF9lbXB0 eSgmc3ZjLT5ydW5xX2VsZW0pKTsKLQotICAgIFNDSEVEX1NUQVRfQ1JBTksodmNwdV9yZW1vdmUp OwotCi0gICAgLyogUmVtb3ZlIGZyb20gcnVucXVldWUgKi8KLSAgICBsb2NrID0gdmNwdV9zY2hl ZHVsZV9sb2NrX2lycSh2Yyk7Ci0KLSAgICBydW5xX2RlYXNzaWduKG9wcywgdmMpOwotCi0gICAg dmNwdV9zY2hlZHVsZV91bmxvY2tfaXJxKGxvY2ssIHZjKTsKLQotICAgIHN2Yy0+c2RvbS0+bnJf dmNwdXMtLTsKLX0KLQotc3RhdGljIHZvaWQKIGNzY2hlZDJfdmNwdV9zbGVlcChjb25zdCBzdHJ1 Y3Qgc2NoZWR1bGVyICpvcHMsIHN0cnVjdCB2Y3B1ICp2YykKIHsKICAgICBzdHJ1Y3QgY3NjaGVk Ml92Y3B1ICogY29uc3Qgc3ZjID0gQ1NDSEVEMl9WQ1BVKHZjKTsKQEAgLTIwOTgsNiArMjA0NSw1 OSBAQCBjc2NoZWQyX2RvbV9kZXN0cm95KGNvbnN0IHN0cnVjdCBzY2hlZHVsZXIgKm9wcywgc3Ry dWN0IGRvbWFpbiAqZG9tKQogICAgIGNzY2hlZDJfZnJlZV9kb21kYXRhKG9wcywgQ1NDSEVEMl9E T00oZG9tKSk7CiB9CiAKK3N0YXRpYyB2b2lkCitjc2NoZWQyX3ZjcHVfaW5zZXJ0KGNvbnN0IHN0 cnVjdCBzY2hlZHVsZXIgKm9wcywgc3RydWN0IHZjcHUgKnZjKQoreworICAgIHN0cnVjdCBjc2No ZWQyX3ZjcHUgKnN2YyA9IHZjLT5zY2hlZF9wcml2OworICAgIHN0cnVjdCBjc2NoZWQyX2RvbSAq IGNvbnN0IHNkb20gPSBzdmMtPnNkb207CisgICAgc3BpbmxvY2tfdCAqbG9jazsKKworICAgIEFT U0VSVCghaXNfaWRsZV92Y3B1KHZjKSk7CisgICAgQVNTRVJUKGxpc3RfZW1wdHkoJnN2Yy0+cnVu cV9lbGVtKSk7CisKKyAgICAvKiBBZGQgdmNwdSB0byBydW5xdWV1ZSBvZiBpbml0aWFsIHByb2Nl c3NvciAqLworICAgIGxvY2sgPSB2Y3B1X3NjaGVkdWxlX2xvY2tfaXJxKHZjKTsKKworICAgIHJ1 bnFfYXNzaWduKG9wcywgdmMpOworCisgICAgdmNwdV9zY2hlZHVsZV91bmxvY2tfaXJxKGxvY2ss IHZjKTsKKworICAgIHNkb20tPm5yX3ZjcHVzKys7CisKKyAgICBTQ0hFRF9TVEFUX0NSQU5LKHZj cHVfaW5zZXJ0KTsKKworICAgIENTQ0hFRDJfVkNQVV9DSEVDSyh2Yyk7Cit9CisKK3N0YXRpYyB2 b2lkCitjc2NoZWQyX2ZyZWVfdmRhdGEoY29uc3Qgc3RydWN0IHNjaGVkdWxlciAqb3BzLCB2b2lk ICpwcml2KQoreworICAgIHN0cnVjdCBjc2NoZWQyX3ZjcHUgKnN2YyA9IHByaXY7CisKKyAgICB4 ZnJlZShzdmMpOworfQorCitzdGF0aWMgdm9pZAorY3NjaGVkMl92Y3B1X3JlbW92ZShjb25zdCBz dHJ1Y3Qgc2NoZWR1bGVyICpvcHMsIHN0cnVjdCB2Y3B1ICp2YykKK3sKKyAgICBzdHJ1Y3QgY3Nj aGVkMl92Y3B1ICogY29uc3Qgc3ZjID0gQ1NDSEVEMl9WQ1BVKHZjKTsKKyAgICBzcGlubG9ja190 ICpsb2NrOworCisgICAgQVNTRVJUKCFpc19pZGxlX3ZjcHUodmMpKTsKKyAgICBBU1NFUlQobGlz dF9lbXB0eSgmc3ZjLT5ydW5xX2VsZW0pKTsKKworICAgIFNDSEVEX1NUQVRfQ1JBTksodmNwdV9y ZW1vdmUpOworCisgICAgLyogUmVtb3ZlIGZyb20gcnVucXVldWUgKi8KKyAgICBsb2NrID0gdmNw dV9zY2hlZHVsZV9sb2NrX2lycSh2Yyk7CisKKyAgICBydW5xX2RlYXNzaWduKG9wcywgdmMpOwor CisgICAgdmNwdV9zY2hlZHVsZV91bmxvY2tfaXJxKGxvY2ssIHZjKTsKKworICAgIHN2Yy0+c2Rv bS0+bnJfdmNwdXMtLTsKK30KKwogLyogSG93IGxvbmcgc2hvdWxkIHdlIGxldCB0aGlzIHZjcHUg cnVuIGZvcj8gKi8KIHN0YXRpYyBzX3RpbWVfdAogY3NjaGVkMl9ydW50aW1lKGNvbnN0IHN0cnVj dCBzY2hlZHVsZXIgKm9wcywgaW50IGNwdSwgc3RydWN0IGNzY2hlZDJfdmNwdSAqc25leHQpCmRp ZmYgLS1naXQgYS94ZW4vY29tbW9uL3NjaGVkX3J0LmMgYi94ZW4vY29tbW9uL3NjaGVkX3J0LmMK aW5kZXggOTg1MjRhNi4uYmQzYTJhMCAxMDA2NDQKLS0tIGEveGVuL2NvbW1vbi9zY2hlZF9ydC5j CisrKyBiL3hlbi9jb21tb24vc2NoZWRfcnQuYwpAQCAtNTgyLDYgKzU4MiwyOSBAQCByZXBscV9y ZWluc2VydChjb25zdCBzdHJ1Y3Qgc2NoZWR1bGVyICpvcHMsIHN0cnVjdCBydF92Y3B1ICpzdmMp CiB9CiAKIC8qCisgKiBQaWNrIGEgdmFsaWQgQ1BVIGZvciB0aGUgdmNwdSB2YworICogVmFsaWQg Q1BVIG9mIGEgdmNwdSBpcyBpbnRlc2VjdGlvbiBvZiB2Y3B1J3MgYWZmaW5pdHkKKyAqIGFuZCBh dmFpbGFibGUgY3B1cworICovCitzdGF0aWMgaW50CitydF9jcHVfcGljayhjb25zdCBzdHJ1Y3Qg c2NoZWR1bGVyICpvcHMsIHN0cnVjdCB2Y3B1ICp2YykKK3sKKyAgICBjcHVtYXNrX3QgY3B1czsK KyAgICBjcHVtYXNrX3QgKm9ubGluZTsKKyAgICBpbnQgY3B1OworCisgICAgb25saW5lID0gY3B1 cG9vbF9kb21haW5fY3B1bWFzayh2Yy0+ZG9tYWluKTsKKyAgICBjcHVtYXNrX2FuZCgmY3B1cywg b25saW5lLCB2Yy0+Y3B1X2hhcmRfYWZmaW5pdHkpOworCisgICAgY3B1ID0gY3B1bWFza190ZXN0 X2NwdSh2Yy0+cHJvY2Vzc29yLCAmY3B1cykKKyAgICAgICAgICAgID8gdmMtPnByb2Nlc3Nvcgor ICAgICAgICAgICAgOiBjcHVtYXNrX2N5Y2xlKHZjLT5wcm9jZXNzb3IsICZjcHVzKTsKKyAgICBB U1NFUlQoICFjcHVtYXNrX2VtcHR5KCZjcHVzKSAmJiBjcHVtYXNrX3Rlc3RfY3B1KGNwdSwgJmNw dXMpICk7CisKKyAgICByZXR1cm4gY3B1OworfQorCisvKgogICogSW5pdC9GcmVlIHJlbGF0ZWQg Y29kZQogICovCiBzdGF0aWMgaW50CkBAIC04OTQsMjkgKzkxNyw2IEBAIHJ0X3ZjcHVfcmVtb3Zl KGNvbnN0IHN0cnVjdCBzY2hlZHVsZXIgKm9wcywgc3RydWN0IHZjcHUgKnZjKQogfQogCiAvKgot ICogUGljayBhIHZhbGlkIENQVSBmb3IgdGhlIHZjcHUgdmMKLSAqIFZhbGlkIENQVSBvZiBhIHZj cHUgaXMgaW50ZXNlY3Rpb24gb2YgdmNwdSdzIGFmZmluaXR5Ci0gKiBhbmQgYXZhaWxhYmxlIGNw dXMKLSAqLwotc3RhdGljIGludAotcnRfY3B1X3BpY2soY29uc3Qgc3RydWN0IHNjaGVkdWxlciAq b3BzLCBzdHJ1Y3QgdmNwdSAqdmMpCi17Ci0gICAgY3B1bWFza190IGNwdXM7Ci0gICAgY3B1bWFz a190ICpvbmxpbmU7Ci0gICAgaW50IGNwdTsKLQotICAgIG9ubGluZSA9IGNwdXBvb2xfZG9tYWlu X2NwdW1hc2sodmMtPmRvbWFpbik7Ci0gICAgY3B1bWFza19hbmQoJmNwdXMsIG9ubGluZSwgdmMt PmNwdV9oYXJkX2FmZmluaXR5KTsKLQotICAgIGNwdSA9IGNwdW1hc2tfdGVzdF9jcHUodmMtPnBy b2Nlc3NvciwgJmNwdXMpCi0gICAgICAgICAgICA/IHZjLT5wcm9jZXNzb3IKLSAgICAgICAgICAg IDogY3B1bWFza19jeWNsZSh2Yy0+cHJvY2Vzc29yLCAmY3B1cyk7Ci0gICAgQVNTRVJUKCAhY3B1 bWFza19lbXB0eSgmY3B1cykgJiYgY3B1bWFza190ZXN0X2NwdShjcHUsICZjcHVzKSApOwotCi0g ICAgcmV0dXJuIGNwdTsKLX0KLQotLyoKICAqIEJ1cm4gYnVkZ2V0IGluIG5hbm9zZWNvbmQgZ3Jh bnVsYXJpdHkKICAqLwogc3RhdGljIHZvaWQKLS0gCjIuMS40CgoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4t ZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwczovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg==