From mboxrd@z Thu Jan  1 00:00:00 1970
From: Paul Durrant <paul.durrant@citrix.com>
Subject: [PATCH 4/8] viridian: remove duplicate union types
Date: Mon, 29 Oct 2018 18:02:07 +0000
Message-ID: <20181029180211.2155-7-paul.durrant@citrix.com>
References: <20181029180211.2155-1-paul.durrant@citrix.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <xen-devel-bounces@lists.xenproject.org>
Received: from all-amaz-eas1.inumbo.com ([34.197.232.57]
 helo=us1-amaz-eas2.inumbo.com)
 by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from
 <srs0=doux=nj=citrix.com=prvs=833f3324f=paul.durrant@srs-us1.protection.inumbo.net>)
 id 1gHBrm-0000PR-Ey
 for xen-devel@lists.xenproject.org; Mon, 29 Oct 2018 18:02:18 +0000
In-Reply-To: <20181029180211.2155-1-paul.durrant@citrix.com>
List-Unsubscribe: <https://lists.xenproject.org/mailman/options/xen-devel>,
 <mailto:xen-devel-request@lists.xenproject.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xenproject.org>
List-Help: <mailto:xen-devel-request@lists.xenproject.org?subject=help>
List-Subscribe: <https://lists.xenproject.org/mailman/listinfo/xen-devel>,
 <mailto:xen-devel-request@lists.xenproject.org?subject=subscribe>
Errors-To: xen-devel-bounces@lists.xenproject.org
Sender: "Xen-devel" <xen-devel-bounces@lists.xenproject.org>
To: xen-devel@lists.xenproject.org
Cc: Andrew Cooper <andrew.cooper3@citrix.com>, Paul Durrant <paul.durrant@citrix.com>, Wei Liu <wei.liu2@citrix.com>, Jan Beulich <jbeulich@suse.com>
List-Id: xen-devel@lists.xenproject.org

VGhlICd2aXJpZGlhbl92cF9hc3Npc3QnLCAndmlyaWRpYW5faHlwZXJjYWxsX2dwYScgYW5kCid2
aXJpZGlhbl9yZWZlcmVuY2VfdHNjJyB1bmlvbiB0eXBlcyBhcmUgaWRlbnRpY2FsIGluIGxheW91
dC4gVGhlIGxheW91dAppcyBhbHNvIGNvbW1vbiB0aHJvdWdob3V0IHRoZSBzcGVjaWZpY2F0aW9u
IFsxXS4KClRoaXMgcGF0Y2ggZGVjbGFyZXMgYSBjb21tb24gJ3ZpcmlkaWFuX3BhZ2VfbXNyJyB0
eXBlIGFuZCBjb252ZXJ0cyB0aGUgcmVzdApvZiB0aGUgY29kZSB0byB1c2UgdGhhdCB0eXBlIGZv
ciBib3RoIHRoZSBoeXBlcmNhbGwgYW5kIFZQIGFzc2lzdCBwYWdlcy4KCkFsc28sIHJlbmFtZSAn
dmlyaWRpYW5fZ3Vlc3Rfb3NfaWQnIHRvICd2aXJpZGlhbl9ndWVzdF9vc19pZF9tc3InIHNpbmNl
IGl0CmFsc28gaXMgYSB1bmlvbiByZXByZXNlbnRpbmcgYW4gTVNSIHZhbHVlLgoKTm8gZnVuY3Rp
b25hbCBjaGFuZ2UuCgpbMV0gaHR0cHM6Ly9naXRodWIuY29tL01pY3Jvc29mdERvY3MvVmlydHVh
bGl6YXRpb24tRG9jdW1lbnRhdGlvbi9yYXcvbGl2ZS90bGZzL0h5cGVydmlzb3IlMjBUb3AlMjBM
ZXZlbCUyMEZ1bmN0aW9uYWwlMjBTcGVjaWZpY2F0aW9uJTIwdjUuMEMucGRmCgpTaWduZWQtb2Zm
LWJ5OiBQYXVsIER1cnJhbnQgPHBhdWwuZHVycmFudEBjaXRyaXguY29tPgotLS0KQ2M6IEphbiBC
ZXVsaWNoIDxqYmV1bGljaEBzdXNlLmNvbT4KQ2M6IEFuZHJldyBDb29wZXIgPGFuZHJldy5jb29w
ZXIzQGNpdHJpeC5jb20+CkNjOiBXZWkgTGl1IDx3ZWkubGl1MkBjaXRyaXguY29tPgotLS0KIHhl
bi9hcmNoL3g4Ni9odm0vdmlyaWRpYW4vdmlyaWRpYW4uYyB8ICA4ICsrKystLS0tCiB4ZW4vaW5j
bHVkZS9hc20teDg2L2h2bS92aXJpZGlhbi5oICAgfCAzNiArKysrKysrKy0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwgMzIgZGVs
ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L2h2bS92aXJpZGlhbi92aXJpZGlh
bi5jIGIveGVuL2FyY2gveDg2L2h2bS92aXJpZGlhbi92aXJpZGlhbi5jCmluZGV4IGRiMTY2ZDQx
YzUuLjU1YjkwNzFjMzIgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9odm0vdmlyaWRpYW4vdmly
aWRpYW4uYworKysgYi94ZW4vYXJjaC94ODYvaHZtL3ZpcmlkaWFuL3ZpcmlkaWFuLmMKQEAgLTI4
OCw3ICsyODgsNyBAQCB2b2lkIGNwdWlkX3ZpcmlkaWFuX2xlYXZlcyhjb25zdCBzdHJ1Y3QgdmNw
dSAqdiwgdWludDMyX3QgbGVhZiwKIAogc3RhdGljIHZvaWQgZHVtcF9ndWVzdF9vc19pZChjb25z
dCBzdHJ1Y3QgZG9tYWluICpkKQogewotICAgIGNvbnN0IHVuaW9uIHZpcmlkaWFuX2d1ZXN0X29z
X2lkICpnb2k7CisgICAgY29uc3QgdW5pb24gdmlyaWRpYW5fZ3Vlc3Rfb3NfaWRfbXNyICpnb2k7
CiAKICAgICBnb2kgPSAmZC0+YXJjaC5odm0udmlyaWRpYW4uZ3Vlc3Rfb3NfaWQ7CiAKQEAgLTMw
Miw3ICszMDIsNyBAQCBzdGF0aWMgdm9pZCBkdW1wX2d1ZXN0X29zX2lkKGNvbnN0IHN0cnVjdCBk
b21haW4gKmQpCiAKIHN0YXRpYyB2b2lkIGR1bXBfaHlwZXJjYWxsKGNvbnN0IHN0cnVjdCBkb21h
aW4gKmQpCiB7Ci0gICAgY29uc3QgdW5pb24gdmlyaWRpYW5faHlwZXJjYWxsX2dwYSAqaGc7Cisg
ICAgY29uc3QgdW5pb24gdmlyaWRpYW5fcGFnZV9tc3IgKmhnOwogCiAgICAgaGcgPSAmZC0+YXJj
aC5odm0udmlyaWRpYW4uaHlwZXJjYWxsX2dwYTsKIApAQCAtMzEzLDcgKzMxMyw3IEBAIHN0YXRp
YyB2b2lkIGR1bXBfaHlwZXJjYWxsKGNvbnN0IHN0cnVjdCBkb21haW4gKmQpCiAKIHN0YXRpYyB2
b2lkIGR1bXBfdnBfYXNzaXN0KGNvbnN0IHN0cnVjdCB2Y3B1ICp2KQogewotICAgIGNvbnN0IHVu
aW9uIHZpcmlkaWFuX3ZwX2Fzc2lzdCAqdmE7CisgICAgY29uc3QgdW5pb24gdmlyaWRpYW5fcGFn
ZV9tc3IgKnZhOwogCiAgICAgdmEgPSAmdi0+YXJjaC5odm0udmlyaWRpYW4udnBfYXNzaXN0Lm1z
cjsKIApAQCAtMzIzLDcgKzMyMyw3IEBAIHN0YXRpYyB2b2lkIGR1bXBfdnBfYXNzaXN0KGNvbnN0
IHN0cnVjdCB2Y3B1ICp2KQogCiBzdGF0aWMgdm9pZCBkdW1wX3JlZmVyZW5jZV90c2MoY29uc3Qg
c3RydWN0IGRvbWFpbiAqZCkKIHsKLSAgICBjb25zdCB1bmlvbiB2aXJpZGlhbl9yZWZlcmVuY2Vf
dHNjICpydDsKKyAgICBjb25zdCB1bmlvbiB2aXJpZGlhbl9wYWdlX21zciAqcnQ7CiAKICAgICBy
dCA9ICZkLT5hcmNoLmh2bS52aXJpZGlhbi5yZWZlcmVuY2VfdHNjOwogCmRpZmYgLS1naXQgYS94
ZW4vaW5jbHVkZS9hc20teDg2L2h2bS92aXJpZGlhbi5oIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9o
dm0vdmlyaWRpYW4uaAppbmRleCBmNjAwOGY5YmRiLi4zNTlmZGY1YTgzIDEwMDY0NAotLS0gYS94
ZW4vaW5jbHVkZS9hc20teDg2L2h2bS92aXJpZGlhbi5oCisrKyBiL3hlbi9pbmNsdWRlL2FzbS14
ODYvaHZtL3ZpcmlkaWFuLmgKQEAgLTksOCArOSw5IEBACiAjaWZuZGVmIF9fQVNNX1g4Nl9IVk1f
VklSSURJQU5fSF9fCiAjZGVmaW5lIF9fQVNNX1g4Nl9IVk1fVklSSURJQU5fSF9fCiAKLXVuaW9u
IHZpcmlkaWFuX3ZwX2Fzc2lzdAoteyAgIHVpbnQ2NF90IHJhdzsKK3VuaW9uIHZpcmlkaWFuX3Bh
Z2VfbXNyCit7CisgICAgdWludDY0X3QgcmF3OwogICAgIHN0cnVjdAogICAgIHsKICAgICAgICAg
dWludDY0X3QgZW5hYmxlZDoxOwpAQCAtMjIsMTQgKzIzLDE0IEBAIHVuaW9uIHZpcmlkaWFuX3Zw
X2Fzc2lzdAogc3RydWN0IHZpcmlkaWFuX3ZjcHUKIHsKICAgICBzdHJ1Y3QgewotICAgICAgICB1
bmlvbiB2aXJpZGlhbl92cF9hc3Npc3QgbXNyOworICAgICAgICB1bmlvbiB2aXJpZGlhbl9wYWdl
X21zciBtc3I7CiAgICAgICAgIHZvaWQgKnZhOwogICAgICAgICBib29sIHBlbmRpbmc7CiAgICAg
fSB2cF9hc3Npc3Q7CiAgICAgdWludDY0X3QgY3Jhc2hfcGFyYW1bNV07CiB9OwogCi11bmlvbiB2
aXJpZGlhbl9ndWVzdF9vc19pZAordW5pb24gdmlyaWRpYW5fZ3Vlc3Rfb3NfaWRfbXNyCiB7CiAg
ICAgdWludDY0X3QgcmF3OwogICAgIHN0cnVjdApAQCAtNDMsMTYgKzQ0LDYgQEAgdW5pb24gdmly
aWRpYW5fZ3Vlc3Rfb3NfaWQKICAgICB9IGZpZWxkczsKIH07CiAKLXVuaW9uIHZpcmlkaWFuX2h5
cGVyY2FsbF9ncGEKLXsgICB1aW50NjRfdCByYXc7Ci0gICAgc3RydWN0Ci0gICAgewotICAgICAg
ICB1aW50NjRfdCBlbmFibGVkOjE7Ci0gICAgICAgIHVpbnQ2NF90IHJlc2VydmVkX3ByZXNlcnZl
ZDoxMTsKLSAgICAgICAgdWludDY0X3QgcGZuOjQ4OwotICAgIH0gZmllbGRzOwotfTsKLQogc3Ry
dWN0IHZpcmlkaWFuX3RpbWVfcmVmX2NvdW50CiB7CiAgICAgdW5zaWduZWQgbG9uZyBmbGFnczsK
QEAgLTY2LDE3ICs1Nyw2IEBAIHN0cnVjdCB2aXJpZGlhbl90aW1lX3JlZl9jb3VudAogICAgIGlu
dDY0X3Qgb2ZmOwogfTsKIAotdW5pb24gdmlyaWRpYW5fcmVmZXJlbmNlX3RzYwotewotICAgIHVp
bnQ2NF90IHJhdzsKLSAgICBzdHJ1Y3QKLSAgICB7Ci0gICAgICAgIHVpbnQ2NF90IGVuYWJsZWQ6
MTsKLSAgICAgICAgdWludDY0X3QgcmVzZXJ2ZWRfcHJlc2VydmVkOjExOwotICAgICAgICB1aW50
NjRfdCBwZm46NDg7Ci0gICAgfSBmaWVsZHM7Ci19OwotCiB0eXBlZGVmIHN0cnVjdCBfSFZfUkVG
RVJFTkNFX1RTQ19QQUdFCiB7CiAgICAgdWludDMyX3QgVHNjU2VxdWVuY2U7CkBAIC04OCwxMCAr
NjgsMTAgQEAgdHlwZWRlZiBzdHJ1Y3QgX0hWX1JFRkVSRU5DRV9UU0NfUEFHRQogCiBzdHJ1Y3Qg
dmlyaWRpYW5fZG9tYWluCiB7Ci0gICAgdW5pb24gdmlyaWRpYW5fZ3Vlc3Rfb3NfaWQgZ3Vlc3Rf
b3NfaWQ7Ci0gICAgdW5pb24gdmlyaWRpYW5faHlwZXJjYWxsX2dwYSBoeXBlcmNhbGxfZ3BhOwor
ICAgIHVuaW9uIHZpcmlkaWFuX2d1ZXN0X29zX2lkX21zciBndWVzdF9vc19pZDsKKyAgICB1bmlv
biB2aXJpZGlhbl9wYWdlX21zciBoeXBlcmNhbGxfZ3BhOwogICAgIHN0cnVjdCB2aXJpZGlhbl90
aW1lX3JlZl9jb3VudCB0aW1lX3JlZl9jb3VudDsKLSAgICB1bmlvbiB2aXJpZGlhbl9yZWZlcmVu
Y2VfdHNjIHJlZmVyZW5jZV90c2M7CisgICAgdW5pb24gdmlyaWRpYW5fcGFnZV9tc3IgcmVmZXJl
bmNlX3RzYzsKIH07CiAKIHZvaWQgY3B1aWRfdmlyaWRpYW5fbGVhdmVzKGNvbnN0IHN0cnVjdCB2
Y3B1ICp2LCB1aW50MzJfdCBsZWFmLAotLSAKMi4xMS4wCgoKX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2
ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWls
bWFuL2xpc3RpbmZvL3hlbi1kZXZlbA==