From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= Subject: [PATCH v2 17/35] libxl/libxl_dom_suspend.c: used LOG*D functions Date: Fri, 2 Dec 2016 16:08:23 +0100 Message-ID: <20161202150841.31227-18-cbosdonnat@suse.com> References: <20161202150841.31227-1-cbosdonnat@suse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20161202150841.31227-1-cbosdonnat@suse.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xen.org Cc: Ian Jackson , Wei Liu , Cedric Bosdonnat List-Id: xen-devel@lists.xenproject.org RnJvbTogQ2VkcmljIEJvc2Rvbm5hdCA8Y2Jvc2Rvbm5hdEBzdXNlLmNvbT4KClVzZSBMT0cqRCBs b2dnaW5nIGZ1bmN0aW9ucyB3aGVyZSBwb3NzaWJsZSBpbnN0ZWFkIG9mIHRoZSBMT0cqIG9uZXMu CgpTaWduZWQtb2ZmLWJ5OiBDw6lkcmljIEJvc2Rvbm5hdCA8Y2Jvc2Rvbm5hdEBzdXNlLmNvbT4K QWNrZWQtYnk6IFdlaSBMaXUgPHdlaS5saXUyQGNpdHJpeC5jb20+Ci0tLQogdG9vbHMvbGlieGwv bGlieGxfZG9tX3N1c3BlbmQuYyB8IDQ1ICsrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0t LS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjIgaW5zZXJ0aW9ucygrKSwgMjMgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvdG9vbHMvbGlieGwvbGlieGxfZG9tX3N1c3BlbmQuYyBiL3Rvb2xz L2xpYnhsL2xpYnhsX2RvbV9zdXNwZW5kLmMKaW5kZXggMDY0ODkxOS4uZDI1OGExYyAxMDA2NDQK LS0tIGEvdG9vbHMvbGlieGwvbGlieGxfZG9tX3N1c3BlbmQuYworKysgYi90b29scy9saWJ4bC9s aWJ4bF9kb21fc3VzcGVuZC5jCkBAIC01NCw3ICs1NCw3IEBAIGludCBsaWJ4bF9fZG9tYWluX3N1 c3BlbmRfaW5pdChsaWJ4bF9fZWdjICplZ2MsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBkb21pZCwgcG9ydCwgJmRzcHMtPmd1ZXN0X2V2dGNobl9sb2NrZmQpOwogCiAgICAg ICAgIGlmIChkc3BzLT5ndWVzdF9ldnRjaG4ucG9ydCA8IDApIHsKLSAgICAgICAgICAgIExPRyhX QVJOLCAiU3VzcGVuZCBldmVudCBjaGFubmVsIGluaXRpYWxpemF0aW9uIGZhaWxlZCIpOworICAg ICAgICAgICAgTE9HRChXQVJOLCBkb21pZCwgIlN1c3BlbmQgZXZlbnQgY2hhbm5lbCBpbml0aWFs aXphdGlvbiBmYWlsZWQiKTsKICAgICAgICAgICAgIHJjID0gRVJST1JfRkFJTDsKICAgICAgICAg ICAgIGdvdG8gb3V0OwogICAgICAgICB9CkBAIC03Nyw3ICs3Nyw3IEBAIGludCBsaWJ4bF9fZG9t YWluX3N1c3BlbmRfZGV2aWNlX21vZGVsKGxpYnhsX19nYyAqZ2MsCiAKICAgICBzd2l0Y2ggKGxp YnhsX19kZXZpY2VfbW9kZWxfdmVyc2lvbl9ydW5uaW5nKGdjLCBkb21pZCkpIHsKICAgICBjYXNl IExJQlhMX0RFVklDRV9NT0RFTF9WRVJTSU9OX1FFTVVfWEVOX1RSQURJVElPTkFMOiB7Ci0gICAg ICAgIExPRyhERUJVRywgIlNhdmluZyBkZXZpY2UgbW9kZWwgc3RhdGUgdG8gJXMiLCBmaWxlbmFt ZSk7CisgICAgICAgIExPR0QoREVCVUcsIGRvbWlkLCAiU2F2aW5nIGRldmljZSBtb2RlbCBzdGF0 ZSB0byAlcyIsIGZpbGVuYW1lKTsKICAgICAgICAgbGlieGxfX3FlbXVfdHJhZGl0aW9uYWxfY21k KGdjLCBkb21pZCwgInNhdmUiKTsKICAgICAgICAgbGlieGxfX3dhaXRfZm9yX2RldmljZV9tb2Rl bF9kZXByZWNhdGVkKGdjLCBkb21pZCwgInBhdXNlZCIsIE5VTEwsIE5VTEwsIE5VTEwpOwogICAg ICAgICBicmVhazsKQEAgLTE1NCwxMSArMTU0LDExIEBAIHN0YXRpYyB2b2lkIGRvbWFpbl9zdXNw ZW5kX2NhbGxiYWNrX2NvbW1vbihsaWJ4bF9fZWdjICplZ2MsCiAgICAgfQogCiAgICAgaWYgKCho dm1fc19zdGF0ZSA9PSAwKSAmJiAoZHNwcy0+Z3Vlc3RfZXZ0Y2huLnBvcnQgPj0gMCkpIHsKLSAg ICAgICAgTE9HKERFQlVHLCAiaXNzdWluZyAlcyBzdXNwZW5kIHJlcXVlc3QgdmlhIGV2ZW50IGNo YW5uZWwiLAorICAgICAgICBMT0dEKERFQlVHLCBkb21pZCwgImlzc3VpbmcgJXMgc3VzcGVuZCBy ZXF1ZXN0IHZpYSBldmVudCBjaGFubmVsIiwKICAgICAgICAgICAgIGRzcHMtPnR5cGUgPT0gTElC WExfRE9NQUlOX1RZUEVfSFZNID8gIlBWSFZNIiA6ICJQViIpOwogICAgICAgICByZXQgPSB4ZW5l dnRjaG5fbm90aWZ5KENUWC0+eGNlLCBkc3BzLT5ndWVzdF9ldnRjaG4ucG9ydCk7CiAgICAgICAg IGlmIChyZXQgPCAwKSB7Ci0gICAgICAgICAgICBMT0coRVJST1IsICJ4ZW5ldnRjaG5fbm90aWZ5 IGZhaWxlZCByZXQ9JWQiLCByZXQpOworICAgICAgICAgICAgTE9HRChFUlJPUiwgZG9taWQsICJ4 ZW5ldnRjaG5fbm90aWZ5IGZhaWxlZCByZXQ9JWQiLCByZXQpOwogICAgICAgICAgICAgcmMgPSBF UlJPUl9GQUlMOwogICAgICAgICAgICAgZ290byBlcnI7CiAgICAgICAgIH0KQEAgLTE3NiwxMCAr MTc2LDEwIEBAIHN0YXRpYyB2b2lkIGRvbWFpbl9zdXNwZW5kX2NhbGxiYWNrX2NvbW1vbihsaWJ4 bF9fZWdjICplZ2MsCiAgICAgfQogCiAgICAgaWYgKGRzcHMtPnR5cGUgPT0gTElCWExfRE9NQUlO X1RZUEVfSFZNICYmICghaHZtX3B2ZHJ2IHx8IGh2bV9zX3N0YXRlKSkgewotICAgICAgICBMT0co REVCVUcsICJDYWxsaW5nIHhjX2RvbWFpbl9zaHV0ZG93biBvbiBIVk0gZG9tYWluIik7CisgICAg ICAgIExPR0QoREVCVUcsIGRvbWlkLCAiQ2FsbGluZyB4Y19kb21haW5fc2h1dGRvd24gb24gSFZN IGRvbWFpbiIpOwogICAgICAgICByZXQgPSB4Y19kb21haW5fc2h1dGRvd24oQ1RYLT54Y2gsIGRv bWlkLCBTSFVURE9XTl9zdXNwZW5kKTsKICAgICAgICAgaWYgKHJldCA8IDApIHsKLSAgICAgICAg ICAgIExPR0UoRVJST1IsICJ4Y19kb21haW5fc2h1dGRvd24gZmFpbGVkIik7CisgICAgICAgICAg ICBMT0dFRChFUlJPUiwgZG9taWQsICJ4Y19kb21haW5fc2h1dGRvd24gZmFpbGVkIik7CiAgICAg ICAgICAgICByYyA9IEVSUk9SX0ZBSUw7CiAgICAgICAgICAgICBnb3RvIGVycjsKICAgICAgICAg fQpAQCAtMTg5LDcgKzE4OSw3IEBAIHN0YXRpYyB2b2lkIGRvbWFpbl9zdXNwZW5kX2NhbGxiYWNr X2NvbW1vbihsaWJ4bF9fZWdjICplZ2MsCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBM T0coREVCVUcsICJpc3N1aW5nICVzIHN1c3BlbmQgcmVxdWVzdCB2aWEgWGVuQnVzIGNvbnRyb2wg bm9kZSIsCisgICAgTE9HRChERUJVRywgZG9taWQsICJpc3N1aW5nICVzIHN1c3BlbmQgcmVxdWVz dCB2aWEgWGVuQnVzIGNvbnRyb2wgbm9kZSIsCiAgICAgICAgIGRzcHMtPnR5cGUgPT0gTElCWExf RE9NQUlOX1RZUEVfSFZNID8gIlBWSFZNIiA6ICJQViIpOwogCiAgICAgbGlieGxfX2RvbWFpbl9w dmNvbnRyb2xfd3JpdGUoZ2MsIFhCVF9OVUxMLCBkb21pZCwgInN1c3BlbmQiKTsKQEAgLTI2MCw4 ICsyNjAsOCBAQCBzdGF0aWMgdm9pZCBkb21haW5fc3VzcGVuZF9jb21tb25fcHZjb250cm9sX3N1 c3BlbmRpbmcobGlieGxfX2VnYyAqZWdjLAogCiAgICAgICAgICAgICByYyA9IGxpYnhsX194c190 cmFuc2FjdGlvbl9jb21taXQoZ2MsICZ0KTsKICAgICAgICAgICAgIGlmICghcmMpIHsKLSAgICAg ICAgICAgICAgICBMT0coRVJST1IsCi0gICAgICAgICAgICAgICAgICAgICJndWVzdCBkaWRuJ3Qg YWNrbm93bGVkZ2Ugc3VzcGVuZCwgY2FuY2VsbGluZyByZXF1ZXN0Iik7CisgICAgICAgICAgICAg ICAgTE9HRChFUlJPUiwgZHNwcy0+ZG9taWQsCisgICAgICAgICAgICAgICAgICAgICAiZ3Vlc3Qg ZGlkbid0IGFja25vd2xlZGdlIHN1c3BlbmQsIGNhbmNlbGxpbmcgcmVxdWVzdCIpOwogICAgICAg ICAgICAgICAgIGdvdG8gZXJyOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgaWYgKHJjPDAp IGdvdG8gZXJyOwpAQCAtMjcyLDcgKzI3Miw3IEBAIHN0YXRpYyB2b2lkIGRvbWFpbl9zdXNwZW5k X2NvbW1vbl9wdmNvbnRyb2xfc3VzcGVuZGluZyhsaWJ4bF9fZWdjICplZ2MsCiAgICAgfQogCiAg ICAgYXNzZXJ0KGRvbWFpbl9zdXNwZW5kX3B2Y29udHJvbF9hY2tlZChzdGF0ZSkpOwotICAgIExP RyhERUJVRywgImd1ZXN0IGFja25vd2xlZGdlZCBzdXNwZW5kIHJlcXVlc3QiKTsKKyAgICBMT0dE KERFQlVHLCBkc3BzLT5kb21pZCwgImd1ZXN0IGFja25vd2xlZGdlZCBzdXNwZW5kIHJlcXVlc3Qi KTsKIAogICAgIGxpYnhsX194c190cmFuc2FjdGlvbl9hYm9ydChnYywgJnQpOwogICAgIGRzcHMt Pmd1ZXN0X3Jlc3BvbmRlZCA9IDE7CkBAIC0yOTEsNyArMjkxLDcgQEAgc3RhdGljIHZvaWQgZG9t YWluX3N1c3BlbmRfY29tbW9uX3dhaXRfZ3Vlc3QobGlieGxfX2VnYyAqZWdjLAogICAgIFNUQVRF X0FPX0dDKGRzcHMtPmFvKTsKICAgICBpbnQgcmM7CiAKLSAgICBMT0coREVCVUcsICJ3YWl0IGZv ciB0aGUgZ3Vlc3QgdG8gc3VzcGVuZCIpOworICAgIExPR0QoREVCVUcsIGRzcHMtPmRvbWlkLCAi d2FpdCBmb3IgdGhlIGd1ZXN0IHRvIHN1c3BlbmQiKTsKIAogICAgIHJjID0gbGlieGxfX2V2X3hz d2F0Y2hfcmVnaXN0ZXIoZ2MsICZkc3BzLT5ndWVzdF93YXRjaCwKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHN1c3BlbmRfY29tbW9uX3dhaXRfZ3Vlc3Rfd2F0Y2gsCkBAIC0z MjgsMTMgKzMyOCwxMiBAQCBzdGF0aWMgdm9pZCBzdXNwZW5kX2NvbW1vbl93YWl0X2d1ZXN0X2No ZWNrKGxpYnhsX19lZ2MgKmVnYywKIAogICAgIHJldCA9IHhjX2RvbWFpbl9nZXRpbmZvbGlzdChD VFgtPnhjaCwgZG9taWQsIDEsICZpbmZvKTsKICAgICBpZiAocmV0IDwgMCkgewotICAgICAgICBM T0dFKEVSUk9SLCAidW5hYmxlIHRvIGNoZWNrIGZvciBzdGF0dXMgb2YgZ3Vlc3QgJSJQUklkMzIi IiwgZG9taWQpOworICAgICAgICBMT0dFRChFUlJPUiwgZG9taWQsICJ1bmFibGUgdG8gY2hlY2sg Zm9yIHN0YXR1cyBvZiBndWVzdCIpOwogICAgICAgICBnb3RvIGVycjsKICAgICB9CiAKICAgICBp ZiAoIShyZXQgPT0gMSAmJiBpbmZvLmRvbWFpbiA9PSBkb21pZCkpIHsKLSAgICAgICAgTE9HRShF UlJPUiwgImd1ZXN0ICUiUFJJZDMyIiB3ZSB3ZXJlIHN1c3BlbmRpbmcgaGFzIGJlZW4gZGVzdHJv eWVkIiwKLSAgICAgICAgICAgICBkb21pZCk7CisgICAgICAgIExPR0VEKEVSUk9SLCBkb21pZCwg Imd1ZXN0IHdlIHdlcmUgc3VzcGVuZGluZyBoYXMgYmVlbiBkZXN0cm95ZWQiKTsKICAgICAgICAg Z290byBlcnI7CiAgICAgfQogCkBAIC0zNDUsMTIgKzM0NCwxMiBAQCBzdGF0aWMgdm9pZCBzdXNw ZW5kX2NvbW1vbl93YWl0X2d1ZXN0X2NoZWNrKGxpYnhsX19lZ2MgKmVnYywKICAgICBzaHV0ZG93 bl9yZWFzb24gPSAoaW5mby5mbGFncyA+PiBYRU5fRE9NSU5GX3NodXRkb3duc2hpZnQpCiAgICAg ICAgICYgWEVOX0RPTUlORl9zaHV0ZG93bm1hc2s7CiAgICAgaWYgKHNodXRkb3duX3JlYXNvbiAh PSBTSFVURE9XTl9zdXNwZW5kKSB7Ci0gICAgICAgIExPRyhERUJVRywgImd1ZXN0ICUiUFJJZDMy IiB3ZSB3ZXJlIHN1c3BlbmRpbmcgaGFzIHNodXQgZG93biIKLSAgICAgICAgICAgICIgd2l0aCB1 bmV4cGVjdGVkIHJlYXNvbiBjb2RlICVkIiwgZG9taWQsIHNodXRkb3duX3JlYXNvbik7CisgICAg ICAgIExPR0QoREVCVUcsIGRvbWlkLCAiZ3Vlc3Qgd2Ugd2VyZSBzdXNwZW5kaW5nIGhhcyBzaHV0 IGRvd24iCisgICAgICAgICAgICAgIiB3aXRoIHVuZXhwZWN0ZWQgcmVhc29uIGNvZGUgJWQiLCBz aHV0ZG93bl9yZWFzb24pOwogICAgICAgICBnb3RvIGVycjsKICAgICB9CiAKLSAgICBMT0coREVC VUcsICJndWVzdCBoYXMgc3VzcGVuZGVkIik7CisgICAgTE9HRChERUJVRywgZG9taWQsICJndWVz dCBoYXMgc3VzcGVuZGVkIik7CiAgICAgZG9tYWluX3N1c3BlbmRfY29tbW9uX2d1ZXN0X3N1c3Bl bmRlZChlZ2MsIGRzcHMpOwogICAgIHJldHVybjsKIApAQCAtMzY0LDcgKzM2Myw3IEBAIHN0YXRp YyB2b2lkIHN1c3BlbmRfY29tbW9uX3dhaXRfZ3Vlc3RfdGltZW91dChsaWJ4bF9fZWdjICplZ2Ms CiAgICAgbGlieGxfX2RvbWFpbl9zdXNwZW5kX3N0YXRlICpkc3BzID0gQ09OVEFJTkVSX09GKGV2 LCAqZHNwcywgZ3Vlc3RfdGltZW91dCk7CiAgICAgU1RBVEVfQU9fR0MoZHNwcy0+YW8pOwogICAg IGlmIChyYyA9PSBFUlJPUl9USU1FRE9VVCkgewotICAgICAgICBMT0coRVJST1IsICJndWVzdCBk aWQgbm90IHN1c3BlbmQsIHRpbWVkIG91dCIpOworICAgICAgICBMT0dEKEVSUk9SLCBkc3BzLT5k b21pZCwgImd1ZXN0IGRpZCBub3Qgc3VzcGVuZCwgdGltZWQgb3V0Iik7CiAgICAgICAgIHJjID0g RVJST1JfR1VFU1RfVElNRURPVVQ7CiAgICAgfQogICAgIGRvbWFpbl9zdXNwZW5kX2NvbW1vbl9k b25lKGVnYywgZHNwcywgcmMpOwpAQCAtMzgzLDcgKzM4Miw4IEBAIHN0YXRpYyB2b2lkIGRvbWFp bl9zdXNwZW5kX2NvbW1vbl9ndWVzdF9zdXNwZW5kZWQobGlieGxfX2VnYyAqZWdjLAogICAgIGlm IChkc3BzLT50eXBlID09IExJQlhMX0RPTUFJTl9UWVBFX0hWTSkgewogICAgICAgICByYyA9IGxp YnhsX19kb21haW5fc3VzcGVuZF9kZXZpY2VfbW9kZWwoZ2MsIGRzcHMpOwogICAgICAgICBpZiAo cmMpIHsKLSAgICAgICAgICAgIExPRyhFUlJPUiwgImxpYnhsX19kb21haW5fc3VzcGVuZF9kZXZp Y2VfbW9kZWwgZmFpbGVkIHJldD0lZCIsIHJjKTsKKyAgICAgICAgICAgIExPR0QoRVJST1IsIGRz cHMtPmRvbWlkLAorICAgICAgICAgICAgICAgICAibGlieGxfX2RvbWFpbl9zdXNwZW5kX2Rldmlj ZV9tb2RlbCBmYWlsZWQgcmV0PSVkIiwgcmMpOwogICAgICAgICAgICAgZG9tYWluX3N1c3BlbmRf Y29tbW9uX2RvbmUoZWdjLCBkc3BzLCByYyk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAg IH0KQEAgLTQ1Nyw3ICs0NTcsNyBAQCBpbnQgbGlieGxfX2RvbWFpbl9yZXN1bWUobGlieGxfX2dj ICpnYywgdWludDMyX3QgZG9taWQsIGludCBzdXNwZW5kX2NhbmNlbCkKICAgICBpbnQgcmMgPSAw OwogCiAgICAgaWYgKHhjX2RvbWFpbl9yZXN1bWUoQ1RYLT54Y2gsIGRvbWlkLCBzdXNwZW5kX2Nh bmNlbCkpIHsKLSAgICAgICAgTE9HRShFUlJPUiwgInhjX2RvbWFpbl9yZXN1bWUgZmFpbGVkIGZv ciBkb21haW4gJXUiLCBkb21pZCk7CisgICAgICAgIExPR0VEKEVSUk9SLCBkb21pZCwgInhjX2Rv bWFpbl9yZXN1bWUgZmFpbGVkIik7CiAgICAgICAgIHJjID0gRVJST1JfRkFJTDsKICAgICAgICAg Z290byBvdXQ7CiAgICAgfQpAQCAtNDcxLDE0ICs0NzEsMTMgQEAgaW50IGxpYnhsX19kb21haW5f cmVzdW1lKGxpYnhsX19nYyAqZ2MsIHVpbnQzMl90IGRvbWlkLCBpbnQgc3VzcGVuZF9jYW5jZWwp CiAgICAgaWYgKHR5cGUgPT0gTElCWExfRE9NQUlOX1RZUEVfSFZNKSB7CiAgICAgICAgIHJjID0g bGlieGxfX2RvbWFpbl9yZXN1bWVfZGV2aWNlX21vZGVsKGdjLCBkb21pZCk7CiAgICAgICAgIGlm IChyYykgewotICAgICAgICAgICAgTE9HKEVSUk9SLCAiZmFpbGVkIHRvIHJlc3VtZSBkZXZpY2Ug bW9kZWwgZm9yIGRvbWFpbiAldTolZCIsCi0gICAgICAgICAgICAgICAgZG9taWQsIHJjKTsKKyAg ICAgICAgICAgIExPR0QoRVJST1IsIGRvbWlkLCAiZmFpbGVkIHRvIHJlc3VtZSBkZXZpY2UgbW9k ZWw6JWQiLCByYyk7CiAgICAgICAgICAgICBnb3RvIG91dDsKICAgICAgICAgfQogICAgIH0KIAog ICAgIGlmICgheHNfcmVzdW1lX2RvbWFpbihDVFgtPnhzaCwgZG9taWQpKSB7Ci0gICAgICAgIExP R0UoRVJST1IsICJ4c19yZXN1bWVfZG9tYWluIGZhaWxlZCBmb3IgZG9tYWluICV1IiwgZG9taWQp OworICAgICAgICBMT0dFRChFUlJPUiwgZG9taWQsICJ4c19yZXN1bWVfZG9tYWluIGZhaWxlZCIp OwogICAgICAgICByYyA9IEVSUk9SX0ZBSUw7CiAgICAgfQogb3V0OgotLSAKMi4xMC4xCgoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1h aWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwczovL2xpc3RzLnhlbi5vcmcv eGVuLWRldmVsCg==