From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= Subject: [PATCH v2 12/35] libxl/libxl_colo_save.c: used LOG*D functions Date: Fri, 2 Dec 2016 16:08:18 +0100 Message-ID: <20161202150841.31227-13-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 bGlieGxfY29sb19zYXZlLmMgfCA0OSArKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0t LS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjUgaW5zZXJ0aW9ucygrKSwgMjQgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvdG9vbHMvbGlieGwvbGlieGxfY29sb19zYXZlLmMgYi90b29scy9s aWJ4bC9saWJ4bF9jb2xvX3NhdmUuYwppbmRleCAyNmIzYWZkLi42Mjc3NzcwIDEwMDY0NAotLS0g YS90b29scy9saWJ4bC9saWJ4bF9jb2xvX3NhdmUuYworKysgYi90b29scy9saWJ4bC9saWJ4bF9j b2xvX3NhdmUuYwpAQCAtOTAsNyArOTAsNyBAQCB2b2lkIGxpYnhsX19jb2xvX3NhdmVfc2V0dXAo bGlieGxfX2VnYyAqZWdjLCBsaWJ4bF9fY29sb19zYXZlX3N0YXRlICpjc3MpCiAgICAgU1RBVEVf QU9fR0MoZHNzLT5hbyk7CiAKICAgICBpZiAoZHNzLT50eXBlICE9IExJQlhMX0RPTUFJTl9UWVBF X0hWTSkgewotICAgICAgICBMT0coRVJST1IsICJDT0xPIG9ubHkgc3VwcG9ydHMgaHZtIG5vdyIp OworICAgICAgICBMT0dEKEVSUk9SLCBkc3MtPmRvbWlkLCAiQ09MTyBvbmx5IHN1cHBvcnRzIGh2 bSBub3ciKTsKICAgICAgICAgZ290byBvdXQ7CiAgICAgfQogCkBAIC0xMjIsOCArMTIyLDcgQEAg dm9pZCBsaWJ4bF9fY29sb19zYXZlX3NldHVwKGxpYnhsX19lZ2MgKmVnYywgbGlieGxfX2NvbG9f c2F2ZV9zdGF0ZSAqY3NzKQogICAgIGxpYnhsX19zdHJlYW1fcmVhZF9zdGFydChlZ2MsICZjc3Mt PnNycyk7CiAgICAgY3NzLT5jcHMuYW8gPSBhbzsKICAgICBpZiAoY29sb19wcm94eV9zZXR1cCgm Y3NzLT5jcHMpKSB7Ci0gICAgICAgIExPRyhFUlJPUiwgIkNPTE86IGZhaWxlZCB0byBzZXR1cCBj b2xvIHByb3h5IGZvciBndWVzdCB3aXRoIGRvbWlkICV1IiwKLSAgICAgICAgICAgIGNkcy0+ZG9t aWQpOworICAgICAgICBMT0dEKEVSUk9SLCBjZHMtPmRvbWlkLCAiQ09MTzogZmFpbGVkIHRvIHNl dHVwIGNvbG8gcHJveHkgZm9yIGd1ZXN0Iik7CiAgICAgICAgIGdvdG8gb3V0OwogICAgIH0KIApA QCAtMTU2LDggKzE1NSw3IEBAIHN0YXRpYyB2b2lkIGNvbG9fc2F2ZV9zZXR1cF9kb25lKGxpYnhs X19lZ2MgKmVnYywKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIExPRyhFUlJPUiwgIkNP TE86IGZhaWxlZCB0byBzZXR1cCBkZXZpY2UgZm9yIGd1ZXN0IHdpdGggZG9taWQgJXUiLAotICAg ICAgICBkc3MtPmRvbWlkKTsKKyAgICBMT0dEKEVSUk9SLCBkc3MtPmRvbWlkLCAiQ09MTzogZmFp bGVkIHRvIHNldHVwIGRldmljZSBmb3IgZ3Vlc3QiKTsKICAgICBjZHMtPmNhbGxiYWNrID0gY29s b19zYXZlX3NldHVwX2ZhaWxlZDsKICAgICBsaWJ4bF9fY2hlY2twb2ludF9kZXZpY2VzX3RlYXJk b3duKGVnYywgY2RzKTsKIH0KQEAgLTE3MSw4ICsxNjksOSBAQCBzdGF0aWMgdm9pZCBjb2xvX3Nh dmVfc2V0dXBfZmFpbGVkKGxpYnhsX19lZ2MgKmVnYywKICAgICBTVEFURV9BT19HQyhjZHMtPmFv KTsKIAogICAgIGlmIChyYykKLSAgICAgICAgTE9HKEVSUk9SLCAiQ09MTzogZmFpbGVkIHRvIHRl YXJkb3duIGRldmljZSBhZnRlciBzZXR1cCBmYWlsZWQiCi0gICAgICAgICAgICAiIGZvciBndWVz dCB3aXRoIGRvbWlkICV1LCByYyAlZCIsIGNkcy0+ZG9taWQsIHJjKTsKKyAgICAgICAgTE9HRChF UlJPUiwgY2RzLT5kb21pZCwKKyAgICAgICAgICAgICAiQ09MTzogZmFpbGVkIHRvIHRlYXJkb3du IGRldmljZSBhZnRlciBzZXR1cCBmYWlsZWQiCisgICAgICAgICAgICAgIiBmb3IgZ3Vlc3QsIHJj ICVkIiwgcmMpOwogCiAgICAgY2xlYW51cF9kZXZpY2Vfc3Via2luZChjZHMpOwogICAgIGRzcy0+ Y2FsbGJhY2soZWdjLCBkc3MsIHJjKTsKQEAgLTE5Miw4ICsxOTEsOSBAQCB2b2lkIGxpYnhsX19j b2xvX3NhdmVfdGVhcmRvd24obGlieGxfX2VnYyAqZWdjLAogCiAgICAgRUdDX0dDOwogCi0gICAg TE9HKFdBUk4sICJDT0xPOiBEb21haW4gc3VzcGVuZCB0ZXJtaW5hdGVkIHdpdGggcmMgJWQsIgot ICAgICAgICAiIHRlYXJkb3duIENPTE8gZGV2aWNlcy4uLiIsIHJjKTsKKyAgICBMT0dEKFdBUk4s IGRzcy0+ZG9taWQsCisgICAgICAgICAiQ09MTzogRG9tYWluIHN1c3BlbmQgdGVybWluYXRlZCB3 aXRoIHJjICVkLCIKKyAgICAgICAgICIgdGVhcmRvd24gQ09MTyBkZXZpY2VzLi4uIiwgcmMpOwog CiAgICAgbGlieGxfX3N0cmVhbV9yZWFkX2Fib3J0KGVnYywgJmNzcy0+c3JzLCAxKTsKIApAQCAt MjY4LDcgKzI2OCw3IEBAIHN0YXRpYyB2b2lkIGNvbG9fc3VzcGVuZF9wcmltYXJ5X3ZtX2RvbmUo bGlieGxfX2VnYyAqZWdjLAogICAgIEVHQ19HQzsKIAogICAgIGlmIChyYykgewotICAgICAgICBM T0coRVJST1IsICJjYW5ub3Qgc3VzcGVuZCBwcmltYXJ5IHZtIik7CisgICAgICAgIExPR0QoRVJS T1IsIGRzcy0+ZG9taWQsICJjYW5ub3Qgc3VzcGVuZCBwcmltYXJ5IHZtIik7CiAgICAgICAgIGdv dG8gb3V0OwogICAgIH0KIApAQCAtMjk0LDcgKzI5NCw3IEBAIHN0YXRpYyB2b2lkIGNvbG9fcG9z dHN1c3BlbmRfY2IobGlieGxfX2VnYyAqZWdjLAogICAgIEVHQ19HQzsKIAogICAgIGlmIChyYykg ewotICAgICAgICBMT0coRVJST1IsICJwb3N0c3VzcGVuZCBmYWlscyIpOworICAgICAgICBMT0dE KEVSUk9SLCBkc3MtPmRvbWlkLCAicG9zdHN1c3BlbmQgZmFpbHMiKTsKICAgICAgICAgZ290byBv dXQ7CiAgICAgfQogCkBAIC0zMjYsMTMgKzMyNiwxNCBAQCBzdGF0aWMgdm9pZCBjb2xvX3JlYWRf c3ZtX3N1c3BlbmRlZF9kb25lKGxpYnhsX19lZ2MgKmVnYywKICAgICBFR0NfR0M7CiAKICAgICBp ZiAoaWQgIT0gQ0hFQ0tQT0lOVF9TVk1fU1VTUEVOREVEKSB7Ci0gICAgICAgIExPRyhFUlJPUiwg ImludmFsaWQgc2VjdGlvbjogJWQsIGV4cGVjdGVkOiAlZCIsIGlkLAorICAgICAgICBMT0dEKEVS Uk9SLCBkc3MtPmRvbWlkLCAiaW52YWxpZCBzZWN0aW9uOiAlZCwgZXhwZWN0ZWQ6ICVkIiwgaWQs CiAgICAgICAgICAgICBDSEVDS1BPSU5UX1NWTV9TVVNQRU5ERUQpOwogICAgICAgICBnb3RvIG91 dDsKICAgICB9CiAKICAgICBpZiAoIWNzcy0+cGF1c2VkICYmIGxpYnhsX19xbXBfZ2V0X3JlcGxp Y2F0aW9uX2Vycm9yKGdjLCBkc3MtPmRvbWlkKSkgewotICAgICAgICBMT0coRVJST1IsICJyZXBs aWNhdGlvbiBlcnJvciBvY2N1cnMgd2hlbiBwcmltYXJ5IHZtIGlzIHJ1bm5pbmciKTsKKyAgICAg ICAgTE9HRChFUlJPUiwgZHNzLT5kb21pZCwKKyAgICAgICAgICAgICAicmVwbGljYXRpb24gZXJy b3Igb2NjdXJzIHdoZW4gcHJpbWFyeSB2bSBpcyBydW5uaW5nIik7CiAgICAgICAgIGdvdG8gb3V0 OwogICAgIH0KIApAQCAtNDA1LDcgKzQwNiw3IEBAIHN0YXRpYyB2b2lkIGNvbG9fcmVhZF9zdm1f cmVhZHlfZG9uZShsaWJ4bF9fZWdjICplZ2MsCiAgICAgRUdDX0dDOwogCiAgICAgaWYgKGlkICE9 IENIRUNLUE9JTlRfU1ZNX1JFQURZKSB7Ci0gICAgICAgIExPRyhFUlJPUiwgImludmFsaWQgc2Vj dGlvbjogJWQsIGV4cGVjdGVkOiAlZCIsIGlkLAorICAgICAgICBMT0dEKEVSUk9SLCBkc3MtPmRv bWlkLCAiaW52YWxpZCBzZWN0aW9uOiAlZCwgZXhwZWN0ZWQ6ICVkIiwgaWQsCiAgICAgICAgICAg ICBDSEVDS1BPSU5UX1NWTV9SRUFEWSk7CiAgICAgICAgIGdvdG8gb3V0OwogICAgIH0KQEAgLTQz MiwxMyArNDMzLDEzIEBAIHN0YXRpYyB2b2lkIGNvbG9fcHJlcmVzdW1lX2NiKGxpYnhsX19lZ2Mg KmVnYywKICAgICBFR0NfR0M7CiAKICAgICBpZiAocmMpIHsKLSAgICAgICAgTE9HKEVSUk9SLCAi cHJlcmVzdW1lIGZhaWxzIik7CisgICAgICAgIExPR0QoRVJST1IsIGRzcy0+ZG9taWQsICJwcmVy ZXN1bWUgZmFpbHMiKTsKICAgICAgICAgZ290byBvdXQ7CiAgICAgfQogCiAgICAgaWYgKGNzcy0+ cWRpc2tfdXNlZCAmJiAhY3NzLT5xZGlza19zZXR1cGVkKSB7CiAgICAgICAgIGlmIChsaWJ4bF9f cW1wX3N0YXJ0X3JlcGxpY2F0aW9uKGdjLCBkc3MtPmRvbWlkLCB0cnVlKSkgewotICAgICAgICAg ICAgTE9HKEVSUk9SLCAic3RhcnRpbmcgcmVwbGljYXRpb24gZmFpbHMiKTsKKyAgICAgICAgICAg IExPR0QoRVJST1IsIGRzcy0+ZG9taWQsICJzdGFydGluZyByZXBsaWNhdGlvbiBmYWlscyIpOwog ICAgICAgICAgICAgZ290byBvdXQ7CiAgICAgICAgIH0KICAgICAgICAgY3NzLT5xZGlza19zZXR1 cGVkID0gdHJ1ZTsKQEAgLTQ0NiwxNCArNDQ3LDE0IEBAIHN0YXRpYyB2b2lkIGNvbG9fcHJlcmVz dW1lX2NiKGxpYnhsX19lZ2MgKmVnYywKIAogICAgIGlmICghY3NzLT5wYXVzZWQpIHsKICAgICAg ICAgaWYgKGxpYnhsX19xbXBfZG9fY2hlY2twb2ludChnYywgZHNzLT5kb21pZCkpIHsKLSAgICAg ICAgICAgIExPRyhFUlJPUiwgImRvaW5nIGNoZWNrcG9pbnQgZmFpbHMiKTsKKyAgICAgICAgICAg IExPR0QoRVJST1IsIGRzcy0+ZG9taWQsICJkb2luZyBjaGVja3BvaW50IGZhaWxzIik7CiAgICAg ICAgICAgICBnb3RvIG91dDsKICAgICAgICAgfQogICAgIH0KIAogICAgIC8qIFJlc3VtZXMgdGhl IGRvbWFpbiBhbmQgdGhlIGRldmljZSBtb2RlbCAqLwogICAgIGlmIChsaWJ4bF9fZG9tYWluX3Jl c3VtZShnYywgZHNzLT5kb21pZCwgLyogRmFzdCBTdXNwZW5kICovMSkpIHsKLSAgICAgICAgTE9H KEVSUk9SLCAiY2Fubm90IHJlc3VtZSBwcmltYXJ5IHZtIik7CisgICAgICAgIExPR0QoRVJST1Is IGRzcy0+ZG9taWQsICJjYW5ub3QgcmVzdW1lIHByaW1hcnkgdm0iKTsKICAgICAgICAgZ290byBv dXQ7CiAgICAgfQogCkBAIC00NjQsNyArNDY1LDcgQEAgc3RhdGljIHZvaWQgY29sb19wcmVyZXN1 bWVfY2IobGlieGxfX2VnYyAqZWdjLAogICAgIGlmIChjc3MtPnBhdXNlZCkgewogICAgICAgICBy YyA9IGxpYnhsX2RvbWFpbl91bnBhdXNlKENUWCwgZHNzLT5kb21pZCk7CiAgICAgICAgIGlmIChy YykgewotICAgICAgICAgICAgTE9HKEVSUk9SLCAiY2Fubm90IHVucGF1c2UgcHJpbWFyeSB2bSIp OworICAgICAgICAgICAgTE9HRChFUlJPUiwgZHNzLT5kb21pZCwgImNhbm5vdCB1bnBhdXNlIHBy aW1hcnkgdm0iKTsKICAgICAgICAgICAgIGdvdG8gb3V0OwogICAgICAgICB9CiAgICAgICAgIGNz cy0+cGF1c2VkID0gZmFsc2U7CkBAIC00OTEsNyArNDkyLDcgQEAgc3RhdGljIHZvaWQgY29sb19y ZWFkX3N2bV9yZXN1bWVkX2RvbmUobGlieGxfX2VnYyAqZWdjLAogICAgIEVHQ19HQzsKIAogICAg IGlmIChpZCAhPSBDSEVDS1BPSU5UX1NWTV9SRVNVTUVEKSB7Ci0gICAgICAgIExPRyhFUlJPUiwg ImludmFsaWQgc2VjdGlvbjogJWQsIGV4cGVjdGVkOiAlZCIsIGlkLAorICAgICAgICBMT0dEKEVS Uk9SLCBkc3MtPmRvbWlkLCAiaW52YWxpZCBzZWN0aW9uOiAlZCwgZXhwZWN0ZWQ6ICVkIiwgaWQs CiAgICAgICAgICAgICBDSEVDS1BPSU5UX1NWTV9SRVNVTUVEKTsKICAgICAgICAgZ290byBvdXQ7 CiAgICAgfQpAQCAtNTUzLDcgKzU1NCw3IEBAIHN0YXRpYyB2b2lkIGNvbG9fcHJveHlfYXN5bmNf Y2FsbF9kb25lKGxpYnhsX19lZ2MgKmVnYywKICAgICBFR0NfR0M7CiAKICAgICBpZiAoc3RhdHVz KSB7Ci0gICAgICAgIExPRyhFUlJPUiwgImZhaWxlZCB0byB3YWl0IGZvciBuZXcgY2hlY2twb2lu dCIpOworICAgICAgICBMT0dEKEVSUk9SLCBkc3MtPmRvbWlkLCAiZmFpbGVkIHRvIHdhaXQgZm9y IG5ldyBjaGVja3BvaW50Iik7CiAgICAgICAgIGNvbG9fc3RhcnRfbmV3X2NoZWNrcG9pbnQoZWdj LCAmZHNzLT5jZHMsIEVSUk9SX0ZBSUwpOwogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtNTk1 LDcgKzU5Niw3IEBAIHN0YXRpYyB2b2lkIGNvbG9fZGV2aWNlX2NvbW1pdF9jYihsaWJ4bF9fZWdj ICplZ2MsCiAgICAgRUdDX0dDOwogCiAgICAgaWYgKHJjKSB7Ci0gICAgICAgIExPRyhFUlJPUiwg ImNvbW1pdCBmYWlscyIpOworICAgICAgICBMT0dEKEVSUk9SLCBkc3MtPmRvbWlkLCAiY29tbWl0 IGZhaWxzIik7CiAgICAgICAgIGdvdG8gb3V0OwogICAgIH0KIApAQCAtNjQ0LDcgKzY0NSw3IEBA IHN0YXRpYyB2b2lkIGNvbG9fY29tbW9uX3dyaXRlX3N0cmVhbV9kb25lKGxpYnhsX19lZ2MgKmVn YywKIAogICAgIGlmIChyYyA8IDApIHsKICAgICAgICAgLyogVE9ETzogaXQgbWF5IGJlIGEgaW50 ZXJuYWwgZXJyb3IsIGJ1dCB3ZSBkb24ndCBrbm93ICovCi0gICAgICAgIExPRyhFUlJPUiwgInNl bmRpbmcgZGF0YSBmYWlscyIpOworICAgICAgICBMT0dEKEVSUk9SLCBkc3MtPmRvbWlkLCAic2Vu ZGluZyBkYXRhIGZhaWxzIik7CiAgICAgICAgIG9rID0gMDsKICAgICAgICAgZ290byBvdXQ7CiAg ICAgfQpAQCAtNjc1LDcgKzY3Niw3IEBAIHN0YXRpYyB2b2lkIGNvbG9fY29tbW9uX3JlYWRfc3Ry ZWFtX2RvbmUobGlieGxfX2VnYyAqZWdjLAogCiAgICAgaWYgKHJjIDwgMCkgewogICAgICAgICAv KiBUT0RPOiBpdCBtYXkgYmUgYSBpbnRlcm5hbCBlcnJvciwgYnV0IHdlIGRvbid0IGtub3cgKi8K LSAgICAgICAgTE9HKEVSUk9SLCAicmVhZGluZyBkYXRhIGZhaWxzIik7CisgICAgICAgIExPR0Qo RVJST1IsIGRzcy0+ZG9taWQsICJyZWFkaW5nIGRhdGEgZmFpbHMiKTsKICAgICAgICAgb2sgPSAw OwogICAgICAgICBnb3RvIG91dDsKICAgICB9Ci0tIAoyLjEwLjEKCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhl bi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK