From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH v2 1/4] libxl: colo: rearrange things in header files Date: Wed, 6 Apr 2016 12:01:13 +0100 Message-ID: <1459940476-23186-2-git-send-email-wei.liu2@citrix.com> References: <1459940476-23186-1-git-send-email-wei.liu2@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1anlBx-0007XB-6K for xen-devel@lists.xenproject.org; Wed, 06 Apr 2016 11:00:09 +0000 In-Reply-To: <1459940476-23186-1-git-send-email-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: Wei Liu , Changlong Xie , Ian Jackson , Wen Congyang , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= List-Id: xen-devel@lists.xenproject.org V2UgbmVlZCB0byBzZXBhcmF0ZSBDT0xPIGNvZGUgZnJvbSBjb21tb24gY29kZSBhcyBjbGVhbiBh cyBwb3NzaWJsZS4KV2l0aCB0aGlzIHBhdGNoLCBhbGwgQ09MTyBzdHJ1Y3R1cmVzIGFyZSBub3cg aW4gbGlieGxfY29sby5oLgoKSXQgZG9lcyB0aGUgZm9sbG93aW5nOgoxLiBNb3ZlIHR3byB0eXBl ZGVmcyBmb3IgbGlieGxfX2RvbWFpbl9jcmVhdGVfc3RhdGV7LGNifSBiYWNrIHRvCiAgIGxpYnhs X2ludGVybmFsLmguCjIuIE1vdmUgbGlieGxfX2NvbG9fc2F2ZV9zdGF0ZSB0byBsaWJ4bF9jb2xv LmguCjMuIEluY2x1ZGUgbGlieGxfaW50ZXJuYWwuaCBpbiBsaWJ4bF9jb2xvLmguCjQuIE1vdmUg YSBidW5jaCBvZiBjb2xvIHR5cGVkZWZzIHRvIHRoZSB0b3Agb2YgbGlieGxfaW50ZXJuYWwuaC4K NS4gTW92ZSB0aGUgaW5jbHVzaW9uIG9mIGxpYnhsX2NvbG8uaCB0byB0aGUgcmlnaHQgcGxhY2Ug aW4KICAgbGlieGxfaW50ZXJuYWwuaC4KClNpZ25lZC1vZmYtYnk6IFdlaSBMaXUgPHdlaS5saXUy QGNpdHJpeC5jb20+Ci0tLQogdG9vbHMvbGlieGwvbGlieGxfY29sby5oICAgICB8IDQwICsrKysr KysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0KIHRvb2xzL2xpYnhsL2xpYnhsX2lu dGVybmFsLmggfCAzNiArKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDIgZmls ZXMgY2hhbmdlZCwgMzcgaW5zZXJ0aW9ucygrKSwgMzkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvdG9vbHMvbGlieGwvbGlieGxfY29sby5oIGIvdG9vbHMvbGlieGwvbGlieGxfY29sby5oCmlu ZGV4IDMwZmQxZGMuLjRmNmE2MTIgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2xpYnhsL2xpYnhsX2NvbG8u aAorKysgYi90b29scy9saWJ4bC9saWJ4bF9jb2xvLmgKQEAgLTE2LDEzICsxNiw5IEBACiAjaWZu ZGVmIExJQlhMX0NPTE9fSAogI2RlZmluZSBMSUJYTF9DT0xPX0gKIAorI2luY2x1ZGUgImxpYnhs X2ludGVybmFsLmgiCiAjaW5jbHVkZSA8bGludXgvbmV0bGluay5oPgogCi1zdHJ1Y3QgbGlieGxf X2FvOwotc3RydWN0IGxpYnhsX19lZ2M7Ci1zdHJ1Y3QgbGlieGxfX2NvbG9fc2F2ZV9zdGF0ZTsK LXN0cnVjdCBsaWJ4bF9fY2hlY2twb2ludF9kZXZpY2VzX3N0YXRlOwotCiAvKiBDb25zaXN0ZW50 IHdpdGggdGhlIG5ldyBDT0xPIG5ldGxpbmsgY2hhbm5lbCBpbiBrZXJuZWwgc2lkZSAqLwogI2Rl ZmluZSBORVRMSU5LX0NPTE8gMjgKIApAQCAtNjUsMTYgKzYxLDE1IEBAIGVudW0gY29sb19uZXRs aW5rX29wIHsKICAgICBDT0xPX1BST1hZX1JFU0VULCAvKiBVTlVTRUQsIHdpbGwgYmUgdXNlZCBm b3IgY29udGludW91cyBGVCAqLwogfTsKIAotdHlwZWRlZiBzdHJ1Y3QgbGlieGxfX2NvbG9fZGV2 aWNlX25pYyB7CitzdHJ1Y3QgbGlieGxfX2NvbG9fZGV2aWNlX25pYyB7CiAgICAgaW50IGRldmlk OwogICAgIGNvbnN0IGNoYXIgKnZpZjsKLX0gbGlieGxfX2NvbG9fZGV2aWNlX25pYzsKK307CiAK LXR5cGVkZWYgc3RydWN0IGxpYnhsX19jb2xvX3FkaXNrIHsKK3N0cnVjdCBsaWJ4bF9fY29sb19x ZGlzayB7CiAgICAgYm9vbCBzZXR1cGVkOwotfSBsaWJ4bF9fY29sb19xZGlzazsKK307CiAKLXR5 cGVkZWYgc3RydWN0IGxpYnhsX19jb2xvX3Byb3h5X3N0YXRlIGxpYnhsX19jb2xvX3Byb3h5X3N0 YXRlOwogc3RydWN0IGxpYnhsX19jb2xvX3Byb3h5X3N0YXRlIHsKICAgICAvKiBzZXQgYnkgY2Fs bGVyIG9mIGNvbG9fcHJveHlfc2V0dXAgKi8KICAgICBzdHJ1Y3QgbGlieGxfX2FvICphbzsKQEAg LTgzLDEyICs3OCwyNyBAQCBzdHJ1Y3QgbGlieGxfX2NvbG9fcHJveHlfc3RhdGUgewogICAgIGlu dCBpbmRleDsKIH07CiAKLXR5cGVkZWYgc3RydWN0IGxpYnhsX19kb21haW5fY3JlYXRlX3N0YXRl IGxpYnhsX19kb21haW5fY3JlYXRlX3N0YXRlOwotdHlwZWRlZiB2b2lkIGxpYnhsX19kb21haW5f Y3JlYXRlX2NiKHN0cnVjdCBsaWJ4bF9fZWdjICplZ2MsCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgbGlieGxfX2RvbWFpbl9jcmVhdGVfc3RhdGUgKmRjcywKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnQgcmMsIHVpbnQzMl90IGRvbWlkKTsKK3N0 cnVjdCBsaWJ4bF9fY29sb19zYXZlX3N0YXRlIHsKKyAgICBpbnQgc2VuZF9mZDsKKyAgICBpbnQg cmVjdl9mZDsKKyAgICBjaGFyICpjb2xvX3Byb3h5X3NjcmlwdDsKKworICAgIC8qIHByaXZhdGUg Ki8KKyAgICBsaWJ4bF9fc3RyZWFtX3JlYWRfc3RhdGUgc3JzOworICAgIHZvaWQgKCpjYWxsYmFj aykobGlieGxfX2VnYyAqLCBsaWJ4bF9fY29sb19zYXZlX3N0YXRlICosIGludCk7CisgICAgYm9v bCBzdm1fcnVubmluZzsKKyAgICBib29sIHBhdXNlZDsKKworICAgIC8qIHByaXZhdGUsIHVzZWQg YnkgcWRpc2sgYmxvY2sgcmVwbGljYXRpb24gKi8KKyAgICBib29sIHFkaXNrX3VzZWQ7CisgICAg Ym9vbCBxZGlza19zZXR1cGVkOworCisgICAgLyogcHJpdmF0ZSwgdXNlZCBieSBjb2xvLXByb3h5 ICovCisgICAgbGlieGxfX2NvbG9fcHJveHlfc3RhdGUgY3BzOworICAgIGxpYnhsX19ldl9jaGls ZCBjaGlsZDsKK307CisKIAotdHlwZWRlZiBzdHJ1Y3QgbGlieGxfX2NvbG9fcmVzdG9yZV9zdGF0 ZSBsaWJ4bF9fY29sb19yZXN0b3JlX3N0YXRlOwogdHlwZWRlZiB2b2lkIGxpYnhsX19jb2xvX2Nh bGxiYWNrKHN0cnVjdCBsaWJ4bF9fZWdjICplZ2MsCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgbGlieGxfX2NvbG9fcmVzdG9yZV9zdGF0ZSAqY3JzLCBpbnQgcmMpOwogCmRpZmYg LS1naXQgYS90b29scy9saWJ4bC9saWJ4bF9pbnRlcm5hbC5oIGIvdG9vbHMvbGlieGwvbGlieGxf aW50ZXJuYWwuaAppbmRleCA3ZGYyNzExLi4wMTA3Mjk4IDEwMDY0NAotLS0gYS90b29scy9saWJ4 bC9saWJ4bF9pbnRlcm5hbC5oCisrKyBiL3Rvb2xzL2xpYnhsL2xpYnhsX2ludGVybmFsLmgKQEAg LTg3LDggKzg3LDYgQEAKICNpbmNsdWRlICJfbGlieGxfdHlwZXNfaW50ZXJuYWwuaCIKICNpbmNs dWRlICJfbGlieGxfdHlwZXNfaW50ZXJuYWxfanNvbi5oIgogCi0jaW5jbHVkZSAibGlieGxfY29s by5oIgotCiAjZGVmaW5lIExJQlhMX0lOSVRfVElNRU9VVCAxMAogI2RlZmluZSBMSUJYTF9ERVNU Uk9ZX1RJTUVPVVQgMTAKICNkZWZpbmUgTElCWExfSE9UUExVR19USU1FT1VUIDQwCkBAIC0xODQs NiArMTgyLDE3IEBAIHR5cGVkZWYgc3RydWN0IGxpYnhsX19hb3Bfb2NjdXJyZWQgbGlieGxfX2Fv cF9vY2N1cnJlZDsKIHR5cGVkZWYgc3RydWN0IGxpYnhsX19vc2V2ZW50X2hvb2tfbmV4dXMgbGli eGxfX29zZXZlbnRfaG9va19uZXh1czsKIHR5cGVkZWYgc3RydWN0IGxpYnhsX19vc2V2ZW50X2hv b2tfbmV4aSBsaWJ4bF9fb3NldmVudF9ob29rX25leGk7CiAKK3R5cGVkZWYgc3RydWN0IGxpYnhs X19kb21haW5fY3JlYXRlX3N0YXRlIGxpYnhsX19kb21haW5fY3JlYXRlX3N0YXRlOwordHlwZWRl ZiB2b2lkIGxpYnhsX19kb21haW5fY3JlYXRlX2NiKHN0cnVjdCBsaWJ4bF9fZWdjICplZ2MsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbGlieGxfX2RvbWFpbl9jcmVhdGVf c3RhdGUgKmRjcywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnQgcmMs IHVpbnQzMl90IGRvbWlkKTsKKwordHlwZWRlZiBzdHJ1Y3QgbGlieGxfX2NvbG9fZGV2aWNlX25p YyBsaWJ4bF9fY29sb19kZXZpY2VfbmljOwordHlwZWRlZiBzdHJ1Y3QgbGlieGxfX2NvbG9fcWRp c2sgbGlieGxfX2NvbG9fcWRpc2s7Cit0eXBlZGVmIHN0cnVjdCBsaWJ4bF9fY29sb19wcm94eV9z dGF0ZSBsaWJ4bF9fY29sb19wcm94eV9zdGF0ZTsKK3R5cGVkZWYgc3RydWN0IGxpYnhsX19jb2xv X3NhdmVfc3RhdGUgbGlieGxfX2NvbG9fc2F2ZV9zdGF0ZTsKK3R5cGVkZWYgc3RydWN0IGxpYnhs X19jb2xvX3Jlc3RvcmVfc3RhdGUgbGlieGxfX2NvbG9fcmVzdG9yZV9zdGF0ZTsKKwogX2hpZGRl biB2b2lkIGxpYnhsX19hbGxvY19mYWlsZWQobGlieGxfY3R4ICosIGNvbnN0IGNoYXIgKmZ1bmMs CiAgICAgICAgICAgICAgICAgICAgICAgICAgc2l6ZV90IG5tZW1iLCBzaXplX3Qgc2l6ZSkgX19h dHRyaWJ1dGVfXygobm9yZXR1cm4pKTsKICAgLyogZnVuYywgc2l6ZSBhbmQgbm1lbWIgYXJlIHVz ZWQgb25seSBpbiB0aGUgbG9nIG1lc3NhZ2UuCkBAIC0zMTM0LDYgKzMxNDMsNyBAQCBsaWJ4bF9f c3RyZWFtX3JlYWRfaW51c2UoY29uc3QgbGlieGxfX3N0cmVhbV9yZWFkX3N0YXRlICpzdHJlYW0p CiAgICAgcmV0dXJuIHN0cmVhbS0+cnVubmluZzsKIH0KIAorI2luY2x1ZGUgImxpYnhsX2NvbG8u aCIKIAogLyotLS0tLSBEb21haW4gc3VzcGVuZCAoc2F2ZSkgc3RhdGUgc3RydWN0dXJlIC0tLS0t Ki8KIC8qCkBAIC0zMjEwLDI4ICszMjIwLDYgQEAgbGlieGxfX3N0cmVhbV93cml0ZV9pbnVzZShj b25zdCBsaWJ4bF9fc3RyZWFtX3dyaXRlX3N0YXRlICpzdHJlYW0pCiAgICAgcmV0dXJuIHN0cmVh bS0+cnVubmluZzsKIH0KIAotLyotLS0tLSBjb2xvIHJlbGF0ZWQgc3RhdGUgc3RydWN0dXJlIC0t LS0tKi8KLXR5cGVkZWYgc3RydWN0IGxpYnhsX19jb2xvX3NhdmVfc3RhdGUgbGlieGxfX2NvbG9f c2F2ZV9zdGF0ZTsKLXN0cnVjdCBsaWJ4bF9fY29sb19zYXZlX3N0YXRlIHsKLSAgICBpbnQgc2Vu ZF9mZDsKLSAgICBpbnQgcmVjdl9mZDsKLSAgICBjaGFyICpjb2xvX3Byb3h5X3NjcmlwdDsKLQot ICAgIC8qIHByaXZhdGUgKi8KLSAgICBsaWJ4bF9fc3RyZWFtX3JlYWRfc3RhdGUgc3JzOwotICAg IHZvaWQgKCpjYWxsYmFjaykobGlieGxfX2VnYyAqLCBsaWJ4bF9fY29sb19zYXZlX3N0YXRlICos IGludCk7Ci0gICAgYm9vbCBzdm1fcnVubmluZzsKLSAgICBib29sIHBhdXNlZDsKLQotICAgIC8q IHByaXZhdGUsIHVzZWQgYnkgcWRpc2sgYmxvY2sgcmVwbGljYXRpb24gKi8KLSAgICBib29sIHFk aXNrX3VzZWQ7Ci0gICAgYm9vbCBxZGlza19zZXR1cGVkOwotCi0gICAgLyogcHJpdmF0ZSwgdXNl ZCBieSBjb2xvLXByb3h5ICovCi0gICAgbGlieGxfX2NvbG9fcHJveHlfc3RhdGUgY3BzOwotICAg IGxpYnhsX19ldl9jaGlsZCBjaGlsZDsKLX07Ci0KIHR5cGVkZWYgc3RydWN0IGxpYnhsX19sb2dk aXJ0eV9zd2l0Y2ggewogICAgIC8qIFNldCBieSBjYWxsZXIgb2YgbGlieGxfX2RvbWFpbl9jb21t b25fc3dpdGNoX3FlbXVfbG9nZGlydHkgKi8KICAgICBsaWJ4bF9fYW8gKmFvOwotLSAKMi4xLjQK CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2 ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHA6Ly9saXN0cy54ZW4u b3JnL3hlbi1kZXZlbAo=