From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH v2 2/5] xen/common: Use %*pb[l] instead of {cpu, node}mask_scn{, list}printf() Date: Mon, 22 Oct 2018 13:57:59 +0100 Message-ID: <1540213082-616-3-git-send-email-andrew.cooper3@citrix.com> References: <1540213082-616-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: <1540213082-616-1-git-send-email-andrew.cooper3@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: Xen-devel Cc: Andrew Cooper , Julien Grall , Stefano Stabellini , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= List-Id: xen-devel@lists.xenproject.org VGhpcyByZW1vdmVzIGFsbCB1c2Ugb2Yga2V5aGFuZGxlcl9zY3JhdGNoIGFzIGEgYm91bmNlLWJ1 ZmZlciBmb3IgdGhlIHJlbmRlcmVkCnN0cmluZy4gIEluIHNvbWUgY2FzZXMsIGNvbGxhcHNlIGNv bWJpbmUgYWRqYWNlbnQgcHJpbnRrKCkncyB3aGljaCBhcmUgd3JpdGluZwpwYXJ0cyBvZiB0aGUg c2FtZSBsaW5lLgoKTm8gZnVuY3Rpb25hbCBjaGFuZ2UuCgpTaWduZWQtb2ZmLWJ5OiBBbmRyZXcg Q29vcGVyIDxhbmRyZXcuY29vcGVyM0BjaXRyaXguY29tPgpSZXZpZXdlZC1ieTogV2VpIExpdSA8 d2VpLmxpdTJAY2l0cml4LmNvbT4KQWNrZWQtYnk6IEphbiBCZXVsaWNoIDxqYmV1bGljaEBzdXNl LmNvbT4KQWNrZWQtYnk6IEp1ZXJnZW4gR3Jvc3MgPGpncm9zc0BzdXNlLmNvbT4KLS0tCkNDOiBS b2dlciBQYXUgTW9ubsOpIDxyb2dlci5wYXVAY2l0cml4LmNvbT4KQ0M6IFN0ZWZhbm8gU3RhYmVs bGluaSA8c3N0YWJlbGxpbmlAa2VybmVsLm9yZz4KQ0M6IEp1bGllbiBHcmFsbCA8anVsaWVuLmdy YWxsQGFybS5jb20+Cgp2MjoKICogVXNlIC0+Yml0cyBmb3IgY3B1bWFza3MKLS0tCiB4ZW4vY29t bW9uL2NwdXBvb2wuYyAgICAgICB8IDEyICsrKy0tLS0tLS0tLQogeGVuL2NvbW1vbi9ldmVudF9j aGFubmVsLmMgfCAgNiArKy0tLS0KIHhlbi9jb21tb24va2V5aGFuZGxlci5jICAgIHwgMzUgKysr KysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMTQgaW5z ZXJ0aW9ucygrKSwgMzkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEveGVuL2NvbW1vbi9jcHVw b29sLmMgYi94ZW4vY29tbW9uL2NwdXBvb2wuYwppbmRleCAxZThlZGNiLi4xMjFmY2ZjIDEwMDY0 NAotLS0gYS94ZW4vY29tbW9uL2NwdXBvb2wuYworKysgYi94ZW4vY29tbW9uL2NwdXBvb2wuYwpA QCAtNzMyLDEyICs3MzIsNiBAQCBpbnQgY3B1cG9vbF9kb19zeXNjdGwoc3RydWN0IHhlbl9zeXNj dGxfY3B1cG9vbF9vcCAqb3ApCiAgICAgcmV0dXJuIHJldDsKIH0KIAotc3RhdGljIHZvaWQgcHJp bnRfY3B1bWFwKGNvbnN0IGNoYXIgKnN0ciwgY29uc3QgY3B1bWFza190ICptYXApCi17Ci0gICAg Y3B1bGlzdF9zY25wcmludGYoa2V5aGFuZGxlcl9zY3JhdGNoLCBzaXplb2Yoa2V5aGFuZGxlcl9z Y3JhdGNoKSwgbWFwKTsKLSAgICBwcmludGsoIiVzOiAlc1xuIiwgc3RyLCBrZXloYW5kbGVyX3Nj cmF0Y2gpOwotfQotCiB2b2lkIGR1bXBfcnVucSh1bnNpZ25lZCBjaGFyIGtleSkKIHsKICAgICB1 bnNpZ25lZCBsb25nICAgIGZsYWdzOwpAQCAtNzUxLDE3ICs3NDUsMTcgQEAgdm9pZCBkdW1wX3J1 bnEodW5zaWduZWQgY2hhciBrZXkpCiAgICAgICAgICAgICBzY2hlZF9zbXRfcG93ZXJfc2F2aW5n cz8gImVuYWJsZWQiOiJkaXNhYmxlZCIpOwogICAgIHByaW50aygiTk9XPSUiUFJJX3N0aW1lIlxu Iiwgbm93KTsKIAotICAgIHByaW50X2NwdW1hcCgiT25saW5lIENwdXMiLCAmY3B1X29ubGluZV9t YXApOworICAgIHByaW50aygiT25saW5lIENwdXM6ICUqcGJsXG4iLCBucl9jcHVfaWRzLCBjcHVf b25saW5lX21hcC5iaXRzKTsKICAgICBpZiAoICFjcHVtYXNrX2VtcHR5KCZjcHVwb29sX2ZyZWVf Y3B1cykgKQogICAgIHsKLSAgICAgICAgcHJpbnRfY3B1bWFwKCJGcmVlIENwdXMiLCAmY3B1cG9v bF9mcmVlX2NwdXMpOworICAgICAgICBwcmludGsoIkZyZWUgQ3B1czogJSpwYmxcbiIsIG5yX2Nw dV9pZHMsIGNwdXBvb2xfZnJlZV9jcHVzLmJpdHMpOwogICAgICAgICBzY2hlZHVsZV9kdW1wKE5V TEwpOwogICAgIH0KIAogICAgIGZvcl9lYWNoX2NwdXBvb2woYykKICAgICB7CiAgICAgICAgIHBy aW50aygiQ3B1cG9vbCAlZDpcbiIsICgqYyktPmNwdXBvb2xfaWQpOwotICAgICAgICBwcmludF9j cHVtYXAoIkNwdXMiLCAoKmMpLT5jcHVfdmFsaWQpOworICAgICAgICBwcmludGsoIkNwdXM6ICUq cGJsXG4iLCBucl9jcHVfaWRzLCAoKmMpLT5jcHVfdmFsaWQtPmJpdHMpOwogICAgICAgICBzY2hl ZHVsZV9kdW1wKCpjKTsKICAgICB9CiAKZGlmZiAtLWdpdCBhL3hlbi9jb21tb24vZXZlbnRfY2hh bm5lbC5jIGIveGVuL2NvbW1vbi9ldmVudF9jaGFubmVsLmMKaW5kZXggMzgxZjMwZS4uZjM0ZDRm MCAxMDA2NDQKLS0tIGEveGVuL2NvbW1vbi9ldmVudF9jaGFubmVsLmMKKysrIGIveGVuL2NvbW1v bi9ldmVudF9jaGFubmVsLmMKQEAgLTEzNzcsMTEgKzEzNzcsOSBAQCBzdGF0aWMgdm9pZCBkb21h aW5fZHVtcF9ldnRjaG5faW5mbyhzdHJ1Y3QgZG9tYWluICpkKQogICAgIHVuc2lnbmVkIGludCBw b3J0OwogICAgIGludCBpcnE7CiAKLSAgICBiaXRtYXBfc2NubGlzdHByaW50ZihrZXloYW5kbGVy X3NjcmF0Y2gsIHNpemVvZihrZXloYW5kbGVyX3NjcmF0Y2gpLAotICAgICAgICAgICAgICAgICAg ICAgICAgIGQtPnBvbGxfbWFzaywgZC0+bWF4X3ZjcHVzKTsKICAgICBwcmludGsoIkV2ZW50IGNo YW5uZWwgaW5mb3JtYXRpb24gZm9yIGRvbWFpbiAlZDpcbiIKLSAgICAgICAgICAgIlBvbGxpbmcg dkNQVXM6IHslc31cbiIKLSAgICAgICAgICAgIiAgICBwb3J0IFtwL20vc11cbiIsIGQtPmRvbWFp bl9pZCwga2V5aGFuZGxlcl9zY3JhdGNoKTsKKyAgICAgICAgICAgIlBvbGxpbmcgdkNQVXM6IHsl KnBibH1cbiIKKyAgICAgICAgICAgIiAgICBwb3J0IFtwL20vc11cbiIsIGQtPmRvbWFpbl9pZCwg ZC0+bWF4X3ZjcHVzLCBkLT5wb2xsX21hc2spOwogCiAgICAgc3Bpbl9sb2NrKCZkLT5ldmVudF9s b2NrKTsKIApkaWZmIC0tZ2l0IGEveGVuL2NvbW1vbi9rZXloYW5kbGVyLmMgYi94ZW4vY29tbW9u L2tleWhhbmRsZXIuYwppbmRleCA2MGJiZWViLi40YmIyNjQzIDEwMDY0NAotLS0gYS94ZW4vY29t bW9uL2tleWhhbmRsZXIuYworKysgYi94ZW4vY29tbW9uL2tleWhhbmRsZXIuYwpAQCAtMjUwLDIy ICsyNTAsNiBAQCBzdGF0aWMgdm9pZCByZWJvb3RfbWFjaGluZSh1bnNpZ25lZCBjaGFyIGtleSwg c3RydWN0IGNwdV91c2VyX3JlZ3MgKnJlZ3MpCiAgICAgbWFjaGluZV9yZXN0YXJ0KDApOwogfQog Ci1zdGF0aWMgdm9pZCBjcHVzZXRfcHJpbnQoY2hhciAqc2V0LCBpbnQgc2l6ZSwgY29uc3QgY3B1 bWFza190ICptYXNrKQotewotICAgICpzZXQrKyA9ICd7JzsKLSAgICBzZXQgKz0gY3B1bGlzdF9z Y25wcmludGYoc2V0LCBzaXplLTIsIG1hc2spOwotICAgICpzZXQrKyA9ICd9JzsKLSAgICAqc2V0 KysgPSAnXDAnOwotfQotCi1zdGF0aWMgdm9pZCBub2Rlc2V0X3ByaW50KGNoYXIgKnNldCwgaW50 IHNpemUsIGNvbnN0IG5vZGVtYXNrX3QgKm1hc2spCi17Ci0gICAgKnNldCsrID0gJ1snOwotICAg IHNldCArPSBub2RlbGlzdF9zY25wcmludGYoc2V0LCBzaXplLTIsIG1hc2spOwotICAgICpzZXQr KyA9ICddJzsKLSAgICAqc2V0KysgPSAnXDAnOwotfQotCiBzdGF0aWMgdm9pZCBwZXJpb2RpY190 aW1lcl9wcmludChjaGFyICpzdHIsIGludCBzaXplLCB1aW50NjRfdCBwZXJpb2QpCiB7CiAgICAg aWYgKCBwZXJpb2QgPT0gMCApCkBAIC0yOTgsMTQgKzI4MiwxNCBAQCBzdGF0aWMgdm9pZCBkdW1w X2RvbWFpbnModW5zaWduZWQgY2hhciBrZXkpCiAgICAgICAgIHByb2Nlc3NfcGVuZGluZ19zb2Z0 aXJxcygpOwogCiAgICAgICAgIHByaW50aygiR2VuZXJhbCBpbmZvcm1hdGlvbiBmb3IgZG9tYWlu ICV1OlxuIiwgZC0+ZG9tYWluX2lkKTsKLSAgICAgICAgY3B1c2V0X3ByaW50KHRtcHN0ciwgc2l6 ZW9mKHRtcHN0ciksIGQtPmRpcnR5X2NwdW1hc2spOwogICAgICAgICBwcmludGsoIiAgICByZWZj bnQ9JWQgZHlpbmc9JWQgcGF1c2VfY291bnQ9JWRcbiIsCiAgICAgICAgICAgICAgICBhdG9taWNf cmVhZCgmZC0+cmVmY250KSwgZC0+aXNfZHlpbmcsCiAgICAgICAgICAgICAgICBhdG9taWNfcmVh ZCgmZC0+cGF1c2VfY291bnQpKTsKICAgICAgICAgcHJpbnRrKCIgICAgbnJfcGFnZXM9JWQgeGVu aGVhcF9wYWdlcz0lZCBzaGFyZWRfcGFnZXM9JXUgcGFnZWRfcGFnZXM9JXUgIgotICAgICAgICAg ICAgICAgImRpcnR5X2NwdXM9JXMgbWF4X3BhZ2VzPSV1XG4iLCBkLT50b3RfcGFnZXMsIGQtPnhl bmhlYXBfcGFnZXMsCi0gICAgICAgICAgICAgICAgYXRvbWljX3JlYWQoJmQtPnNocl9wYWdlcyks IGF0b21pY19yZWFkKCZkLT5wYWdlZF9wYWdlcyksCi0gICAgICAgICAgICAgICAgdG1wc3RyLCBk LT5tYXhfcGFnZXMpOworICAgICAgICAgICAgICAgImRpcnR5X2NwdXM9eyUqcGJsfSBtYXhfcGFn ZXM9JXVcbiIsCisgICAgICAgICAgICAgICBkLT50b3RfcGFnZXMsIGQtPnhlbmhlYXBfcGFnZXMs IGF0b21pY19yZWFkKCZkLT5zaHJfcGFnZXMpLAorICAgICAgICAgICAgICAgYXRvbWljX3JlYWQo JmQtPnBhZ2VkX3BhZ2VzKSwgbnJfY3B1X2lkcywgZC0+ZGlydHlfY3B1bWFzay0+Yml0cywKKyAg ICAgICAgICAgICAgIGQtPm1heF9wYWdlcyk7CiAgICAgICAgIHByaW50aygiICAgIGhhbmRsZT0l MDJ4JTAyeCUwMnglMDJ4LSUwMnglMDJ4LSUwMnglMDJ4LSIKICAgICAgICAgICAgICAgICIlMDJ4 JTAyeC0lMDJ4JTAyeCUwMnglMDJ4JTAyeCUwMnggdm1fYXNzaXN0PSUwOGx4XG4iLAogICAgICAg ICAgICAgICAgZC0+aGFuZGxlWyAwXSwgZC0+aGFuZGxlWyAxXSwgZC0+aGFuZGxlWyAyXSwgZC0+ aGFuZGxlWyAzXSwKQEAgLTMyNCw4ICszMDgsOCBAQCBzdGF0aWMgdm9pZCBkdW1wX2RvbWFpbnMo dW5zaWduZWQgY2hhciBrZXkpCiAKICAgICAgICAgZHVtcF9wYWdlZnJhbWVfaW5mbyhkKTsKIAot ICAgICAgICBub2Rlc2V0X3ByaW50KHRtcHN0ciwgc2l6ZW9mKHRtcHN0ciksICZkLT5ub2RlX2Fm ZmluaXR5KTsKLSAgICAgICAgcHJpbnRrKCJOT0RFIGFmZmluaXR5IGZvciBkb21haW4gJWQ6ICVz XG4iLCBkLT5kb21haW5faWQsIHRtcHN0cik7CisgICAgICAgIHByaW50aygiTk9ERSBhZmZpbml0 eSBmb3IgZG9tYWluICVkOiBbJSpwYmxdXG4iLAorICAgICAgICAgICAgICAgZC0+ZG9tYWluX2lk LCBNQVhfTlVNTk9ERVMsIGQtPm5vZGVfYWZmaW5pdHkuYml0cyk7CiAKICAgICAgICAgcHJpbnRr KCJWQ1BVIGluZm9ybWF0aW9uIGFuZCBjYWxsYmFja3MgZm9yIGRvbWFpbiAldTpcbiIsCiAgICAg ICAgICAgICAgICBkLT5kb21haW5faWQpOwpAQCAtMzQzLDEwICszMjcsOSBAQCBzdGF0aWMgdm9p ZCBkdW1wX2RvbWFpbnModW5zaWduZWQgY2hhciBrZXkpCiAgICAgICAgICAgICBpZiAoIHZjcHVf Y3B1X2RpcnR5KHYpICkKICAgICAgICAgICAgICAgICBwcmludGsoImRpcnR5X2NwdT0ldSIsIHYt PmRpcnR5X2NwdSk7CiAgICAgICAgICAgICBwcmludGsoIlxuIik7Ci0gICAgICAgICAgICBjcHVz ZXRfcHJpbnQodG1wc3RyLCBzaXplb2YodG1wc3RyKSwgdi0+Y3B1X2hhcmRfYWZmaW5pdHkpOwot ICAgICAgICAgICAgcHJpbnRrKCIgICAgY3B1X2hhcmRfYWZmaW5pdHk9JXMgIiwgdG1wc3RyKTsK LSAgICAgICAgICAgIGNwdXNldF9wcmludCh0bXBzdHIsIHNpemVvZih0bXBzdHIpLCB2LT5jcHVf c29mdF9hZmZpbml0eSk7Ci0gICAgICAgICAgICBwcmludGsoImNwdV9zb2Z0X2FmZmluaXR5PSVz XG4iLCB0bXBzdHIpOworICAgICAgICAgICAgcHJpbnRrKCIgICAgY3B1X2hhcmRfYWZmaW5pdHk9 eyUqcGJsfSBjcHVfc29mdF9hZmZpbml0eT17JSpwYmx9XG4iLAorICAgICAgICAgICAgICAgICAg IG5yX2NwdV9pZHMsIHYtPmNwdV9oYXJkX2FmZmluaXR5LT5iaXRzLAorICAgICAgICAgICAgICAg ICAgIG5yX2NwdV9pZHMsIHYtPmNwdV9zb2Z0X2FmZmluaXR5LT5iaXRzKTsKICAgICAgICAgICAg IHByaW50aygiICAgIHBhdXNlX2NvdW50PSVkIHBhdXNlX2ZsYWdzPSVseFxuIiwKICAgICAgICAg ICAgICAgICAgICBhdG9taWNfcmVhZCgmdi0+cGF1c2VfY291bnQpLCB2LT5wYXVzZV9mbGFncyk7 CiAgICAgICAgICAgICBhcmNoX2R1bXBfdmNwdV9pbmZvKHYpOwotLSAKMi4xLjQKCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGlu ZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnBy b2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs