From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Durrant Subject: [PATCH v5 04/11] viridian: make 'fields' struct anonymous... Date: Mon, 11 Mar 2019 13:41:25 +0000 Message-ID: <20190311134132.20536-5-paul.durrant@citrix.com> References: <20190311134132.20536-1-paul.durrant@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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 ) id 1h3LBZ-00006Q-Uf for xen-devel@lists.xenproject.org; Mon, 11 Mar 2019 13:41:45 +0000 In-Reply-To: <20190311134132.20536-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 , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= List-Id: xen-devel@lists.xenproject.org Li4uaW5zaWRlIHZpcmlkaWFuX3BhZ2VfbXNyIGFuZCB2aXJpZGlhbl9ndWVzdF9vc19pZF9tc3Ig dW5pb25zLgoKVGhlcmUncyBubyBuZWVkIHRvIG5hbWUgaXQgYW5kIHRoZSBjb2RlIGlzIHNob3J0 ZW5lZCBieSBub3QgZG9pbmcgc28uCk5vIGZ1bmN0aW9uYWwgY2hhbmdlLgoKU2lnbmVkLW9mZi1i eTogUGF1bCBEdXJyYW50IDxwYXVsLmR1cnJhbnRAY2l0cml4LmNvbT4KLS0tCkNjOiBKYW4gQmV1 bGljaCA8amJldWxpY2hAc3VzZS5jb20+CkNjOiBBbmRyZXcgQ29vcGVyIDxhbmRyZXcuY29vcGVy M0BjaXRyaXguY29tPgpDYzogV2VpIExpdSA8d2VpLmxpdTJAY2l0cml4LmNvbT4KQ2M6ICJSb2dl ciBQYXUgTW9ubsOpIiA8cm9nZXIucGF1QGNpdHJpeC5jb20+Cgp2NDoKIC0gTmV3IGluIHY0Ci0t LQogeGVuL2FyY2gveDg2L2h2bS92aXJpZGlhbi9zeW5pYy5jICAgIHwgIDQgKystLQogeGVuL2Fy Y2gveDg2L2h2bS92aXJpZGlhbi90aW1lLmMgICAgIHwgMTAgKysrKystLS0tLQogeGVuL2FyY2gv eDg2L2h2bS92aXJpZGlhbi92aXJpZGlhbi5jIHwgMjAgKysrKysrKysrLS0tLS0tLS0tLS0KIHhl bi9pbmNsdWRlL2FzbS14ODYvaHZtL3ZpcmlkaWFuLmggICB8ICA0ICsrLS0KIDQgZmlsZXMgY2hh bmdlZCwgMTggaW5zZXJ0aW9ucygrKSwgMjAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEveGVu L2FyY2gveDg2L2h2bS92aXJpZGlhbi9zeW5pYy5jIGIveGVuL2FyY2gveDg2L2h2bS92aXJpZGlh bi9zeW5pYy5jCmluZGV4IGYzZDlmN2FlNzQuLjA1ZDk3MWIzNjUgMTAwNjQ0Ci0tLSBhL3hlbi9h cmNoL3g4Ni9odm0vdmlyaWRpYW4vc3luaWMuYworKysgYi94ZW4vYXJjaC94ODYvaHZtL3Zpcmlk aWFuL3N5bmljLmMKQEAgLTEwMiw3ICsxMDIsNyBAQCBpbnQgdmlyaWRpYW5fc3luaWNfd3Jtc3Io c3RydWN0IHZjcHUgKnYsIHVpbnQzMl90IGlkeCwgdWludDY0X3QgdmFsKQogICAgICAgICB2aXJp ZGlhbl91bm1hcF9ndWVzdF9wYWdlKCZ2di0+dnBfYXNzaXN0KTsKICAgICAgICAgdnYtPnZwX2Fz c2lzdC5tc3IucmF3ID0gdmFsOwogICAgICAgICB2aXJpZGlhbl9kdW1wX2d1ZXN0X3BhZ2Uodiwg IlZQX0FTU0lTVCIsICZ2di0+dnBfYXNzaXN0KTsKLSAgICAgICAgaWYgKCB2di0+dnBfYXNzaXN0 Lm1zci5maWVsZHMuZW5hYmxlZCApCisgICAgICAgIGlmICggdnYtPnZwX2Fzc2lzdC5tc3IuZW5h YmxlZCApCiAgICAgICAgICAgICB2aXJpZGlhbl9tYXBfZ3Vlc3RfcGFnZSh2LCAmdnYtPnZwX2Fz c2lzdCk7CiAgICAgICAgIGJyZWFrOwogCkBAIC0xNjEsNyArMTYxLDcgQEAgdm9pZCB2aXJpZGlh bl9zeW5pY19sb2FkX3ZjcHVfY3R4dCgKICAgICBzdHJ1Y3QgdmlyaWRpYW5fdmNwdSAqdnYgPSB2 LT5hcmNoLmh2bS52aXJpZGlhbjsKIAogICAgIHZ2LT52cF9hc3Npc3QubXNyLnJhdyA9IGN0eHQt PnZwX2Fzc2lzdF9tc3I7Ci0gICAgaWYgKCB2di0+dnBfYXNzaXN0Lm1zci5maWVsZHMuZW5hYmxl ZCApCisgICAgaWYgKCB2di0+dnBfYXNzaXN0Lm1zci5lbmFibGVkICkKICAgICAgICAgdmlyaWRp YW5fbWFwX2d1ZXN0X3BhZ2UodiwgJnZ2LT52cF9hc3Npc3QpOwogCiAgICAgdnYtPmFwaWNfYXNz aXN0X3BlbmRpbmcgPSBjdHh0LT5hcGljX2Fzc2lzdF9wZW5kaW5nOwpkaWZmIC0tZ2l0IGEveGVu L2FyY2gveDg2L2h2bS92aXJpZGlhbi90aW1lLmMgYi94ZW4vYXJjaC94ODYvaHZtL3ZpcmlkaWFu L3RpbWUuYwppbmRleCA3NmY5NjEyMDAxLi45MDlhM2ZiOWUzIDEwMDY0NAotLS0gYS94ZW4vYXJj aC94ODYvaHZtL3ZpcmlkaWFuL3RpbWUuYworKysgYi94ZW4vYXJjaC94ODYvaHZtL3ZpcmlkaWFu L3RpbWUuYwpAQCAtMjksMTYgKzI5LDE2IEBAIHN0YXRpYyB2b2lkIGR1bXBfcmVmZXJlbmNlX3Rz Yyhjb25zdCBzdHJ1Y3QgZG9tYWluICpkKQogewogICAgIGNvbnN0IHVuaW9uIHZpcmlkaWFuX3Bh Z2VfbXNyICpydCA9ICZkLT5hcmNoLmh2bS52aXJpZGlhbi0+cmVmZXJlbmNlX3RzYzsKIAotICAg IGlmICggIXJ0LT5maWVsZHMuZW5hYmxlZCApCisgICAgaWYgKCAhcnQtPmVuYWJsZWQgKQogICAg ICAgICByZXR1cm47CiAKICAgICBwcmludGsoWEVOTE9HX0dfSU5GTyAiZCVkOiBWSVJJRElBTiBS RUZFUkVOQ0VfVFNDOiBwZm46ICVseFxuIiwKLSAgICAgICAgICAgZC0+ZG9tYWluX2lkLCAodW5z aWduZWQgbG9uZylydC0+ZmllbGRzLnBmbik7CisgICAgICAgICAgIGQtPmRvbWFpbl9pZCwgKHVu c2lnbmVkIGxvbmcpcnQtPnBmbik7CiB9CiAKIHN0YXRpYyB2b2lkIHVwZGF0ZV9yZWZlcmVuY2Vf dHNjKHN0cnVjdCBkb21haW4gKmQsIGJvb2wgaW5pdGlhbGl6ZSkKIHsKLSAgICB1bnNpZ25lZCBs b25nIGdtZm4gPSBkLT5hcmNoLmh2bS52aXJpZGlhbi0+cmVmZXJlbmNlX3RzYy5maWVsZHMucGZu OworICAgIHVuc2lnbmVkIGxvbmcgZ21mbiA9IGQtPmFyY2guaHZtLnZpcmlkaWFuLT5yZWZlcmVu Y2VfdHNjLnBmbjsKICAgICBzdHJ1Y3QgcGFnZV9pbmZvICpwYWdlID0gZ2V0X3BhZ2VfZnJvbV9n Zm4oZCwgZ21mbiwgTlVMTCwgUDJNX0FMTE9DKTsKICAgICBIVl9SRUZFUkVOQ0VfVFNDX1BBR0Ug KnA7CiAKQEAgLTE1MSw3ICsxNTEsNyBAQCBpbnQgdmlyaWRpYW5fdGltZV93cm1zcihzdHJ1Y3Qg dmNwdSAqdiwgdWludDMyX3QgaWR4LCB1aW50NjRfdCB2YWwpCiAKICAgICAgICAgdmQtPnJlZmVy ZW5jZV90c2MucmF3ID0gdmFsOwogICAgICAgICBkdW1wX3JlZmVyZW5jZV90c2MoZCk7Ci0gICAg ICAgIGlmICggdmQtPnJlZmVyZW5jZV90c2MuZmllbGRzLmVuYWJsZWQgKQorICAgICAgICBpZiAo IHZkLT5yZWZlcmVuY2VfdHNjLmVuYWJsZWQgKQogICAgICAgICAgICAgdXBkYXRlX3JlZmVyZW5j ZV90c2MoZCwgdHJ1ZSk7CiAgICAgICAgIGJyZWFrOwogCkBAIC0yMzIsNyArMjMyLDcgQEAgdm9p ZCB2aXJpZGlhbl90aW1lX2xvYWRfZG9tYWluX2N0eHQoCiAgICAgdmQtPnRpbWVfcmVmX2NvdW50 LnZhbCA9IGN0eHQtPnRpbWVfcmVmX2NvdW50OwogICAgIHZkLT5yZWZlcmVuY2VfdHNjLnJhdyA9 IGN0eHQtPnJlZmVyZW5jZV90c2M7CiAKLSAgICBpZiAoIHZkLT5yZWZlcmVuY2VfdHNjLmZpZWxk cy5lbmFibGVkICkKKyAgICBpZiAoIHZkLT5yZWZlcmVuY2VfdHNjLmVuYWJsZWQgKQogICAgICAg ICB1cGRhdGVfcmVmZXJlbmNlX3RzYyhkLCBmYWxzZSk7CiB9CiAKZGlmZiAtLWdpdCBhL3hlbi9h cmNoL3g4Ni9odm0vdmlyaWRpYW4vdmlyaWRpYW4uYyBiL3hlbi9hcmNoL3g4Ni9odm0vdmlyaWRp YW4vdmlyaWRpYW4uYwppbmRleCA3MTA0NzBmZWQ3Li4xYTIwZDY4YWFmIDEwMDY0NAotLS0gYS94 ZW4vYXJjaC94ODYvaHZtL3ZpcmlkaWFuL3ZpcmlkaWFuLmMKKysrIGIveGVuL2FyY2gveDg2L2h2 bS92aXJpZGlhbi92aXJpZGlhbi5jCkBAIC0xOTIsNyArMTkyLDcgQEAgdm9pZCBjcHVpZF92aXJp ZGlhbl9sZWF2ZXMoY29uc3Qgc3RydWN0IHZjcHUgKnYsIHVpbnQzMl90IGxlYWYsCiAKICAgICBj YXNlIDQ6CiAgICAgICAgIC8qIFJlY29tbWVuZGVkIGh5cGVyY2FsbCB1c2FnZS4gKi8KLSAgICAg ICAgaWYgKCB2ZC0+Z3Vlc3Rfb3NfaWQucmF3ID09IDAgfHwgdmQtPmd1ZXN0X29zX2lkLmZpZWxk cy5vcyA8IDQgKQorICAgICAgICBpZiAoIHZkLT5ndWVzdF9vc19pZC5yYXcgPT0gMCB8fCB2ZC0+ Z3Vlc3Rfb3NfaWQub3MgPCA0ICkKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICByZXMtPmEg PSBDUFVJRDRBX1JFTEFYX1RJTUVSX0lOVDsKICAgICAgICAgaWYgKCB2aXJpZGlhbl9mZWF0dXJl X21hc2soZCkgJiBIVk1QVl9oY2FsbF9yZW1vdGVfdGxiX2ZsdXNoICkKQEAgLTIyOCwxMCArMjI4 LDggQEAgc3RhdGljIHZvaWQgZHVtcF9ndWVzdF9vc19pZChjb25zdCBzdHJ1Y3QgZG9tYWluICpk KQogCiAgICAgcHJpbnRrKFhFTkxPR19HX0lORk8KICAgICAgICAgICAgImQlZDogVklSSURJQU4g R1VFU1RfT1NfSUQ6IHZlbmRvcjogJXggb3M6ICV4IG1ham9yOiAleCBtaW5vcjogJXggc3A6ICV4 IGJ1aWxkOiAleFxuIiwKLSAgICAgICAgICAgZC0+ZG9tYWluX2lkLAotICAgICAgICAgICBnb2kt PmZpZWxkcy52ZW5kb3IsIGdvaS0+ZmllbGRzLm9zLAotICAgICAgICAgICBnb2ktPmZpZWxkcy5t YWpvciwgZ29pLT5maWVsZHMubWlub3IsCi0gICAgICAgICAgIGdvaS0+ZmllbGRzLnNlcnZpY2Vf cGFjaywgZ29pLT5maWVsZHMuYnVpbGRfbnVtYmVyKTsKKyAgICAgICAgICAgZC0+ZG9tYWluX2lk LCBnb2ktPnZlbmRvciwgZ29pLT5vcywgZ29pLT5tYWpvciwgZ29pLT5taW5vciwKKyAgICAgICAg ICAgZ29pLT5zZXJ2aWNlX3BhY2ssIGdvaS0+YnVpbGRfbnVtYmVyKTsKIH0KIAogc3RhdGljIHZv aWQgZHVtcF9oeXBlcmNhbGwoY29uc3Qgc3RydWN0IGRvbWFpbiAqZCkKQEAgLTI0MiwxMiArMjQw LDEyIEBAIHN0YXRpYyB2b2lkIGR1bXBfaHlwZXJjYWxsKGNvbnN0IHN0cnVjdCBkb21haW4gKmQp CiAKICAgICBwcmludGsoWEVOTE9HX0dfSU5GTyAiZCVkOiBWSVJJRElBTiBIWVBFUkNBTEw6IGVu YWJsZWQ6ICV4IHBmbjogJWx4XG4iLAogICAgICAgICAgICBkLT5kb21haW5faWQsCi0gICAgICAg ICAgIGhnLT5maWVsZHMuZW5hYmxlZCwgKHVuc2lnbmVkIGxvbmcpaGctPmZpZWxkcy5wZm4pOwor ICAgICAgICAgICBoZy0+ZW5hYmxlZCwgKHVuc2lnbmVkIGxvbmcpaGctPnBmbik7CiB9CiAKIHN0 YXRpYyB2b2lkIGVuYWJsZV9oeXBlcmNhbGxfcGFnZShzdHJ1Y3QgZG9tYWluICpkKQogewotICAg IHVuc2lnbmVkIGxvbmcgZ21mbiA9IGQtPmFyY2guaHZtLnZpcmlkaWFuLT5oeXBlcmNhbGxfZ3Bh LmZpZWxkcy5wZm47CisgICAgdW5zaWduZWQgbG9uZyBnbWZuID0gZC0+YXJjaC5odm0udmlyaWRp YW4tPmh5cGVyY2FsbF9ncGEucGZuOwogICAgIHN0cnVjdCBwYWdlX2luZm8gKnBhZ2UgPSBnZXRf cGFnZV9mcm9tX2dmbihkLCBnbWZuLCBOVUxMLCBQMk1fQUxMT0MpOwogICAgIHVpbnQ4X3QgKnA7 CiAKQEAgLTI5Nyw3ICsyOTUsNyBAQCBpbnQgZ3Vlc3Rfd3Jtc3JfdmlyaWRpYW4oc3RydWN0IHZj cHUgKnYsIHVpbnQzMl90IGlkeCwgdWludDY0X3QgdmFsKQogICAgIGNhc2UgSFZfWDY0X01TUl9I WVBFUkNBTEw6CiAgICAgICAgIHZkLT5oeXBlcmNhbGxfZ3BhLnJhdyA9IHZhbDsKICAgICAgICAg ZHVtcF9oeXBlcmNhbGwoZCk7Ci0gICAgICAgIGlmICggdmQtPmh5cGVyY2FsbF9ncGEuZmllbGRz LmVuYWJsZWQgKQorICAgICAgICBpZiAoIHZkLT5oeXBlcmNhbGxfZ3BhLmVuYWJsZWQgKQogICAg ICAgICAgICAgZW5hYmxlX2h5cGVyY2FsbF9wYWdlKGQpOwogICAgICAgICBicmVhazsKIApAQCAt NjA2LDE3ICs2MDQsMTcgQEAgb3V0Ogogdm9pZCB2aXJpZGlhbl9kdW1wX2d1ZXN0X3BhZ2UoY29u c3Qgc3RydWN0IHZjcHUgKnYsIGNvbnN0IGNoYXIgKm5hbWUsCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBjb25zdCBzdHJ1Y3QgdmlyaWRpYW5fcGFnZSAqdnApCiB7Ci0gICAgaWYgKCAh dnAtPm1zci5maWVsZHMuZW5hYmxlZCApCisgICAgaWYgKCAhdnAtPm1zci5lbmFibGVkICkKICAg ICAgICAgcmV0dXJuOwogCiAgICAgcHJpbnRrKFhFTkxPR19HX0lORk8gIiVwdjogVklSSURJQU4g JXM6IHBmbjogJWx4XG4iLAotICAgICAgICAgICB2LCBuYW1lLCAodW5zaWduZWQgbG9uZyl2cC0+ bXNyLmZpZWxkcy5wZm4pOworICAgICAgICAgICB2LCBuYW1lLCAodW5zaWduZWQgbG9uZyl2cC0+ bXNyLnBmbik7CiB9CiAKIHZvaWQgdmlyaWRpYW5fbWFwX2d1ZXN0X3BhZ2UoY29uc3Qgc3RydWN0 IHZjcHUgKnYsIHN0cnVjdCB2aXJpZGlhbl9wYWdlICp2cCkKIHsKICAgICBzdHJ1Y3QgZG9tYWlu ICpkID0gdi0+ZG9tYWluOwotICAgIHVuc2lnbmVkIGxvbmcgZ21mbiA9IHZwLT5tc3IuZmllbGRz LnBmbjsKKyAgICB1bnNpZ25lZCBsb25nIGdtZm4gPSB2cC0+bXNyLnBmbjsKICAgICBzdHJ1Y3Qg cGFnZV9pbmZvICpwYWdlOwogCiAgICAgaWYgKCB2cC0+cHRyICkKZGlmZiAtLWdpdCBhL3hlbi9p bmNsdWRlL2FzbS14ODYvaHZtL3ZpcmlkaWFuLmggYi94ZW4vaW5jbHVkZS9hc20teDg2L2h2bS92 aXJpZGlhbi5oCmluZGV4IGM1NjI0MjQzMzIuLmFiYmJiMzYwOTIgMTAwNjQ0Ci0tLSBhL3hlbi9p bmNsdWRlL2FzbS14ODYvaHZtL3ZpcmlkaWFuLmgKKysrIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9o dm0vdmlyaWRpYW4uaApAQCAtMTcsNyArMTcsNyBAQCB1bmlvbiB2aXJpZGlhbl9wYWdlX21zcgog ICAgICAgICB1aW50NjRfdCBlbmFibGVkOjE7CiAgICAgICAgIHVpbnQ2NF90IHJlc2VydmVkX3By ZXNlcnZlZDoxMTsKICAgICAgICAgdWludDY0X3QgcGZuOjQ4OwotICAgIH0gZmllbGRzOworICAg IH07CiB9OwogCiBzdHJ1Y3QgdmlyaWRpYW5fcGFnZQpAQCAtNDQsNyArNDQsNyBAQCB1bmlvbiB2 aXJpZGlhbl9ndWVzdF9vc19pZF9tc3IKICAgICAgICAgdWludDY0X3QgbWFqb3I6ODsKICAgICAg ICAgdWludDY0X3Qgb3M6ODsKICAgICAgICAgdWludDY0X3QgdmVuZG9yOjE2OwotICAgIH0gZmll bGRzOworICAgIH07CiB9OwogCiBzdHJ1Y3QgdmlyaWRpYW5fdGltZV9yZWZfY291bnQKLS0gCjIu MjAuMQoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhl bi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBz Oi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw=