From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Durrant Subject: [PATCH v2 4/9] viridian: remove duplicate union types Date: Wed, 31 Oct 2018 12:43:30 +0000 Message-ID: <20181031124335.23867-5-paul.durrant@citrix.com> References: <20181031124335.23867-1-paul.durrant@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1gHpqb-0005vz-3A for xen-devel@lists.xenproject.org; Wed, 31 Oct 2018 12:43:45 +0000 In-Reply-To: <20181031124335.23867-1-paul.durrant@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: Andrew Cooper , Paul Durrant , Wei Liu , Jan Beulich List-Id: xen-devel@lists.xenproject.org VGhlICd2aXJpZGlhbl92cF9hc3Npc3QnLCAndmlyaWRpYW5faHlwZXJjYWxsX2dwYScgYW5kCid2 aXJpZGlhbl9yZWZlcmVuY2VfdHNjJyB1bmlvbiB0eXBlcyBhcmUgaWRlbnRpY2FsIGluIGxheW91 dC4gVGhlIGxheW91dAppcyBhbHNvIGNvbW1vbiB0aHJvdWdob3V0IHRoZSBzcGVjaWZpY2F0aW9u IFsxXS4KClRoaXMgcGF0Y2ggZGVjbGFyZXMgYSBjb21tb24gJ3ZpcmlkaWFuX3BhZ2VfbXNyJyB0 eXBlIGFuZCBjb252ZXJ0cyB0aGUgcmVzdApvZiB0aGUgY29kZSB0byB1c2UgdGhhdCB0eXBlIGZv ciBib3RoIHRoZSBoeXBlcmNhbGwgYW5kIFZQIGFzc2lzdCBwYWdlcy4KCkFsc28sIHJlbmFtZSAn dmlyaWRpYW5fZ3Vlc3Rfb3NfaWQnIHRvICd2aXJpZGlhbl9ndWVzdF9vc19pZF9tc3InIHNpbmNl IGl0CmFsc28gaXMgYSB1bmlvbiByZXByZXNlbnRpbmcgYW4gTVNSIHZhbHVlLgoKTm8gZnVuY3Rp b25hbCBjaGFuZ2UuCgpbMV0gaHR0cHM6Ly9naXRodWIuY29tL01pY3Jvc29mdERvY3MvVmlydHVh bGl6YXRpb24tRG9jdW1lbnRhdGlvbi9yYXcvbGl2ZS90bGZzL0h5cGVydmlzb3IlMjBUb3AlMjBM ZXZlbCUyMEZ1bmN0aW9uYWwlMjBTcGVjaWZpY2F0aW9uJTIwdjUuMEMucGRmCgpTaWduZWQtb2Zm LWJ5OiBQYXVsIER1cnJhbnQgPHBhdWwuZHVycmFudEBjaXRyaXguY29tPgpSZXZpZXdlZC1ieTog Um9nZXIgUGF1IE1vbm5lIDxyb2dlci5wYXVAY2l0cml4LmNvbT4KLS0tCkNjOiBKYW4gQmV1bGlj aCA8amJldWxpY2hAc3VzZS5jb20+CkNjOiBBbmRyZXcgQ29vcGVyIDxhbmRyZXcuY29vcGVyM0Bj aXRyaXguY29tPgpDYzogV2VpIExpdSA8d2VpLmxpdTJAY2l0cml4LmNvbT4KLS0tCiB4ZW4vYXJj aC94ODYvaHZtL3ZpcmlkaWFuL3ZpcmlkaWFuLmMgfCAgOCArKysrLS0tLQogeGVuL2luY2x1ZGUv YXNtLXg4Ni9odm0vdmlyaWRpYW4uaCAgIHwgMzYgKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDEyIGluc2VydGlvbnMoKyksIDMyIGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9odm0vdmlyaWRpYW4vdmlyaWRpYW4uYyBi L3hlbi9hcmNoL3g4Ni9odm0vdmlyaWRpYW4vdmlyaWRpYW4uYwppbmRleCBmNWY1ZmJjZGZlLi4y ZGM4NmRkMGYzIDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvaHZtL3ZpcmlkaWFuL3ZpcmlkaWFu LmMKKysrIGIveGVuL2FyY2gveDg2L2h2bS92aXJpZGlhbi92aXJpZGlhbi5jCkBAIC0yODYsNyAr Mjg2LDcgQEAgdm9pZCBjcHVpZF92aXJpZGlhbl9sZWF2ZXMoY29uc3Qgc3RydWN0IHZjcHUgKnYs IHVpbnQzMl90IGxlYWYsCiAKIHN0YXRpYyB2b2lkIGR1bXBfZ3Vlc3Rfb3NfaWQoY29uc3Qgc3Ry dWN0IGRvbWFpbiAqZCkKIHsKLSAgICBjb25zdCB1bmlvbiB2aXJpZGlhbl9ndWVzdF9vc19pZCAq Z29pOworICAgIGNvbnN0IHVuaW9uIHZpcmlkaWFuX2d1ZXN0X29zX2lkX21zciAqZ29pOwogCiAg ICAgZ29pID0gJmQtPmFyY2guaHZtLnZpcmlkaWFuLmd1ZXN0X29zX2lkOwogCkBAIC0zMDAsNyAr MzAwLDcgQEAgc3RhdGljIHZvaWQgZHVtcF9ndWVzdF9vc19pZChjb25zdCBzdHJ1Y3QgZG9tYWlu ICpkKQogCiBzdGF0aWMgdm9pZCBkdW1wX2h5cGVyY2FsbChjb25zdCBzdHJ1Y3QgZG9tYWluICpk KQogewotICAgIGNvbnN0IHVuaW9uIHZpcmlkaWFuX2h5cGVyY2FsbF9ncGEgKmhnOworICAgIGNv bnN0IHVuaW9uIHZpcmlkaWFuX3BhZ2VfbXNyICpoZzsKIAogICAgIGhnID0gJmQtPmFyY2guaHZt LnZpcmlkaWFuLmh5cGVyY2FsbF9ncGE7CiAKQEAgLTMxMSw3ICszMTEsNyBAQCBzdGF0aWMgdm9p ZCBkdW1wX2h5cGVyY2FsbChjb25zdCBzdHJ1Y3QgZG9tYWluICpkKQogCiBzdGF0aWMgdm9pZCBk dW1wX3ZwX2Fzc2lzdChjb25zdCBzdHJ1Y3QgdmNwdSAqdikKIHsKLSAgICBjb25zdCB1bmlvbiB2 aXJpZGlhbl92cF9hc3Npc3QgKnZhOworICAgIGNvbnN0IHVuaW9uIHZpcmlkaWFuX3BhZ2VfbXNy ICp2YTsKIAogICAgIHZhID0gJnYtPmFyY2guaHZtLnZpcmlkaWFuLnZwX2Fzc2lzdC5tc3I7CiAK QEAgLTMyMSw3ICszMjEsNyBAQCBzdGF0aWMgdm9pZCBkdW1wX3ZwX2Fzc2lzdChjb25zdCBzdHJ1 Y3QgdmNwdSAqdikKIAogc3RhdGljIHZvaWQgZHVtcF9yZWZlcmVuY2VfdHNjKGNvbnN0IHN0cnVj dCBkb21haW4gKmQpCiB7Ci0gICAgY29uc3QgdW5pb24gdmlyaWRpYW5fcmVmZXJlbmNlX3RzYyAq cnQ7CisgICAgY29uc3QgdW5pb24gdmlyaWRpYW5fcGFnZV9tc3IgKnJ0OwogCiAgICAgcnQgPSAm ZC0+YXJjaC5odm0udmlyaWRpYW4ucmVmZXJlbmNlX3RzYzsKIApkaWZmIC0tZ2l0IGEveGVuL2lu Y2x1ZGUvYXNtLXg4Ni9odm0vdmlyaWRpYW4uaCBiL3hlbi9pbmNsdWRlL2FzbS14ODYvaHZtL3Zp cmlkaWFuLmgKaW5kZXggZjYwMDhmOWJkYi4uMzU5ZmRmNWE4MyAxMDA2NDQKLS0tIGEveGVuL2lu Y2x1ZGUvYXNtLXg4Ni9odm0vdmlyaWRpYW4uaAorKysgYi94ZW4vaW5jbHVkZS9hc20teDg2L2h2 bS92aXJpZGlhbi5oCkBAIC05LDggKzksOSBAQAogI2lmbmRlZiBfX0FTTV9YODZfSFZNX1ZJUklE SUFOX0hfXwogI2RlZmluZSBfX0FTTV9YODZfSFZNX1ZJUklESUFOX0hfXwogCi11bmlvbiB2aXJp ZGlhbl92cF9hc3Npc3QKLXsgICB1aW50NjRfdCByYXc7Cit1bmlvbiB2aXJpZGlhbl9wYWdlX21z cgoreworICAgIHVpbnQ2NF90IHJhdzsKICAgICBzdHJ1Y3QKICAgICB7CiAgICAgICAgIHVpbnQ2 NF90IGVuYWJsZWQ6MTsKQEAgLTIyLDE0ICsyMywxNCBAQCB1bmlvbiB2aXJpZGlhbl92cF9hc3Np c3QKIHN0cnVjdCB2aXJpZGlhbl92Y3B1CiB7CiAgICAgc3RydWN0IHsKLSAgICAgICAgdW5pb24g dmlyaWRpYW5fdnBfYXNzaXN0IG1zcjsKKyAgICAgICAgdW5pb24gdmlyaWRpYW5fcGFnZV9tc3Ig bXNyOwogICAgICAgICB2b2lkICp2YTsKICAgICAgICAgYm9vbCBwZW5kaW5nOwogICAgIH0gdnBf YXNzaXN0OwogICAgIHVpbnQ2NF90IGNyYXNoX3BhcmFtWzVdOwogfTsKIAotdW5pb24gdmlyaWRp YW5fZ3Vlc3Rfb3NfaWQKK3VuaW9uIHZpcmlkaWFuX2d1ZXN0X29zX2lkX21zcgogewogICAgIHVp bnQ2NF90IHJhdzsKICAgICBzdHJ1Y3QKQEAgLTQzLDE2ICs0NCw2IEBAIHVuaW9uIHZpcmlkaWFu X2d1ZXN0X29zX2lkCiAgICAgfSBmaWVsZHM7CiB9OwogCi11bmlvbiB2aXJpZGlhbl9oeXBlcmNh bGxfZ3BhCi17ICAgdWludDY0X3QgcmF3OwotICAgIHN0cnVjdAotICAgIHsKLSAgICAgICAgdWlu dDY0X3QgZW5hYmxlZDoxOwotICAgICAgICB1aW50NjRfdCByZXNlcnZlZF9wcmVzZXJ2ZWQ6MTE7 Ci0gICAgICAgIHVpbnQ2NF90IHBmbjo0ODsKLSAgICB9IGZpZWxkczsKLX07Ci0KIHN0cnVjdCB2 aXJpZGlhbl90aW1lX3JlZl9jb3VudAogewogICAgIHVuc2lnbmVkIGxvbmcgZmxhZ3M7CkBAIC02 NiwxNyArNTcsNiBAQCBzdHJ1Y3QgdmlyaWRpYW5fdGltZV9yZWZfY291bnQKICAgICBpbnQ2NF90 IG9mZjsKIH07CiAKLXVuaW9uIHZpcmlkaWFuX3JlZmVyZW5jZV90c2MKLXsKLSAgICB1aW50NjRf dCByYXc7Ci0gICAgc3RydWN0Ci0gICAgewotICAgICAgICB1aW50NjRfdCBlbmFibGVkOjE7Ci0g ICAgICAgIHVpbnQ2NF90IHJlc2VydmVkX3ByZXNlcnZlZDoxMTsKLSAgICAgICAgdWludDY0X3Qg cGZuOjQ4OwotICAgIH0gZmllbGRzOwotfTsKLQogdHlwZWRlZiBzdHJ1Y3QgX0hWX1JFRkVSRU5D RV9UU0NfUEFHRQogewogICAgIHVpbnQzMl90IFRzY1NlcXVlbmNlOwpAQCAtODgsMTAgKzY4LDEw IEBAIHR5cGVkZWYgc3RydWN0IF9IVl9SRUZFUkVOQ0VfVFNDX1BBR0UKIAogc3RydWN0IHZpcmlk aWFuX2RvbWFpbgogewotICAgIHVuaW9uIHZpcmlkaWFuX2d1ZXN0X29zX2lkIGd1ZXN0X29zX2lk OwotICAgIHVuaW9uIHZpcmlkaWFuX2h5cGVyY2FsbF9ncGEgaHlwZXJjYWxsX2dwYTsKKyAgICB1 bmlvbiB2aXJpZGlhbl9ndWVzdF9vc19pZF9tc3IgZ3Vlc3Rfb3NfaWQ7CisgICAgdW5pb24gdmly aWRpYW5fcGFnZV9tc3IgaHlwZXJjYWxsX2dwYTsKICAgICBzdHJ1Y3QgdmlyaWRpYW5fdGltZV9y ZWZfY291bnQgdGltZV9yZWZfY291bnQ7Ci0gICAgdW5pb24gdmlyaWRpYW5fcmVmZXJlbmNlX3Rz YyByZWZlcmVuY2VfdHNjOworICAgIHVuaW9uIHZpcmlkaWFuX3BhZ2VfbXNyIHJlZmVyZW5jZV90 c2M7CiB9OwogCiB2b2lkIGNwdWlkX3ZpcmlkaWFuX2xlYXZlcyhjb25zdCBzdHJ1Y3QgdmNwdSAq diwgdWludDMyX3QgbGVhZiwKLS0gCjIuMTEuMAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxp c3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFpbG1hbi9s aXN0aW5mby94ZW4tZGV2ZWw=