From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH XTF 4/4] build: Avoid using initialisers for anonymous unions Date: Thu, 28 Sep 2017 11:59:32 +0100 Message-ID: <1506596372-24393-4-git-send-email-andrew.cooper3@citrix.com> References: <1506596372-24393-1-git-send-email-andrew.cooper3@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1506596372-24393-1-git-send-email-andrew.cooper3@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: Andrew Cooper , Glenn Enright List-Id: xen-devel@lists.xenproject.org R0NDIDQuNCBvZiBDZW50T1MgNiB2aW50YWdlIGNhbid0IGNvcGUuCgpSZXBvcnRlZC1ieTogR2xl bm4gRW5yaWdodCA8Z2xlbm5AcmltdWhvc3RpbmcuY29tPgpTaWduZWQtb2ZmLWJ5OiBBbmRyZXcg Q29vcGVyIDxhbmRyZXcuY29vcGVyM0BjaXRyaXguY29tPgotLS0KIHRlc3RzL2xpdmVwYXRjaC1w cml2LWNoZWNrL21haW4uYyB8IDc1ICsrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLQogMSBmaWxlIGNoYW5nZWQsIDI2IGluc2VydGlvbnMoKyksIDQ5IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL3Rlc3RzL2xpdmVwYXRjaC1wcml2LWNoZWNrL21haW4uYyBiL3Rlc3RzL2xp dmVwYXRjaC1wcml2LWNoZWNrL21haW4uYwppbmRleCBlNTFiYTY0Li45ZjllNzc4IDEwMDY0NAot LS0gYS90ZXN0cy9saXZlcGF0Y2gtcHJpdi1jaGVjay9tYWluLmMKKysrIGIvdGVzdHMvbGl2ZXBh dGNoLXByaXYtY2hlY2svbWFpbi5jCkBAIC0zOCwyMyArMzgsMTcgQEAgc3RhdGljIHZvaWQgY2hl Y2tfcmV0KGNvbnN0IGNoYXIgKnRlc3QsIGludCByYykKIHN0YXRpYyB2b2lkIHRlc3RfdXBsb2Fk KHZvaWQpCiB7CiAgICAgc3RhdGljIHVpbnQ4X3QgcGF5bG9hZFtQQUdFX1NJWkVdOwotICAgIHhl bl9zeXNjdGxfdCBvcCA9Ci0gICAgeworICAgIHhlbl9zeXNjdGxfdCBvcCA9IHsKICAgICAgICAg LmNtZCA9IFhFTl9TWVNDVExfbGl2ZXBhdGNoX29wLAogICAgICAgICAuaW50ZXJmYWNlX3ZlcnNp b24gPSBzeXNjdGxfaW50ZXJmYWNlX3ZlcnNpb24sCi0gICAgICAgIC51LmxpdmVwYXRjaCA9IHsK LSAgICAgICAgICAgIC5jbWQgPSBYRU5fU1lTQ1RMX0xJVkVQQVRDSF9VUExPQUQsCi0gICAgICAg ICAgICAudS51cGxvYWQgPSB7Ci0gICAgICAgICAgICAgICAgLm5hbWUgPSB7Ci0gICAgICAgICAg ICAgICAgICAgIC5uYW1lLnAgPSBURVNUX05BTUUsCi0gICAgICAgICAgICAgICAgICAgIC5zaXpl ID0gc2l6ZW9mKFRFU1RfTkFNRSksCi0gICAgICAgICAgICAgICAgfSwKLSAgICAgICAgICAgICAg ICAuc2l6ZSA9IFBBR0VfU0laRSwKLSAgICAgICAgICAgICAgICAucGF5bG9hZC5wID0gcGF5bG9h ZCwKLSAgICAgICAgICAgIH0sCi0gICAgICAgIH0sCiAgICAgfTsKIAorICAgIG9wLnUubGl2ZXBh dGNoLmNtZCA9IFhFTl9TWVNDVExfTElWRVBBVENIX1VQTE9BRDsKKyAgICBvcC51LmxpdmVwYXRj aC51LnVwbG9hZC5uYW1lLm5hbWUucCA9IFRFU1RfTkFNRTsKKyAgICBvcC51LmxpdmVwYXRjaC51 LnVwbG9hZC5uYW1lLnNpemUgPSBzaXplb2YoVEVTVF9OQU1FKTsKKyAgICBvcC51LmxpdmVwYXRj aC51LnVwbG9hZC5zaXplID0gUEFHRV9TSVpFOworICAgIG9wLnUubGl2ZXBhdGNoLnUudXBsb2Fk LnBheWxvYWQucCA9IHBheWxvYWQ7CisKICAgICBjaGVja19yZXQoX19mdW5jX18sIGh5cGVyY2Fs bF9zeXNjdGwoJm9wKSk7CiB9CiAKQEAgLTY0LDY0ICs1OCw0NyBAQCBzdGF0aWMgdm9pZCB0ZXN0 X2xpc3Qodm9pZCkKIHsKICAgICBjaGFyIG5hbWVzW05SX1BBWUxPQURTICogWEVOX0xJVkVQQVRD SF9OQU1FX1NJWkVdOwogICAgIHVpbnQzMl90IGxlbmd0aHNbTlJfUEFZTE9BRFNdOwotCi0gICAg eGVuX3N5c2N0bF90IG9wID0KLSAgICB7CisgICAgeGVuX3N5c2N0bF90IG9wID0gewogICAgICAg ICAuY21kID0gWEVOX1NZU0NUTF9saXZlcGF0Y2hfb3AsCiAgICAgICAgIC5pbnRlcmZhY2VfdmVy c2lvbiA9IHN5c2N0bF9pbnRlcmZhY2VfdmVyc2lvbiwKLSAgICAgICAgLnUubGl2ZXBhdGNoID0g ewotICAgICAgICAgICAgLmNtZCA9IFhFTl9TWVNDVExfTElWRVBBVENIX0xJU1QsCi0gICAgICAg ICAgICAudS5saXN0ID0gewotICAgICAgICAgICAgICAgIC5pZHggPSAwLAotICAgICAgICAgICAg ICAgIC5uciA9IE5SX1BBWUxPQURTLAotICAgICAgICAgICAgICAgIC5uYW1lLnAgPSBuYW1lcywK LSAgICAgICAgICAgICAgICAubGVuLnAgPSBsZW5ndGhzLAotICAgICAgICAgICAgfSwKLSAgICAg ICAgfSwKICAgICB9OwogCisgICAgb3AudS5saXZlcGF0Y2guY21kID0gWEVOX1NZU0NUTF9MSVZF UEFUQ0hfTElTVDsKKyAgICBvcC51LmxpdmVwYXRjaC51Lmxpc3QuaWR4ID0gMDsKKyAgICBvcC51 LmxpdmVwYXRjaC51Lmxpc3QubnIgPSBOUl9QQVlMT0FEUzsKKyAgICBvcC51LmxpdmVwYXRjaC51 Lmxpc3QubmFtZS5wID0gbmFtZXM7CisgICAgb3AudS5saXZlcGF0Y2gudS5saXN0Lmxlbi5wID0g bGVuZ3RoczsKKwogICAgIGNoZWNrX3JldChfX2Z1bmNfXywgaHlwZXJjYWxsX3N5c2N0bCgmb3Ap KTsKIH0KIAogc3RhdGljIHZvaWQgdGVzdF9nZXQodm9pZCkKIHsKLSAgICB4ZW5fc3lzY3RsX3Qg b3AgPQotICAgIHsKKyAgICB4ZW5fc3lzY3RsX3Qgb3AgPSB7CiAgICAgICAgIC5jbWQgPSBYRU5f U1lTQ1RMX2xpdmVwYXRjaF9vcCwKICAgICAgICAgLmludGVyZmFjZV92ZXJzaW9uID0gc3lzY3Rs X2ludGVyZmFjZV92ZXJzaW9uLAotICAgICAgICAudS5saXZlcGF0Y2ggPSB7Ci0gICAgICAgICAg ICAuY21kID0gWEVOX1NZU0NUTF9MSVZFUEFUQ0hfR0VULAotICAgICAgICAgICAgLnUuZ2V0ID0g ewotICAgICAgICAgICAgICAgIC5uYW1lID0gewotICAgICAgICAgICAgICAgICAgICAubmFtZS5w ID0gVEVTVF9OQU1FLAotICAgICAgICAgICAgICAgICAgICAuc2l6ZSA9IHNpemVvZihURVNUX05B TUUpLAotICAgICAgICAgICAgICAgIH0sCi0gICAgICAgICAgICB9LAotICAgICAgICB9LAogICAg IH07CiAKKyAgICBvcC51LmxpdmVwYXRjaC5jbWQgPSBYRU5fU1lTQ1RMX0xJVkVQQVRDSF9HRVQ7 CisgICAgb3AudS5saXZlcGF0Y2gudS5nZXQubmFtZS5uYW1lLnAgPSBURVNUX05BTUU7CisgICAg b3AudS5saXZlcGF0Y2gudS5nZXQubmFtZS5zaXplID0gc2l6ZW9mKFRFU1RfTkFNRSk7CisKICAg ICBjaGVja19yZXQoX19mdW5jX18sIGh5cGVyY2FsbF9zeXNjdGwoJm9wKSk7CiB9CiAKIHN0YXRp YyB2b2lkIHRlc3RfYWN0aW9uKHVpbnQzMl90IGFjdGlvbikKIHsKLSAgICB4ZW5fc3lzY3RsX3Qg b3AgPQotICAgIHsKKyAgICB4ZW5fc3lzY3RsX3Qgb3AgPSB7CiAgICAgICAgIC5jbWQgPSBYRU5f U1lTQ1RMX2xpdmVwYXRjaF9vcCwKICAgICAgICAgLmludGVyZmFjZV92ZXJzaW9uID0gc3lzY3Rs X2ludGVyZmFjZV92ZXJzaW9uLAotICAgICAgICAudS5saXZlcGF0Y2ggPSB7Ci0gICAgICAgICAg ICAuY21kID0gWEVOX1NZU0NUTF9MSVZFUEFUQ0hfQUNUSU9OLAotICAgICAgICAgICAgLnUuYWN0 aW9uID0gewotICAgICAgICAgICAgICAgIC5uYW1lID0gewotICAgICAgICAgICAgICAgICAgICAu bmFtZS5wID0gVEVTVF9OQU1FLAotICAgICAgICAgICAgICAgICAgICAuc2l6ZSA9IHNpemVvZihU RVNUX05BTUUpLAotICAgICAgICAgICAgICAgIH0sCi0gICAgICAgICAgICAgICAgLmNtZCA9IGFj dGlvbiwKLSAgICAgICAgICAgICAgICAudGltZW91dCA9IDAsCi0gICAgICAgICAgICB9LAotICAg ICAgICB9LAogICAgIH07CiAKKyAgICBvcC51LmxpdmVwYXRjaC5jbWQgPSBYRU5fU1lTQ1RMX0xJ VkVQQVRDSF9BQ1RJT047CisgICAgb3AudS5saXZlcGF0Y2gudS5hY3Rpb24ubmFtZS5uYW1lLnAg PSBURVNUX05BTUU7CisgICAgb3AudS5saXZlcGF0Y2gudS5hY3Rpb24ubmFtZS5zaXplID0gc2l6 ZW9mKFRFU1RfTkFNRSk7CisgICAgb3AudS5saXZlcGF0Y2gudS5hY3Rpb24uY21kID0gYWN0aW9u OworICAgIG9wLnUubGl2ZXBhdGNoLnUuYWN0aW9uLnRpbWVvdXQgPSAwOworCiAgICAgY2hlY2tf cmV0KF9fZnVuY19fLCBoeXBlcmNhbGxfc3lzY3RsKCZvcCkpOwogfQogCi0tIAoyLjEuNAoKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBt YWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3Jn L3hlbi1kZXZlbAo=