From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= Subject: [PATCH v2 16/35] libxl/libxl_dom_save.c: used LOG*D functions Date: Fri, 2 Dec 2016 16:08:22 +0100 Message-ID: <20161202150841.31227-17-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 bGlieGxfZG9tX3NhdmUuYyB8IDI5ICsrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tCiAxIGZp bGUgY2hhbmdlZCwgMTUgaW5zZXJ0aW9ucygrKSwgMTQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvdG9vbHMvbGlieGwvbGlieGxfZG9tX3NhdmUuYyBiL3Rvb2xzL2xpYnhsL2xpYnhsX2RvbV9z YXZlLmMKaW5kZXggNTc5MDM5Zi4uNzdmZTMwZSAxMDA2NDQKLS0tIGEvdG9vbHMvbGlieGwvbGli eGxfZG9tX3NhdmUuYworKysgYi90b29scy9saWJ4bC9saWJ4bF9kb21fc2F2ZS5jCkBAIC05MCw5 ICs5MCw5IEBAIHN0YXRpYyB2b2lkIGRvbWFpbl9zdXNwZW5kX3N3aXRjaF9xZW11X3hlbl90cmFk aXRpb25hbF9sb2dkaXJ0eQogICAgICAgICAgICAgaWYgKHJjKSBnb3RvIG91dDsKIAogICAgICAg ICAgICAgaWYgKCFnb3RfcmV0IHx8IHN0cmNtcChnb3QsIGdvdF9yZXQpKSB7Ci0gICAgICAgICAg ICAgICAgTE9HKEVSUk9SLCJjb250cm9sbGluZyBsb2dkaXJ0eTogcWVtdSB3YXMgYWxyZWFkeSBz ZW50IgotICAgICAgICAgICAgICAgICAgICAiIGNvbW1hbmQgYCVzJyAoeGVuc3RvcmUgcGF0aCBg JXMnKSBidXQgcmVzdWx0IGlzIGAlcyciLAotICAgICAgICAgICAgICAgICAgICBnb3QsIGxkcy0+ Y21kX3BhdGgsIGdvdF9yZXQgPyBnb3RfcmV0IDogIjxub25lPiIpOworICAgICAgICAgICAgICAg IExPR0QoRVJST1IsIGRvbWlkLCAiY29udHJvbGxpbmcgbG9nZGlydHk6IHFlbXUgd2FzIGFscmVh ZHkgc2VudCIKKyAgICAgICAgICAgICAgICAgICAgICIgY29tbWFuZCBgJXMnICh4ZW5zdG9yZSBw YXRoIGAlcycpIGJ1dCByZXN1bHQgaXMgYCVzJyIsCisgICAgICAgICAgICAgICAgICAgICBnb3Qs IGxkcy0+Y21kX3BhdGgsIGdvdF9yZXQgPyBnb3RfcmV0IDogIjxub25lPiIpOwogICAgICAgICAg ICAgICAgIHJjID0gRVJST1JfRkFJTDsKICAgICAgICAgICAgICAgICBnb3RvIG91dDsKICAgICAg ICAgICAgIH0KQEAgLTExNSw3ICsxMTUsNyBAQCBzdGF0aWMgdm9pZCBkb21haW5fc3VzcGVuZF9z d2l0Y2hfcWVtdV94ZW5fdHJhZGl0aW9uYWxfbG9nZGlydHkKICAgICByZXR1cm47CiAKICBvdXQ6 Ci0gICAgTE9HKEVSUk9SLCJsb2dkaXJ0eSBzd2l0Y2ggZmFpbGVkIChyYz0lZCksIGFiYW5kb25p bmcgc3VzcGVuZCIscmMpOworICAgIExPR0QoRVJST1IsIGRvbWlkLCAibG9nZGlydHkgc3dpdGNo IGZhaWxlZCAocmM9JWQpLCBhYmFuZG9uaW5nIHN1c3BlbmQiLHJjKTsKICAgICBsaWJ4bF9feHNf dHJhbnNhY3Rpb25fYWJvcnQoZ2MsICZ0KTsKICAgICBzd2l0Y2hfbG9nZGlydHlfZG9uZShlZ2Ms bGRzLHJjKTsKIH0KQEAgLTEyOSw3ICsxMjksOCBAQCBzdGF0aWMgdm9pZCBkb21haW5fc3VzcGVu ZF9zd2l0Y2hfcWVtdV94ZW5fbG9nZGlydHkKIAogICAgIHJjID0gbGlieGxfX3FtcF9zZXRfZ2xv YmFsX2RpcnR5X2xvZyhnYywgZG9taWQsIGVuYWJsZSk7CiAgICAgaWYgKHJjKQotICAgICAgICBM T0coRVJST1IsImxvZ2RpcnR5IHN3aXRjaCBmYWlsZWQgKHJjPSVkKSwgYWJhbmRvbmluZyBzdXNw ZW5kIixyYyk7CisgICAgICAgIExPR0QoRVJST1IsIGRvbWlkLAorICAgICAgICAgICAgICJsb2dk aXJ0eSBzd2l0Y2ggZmFpbGVkIChyYz0lZCksIGFiYW5kb25pbmcgc3VzcGVuZCIscmMpOwogCiAg ICAgbGRzLT5jYWxsYmFjayhlZ2MsIGxkcywgcmMpOwogfQpAQCAtMTc5LDggKzE4MCw4IEBAIHZv aWQgbGlieGxfX2RvbWFpbl9jb21tb25fc3dpdGNoX3FlbXVfbG9nZGlydHkobGlieGxfX2VnYyAq ZWdjLAogICAgICAgICBsZHMtPmNhbGxiYWNrKGVnYywgbGRzLCAwKTsKICAgICAgICAgYnJlYWs7 CiAgICAgZGVmYXVsdDoKLSAgICAgICAgTE9HKEVSUk9SLCJsb2dkaXJ0eSBzd2l0Y2ggZmFpbGVk IgotICAgICAgICAgICAgIiwgbm8gdmFsaWQgZGV2aWNlIG1vZGVsIHZlcnNpb24gZm91bmQsIGFi YW5kb25pbmcgc3VzcGVuZCIpOworICAgICAgICBMT0dEKEVSUk9SLCBkb21pZCwgImxvZ2RpcnR5 IHN3aXRjaCBmYWlsZWQiCisgICAgICAgICAgICAgIiwgbm8gdmFsaWQgZGV2aWNlIG1vZGVsIHZl cnNpb24gZm91bmQsIGFiYW5kb25pbmcgc3VzcGVuZCIpOwogICAgICAgICBsZHMtPmNhbGxiYWNr KGVnYywgbGRzLCBFUlJPUl9GQUlMKTsKICAgICB9CiB9CkBAIC0zNDYsOCArMzQ3LDggQEAgdm9p ZCBsaWJ4bF9fZG9tYWluX3NhdmUobGlieGxfX2VnYyAqZWdjLCBsaWJ4bF9fZG9tYWluX3NhdmVf c3RhdGUgKmRzcykKICAgICBsaWJ4bF9fZG9tYWluX3N1c3BlbmRfc3RhdGUgKmRzcHMgPSAmZHNz LT5kc3BzOwogCiAgICAgaWYgKGRzcy0+Y2hlY2twb2ludGVkX3N0cmVhbSAhPSBMSUJYTF9DSEVD S1BPSU5URURfU1RSRUFNX05PTkUgJiYgIXJfaW5mbykgewotICAgICAgICBMT0coRVJST1IsICJN aWdyYXRpb24gc3RyZWFtIGlzIGNoZWNrcG9pbnRlZCwgYnV0IHRoZXJlJ3Mgbm8gIgotICAgICAg ICAgICAgICAgICAgICJjaGVja3BvaW50IGluZm8hIik7CisgICAgICAgIExPR0QoRVJST1IsIGRv bWlkLCAiTWlncmF0aW9uIHN0cmVhbSBpcyBjaGVja3BvaW50ZWQsIGJ1dCB0aGVyZSdzIG5vICIK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICJjaGVja3BvaW50IGluZm8hIik7CiAgICAgICAg IHJjID0gRVJST1JfSU5WQUw7CiAgICAgICAgIGdvdG8gb3V0OwogICAgIH0KQEAgLTM4Nyw3ICsz ODgsNyBAQCB2b2lkIGxpYnhsX19kb21haW5fc2F2ZShsaWJ4bF9fZWdjICplZ2MsIGxpYnhsX19k b21haW5fc2F2ZV9zdGF0ZSAqZHNzKQogICAgIHJldCA9IHhjX2RvbWFpbl9nZXR2bnVtYShDVFgt PnhjaCwgZG9taWQsICZucl92bm9kZXMsICZucl92bWVtcmFuZ2VzLAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAmbnJfdmNwdXMsIE5VTEwsIE5VTEwsIE5VTEwpOwogICAgIGlmIChyZXQg IT0gLTEgfHwgZXJybm8gIT0gRU9QTk9UU1VQUCkgewotICAgICAgICBMT0coRVJST1IsICJDYW5u b3Qgc2F2ZSBhIGd1ZXN0IHdpdGggdk5VTUEgY29uZmlndXJlZCIpOworICAgICAgICBMT0dEKEVS Uk9SLCBkb21pZCwgIkNhbm5vdCBzYXZlIGEgZ3Vlc3Qgd2l0aCB2TlVNQSBjb25maWd1cmVkIik7 CiAgICAgICAgIHJjID0gRVJST1JfRkFJTDsKICAgICAgICAgZ290byBvdXQ7CiAgICAgfQpAQCAt NDkxLDE3ICs0OTIsMTcgQEAgaW50IGxpYnhsX19yZXN0b3JlX2VtdWxhdG9yX3hlbnN0b3JlX2Rh dGEobGlieGxfX2RvbWFpbl9jcmVhdGVfc3RhdGUgKmRjcywKICAgICAgICAgLyogU2FuaXRpc2Ug J2tleScuICovCiAgICAgICAgIGlmICghbmV4dCkgewogICAgICAgICAgICAgcmMgPSBFUlJPUl9G QUlMOwotICAgICAgICAgICAgTE9HKEVSUk9SLCAiS2V5IGluIHhlbnN0b3JlIGRhdGEgbm90IE5V TCB0ZXJtaW5hdGVkIik7CisgICAgICAgICAgICBMT0dEKEVSUk9SLCBkb21pZCwgIktleSBpbiB4 ZW5zdG9yZSBkYXRhIG5vdCBOVUwgdGVybWluYXRlZCIpOwogICAgICAgICAgICAgZ290byBvdXQ7 CiAgICAgICAgIH0KICAgICAgICAgaWYgKGtleVswXSA9PSAnXDAnKSB7CiAgICAgICAgICAgICBy YyA9IEVSUk9SX0ZBSUw7Ci0gICAgICAgICAgICBMT0coRVJST1IsICJlbXB0eSBrZXkgZm91bmQg aW4geGVuc3RvcmUgZGF0YSIpOworICAgICAgICAgICAgTE9HRChFUlJPUiwgZG9taWQsICJlbXB0 eSBrZXkgZm91bmQgaW4geGVuc3RvcmUgZGF0YSIpOwogICAgICAgICAgICAgZ290byBvdXQ7CiAg ICAgICAgIH0KICAgICAgICAgaWYgKGtleVswXSA9PSAnLycpIHsKICAgICAgICAgICAgIHJjID0g RVJST1JfRkFJTDsKLSAgICAgICAgICAgIExPRyhFUlJPUiwgIktleSBpbiB4ZW5zdG9yZSBkYXRh IG5vdCByZWxhdGl2ZSIpOworICAgICAgICAgICAgTE9HRChFUlJPUiwgZG9taWQsICJLZXkgaW4g eGVuc3RvcmUgZGF0YSBub3QgcmVsYXRpdmUiKTsKICAgICAgICAgICAgIGdvdG8gb3V0OwogICAg ICAgICB9CiAKQEAgLTUxMSw3ICs1MTIsNyBAQCBpbnQgbGlieGxfX3Jlc3RvcmVfZW11bGF0b3Jf eGVuc3RvcmVfZGF0YShsaWJ4bF9fZG9tYWluX2NyZWF0ZV9zdGF0ZSAqZGNzLAogICAgICAgICAv KiBTYW5pdGlzZSAndmFsJy4gKi8KICAgICAgICAgaWYgKCFuZXh0KSB7CiAgICAgICAgICAgICBy YyA9IEVSUk9SX0ZBSUw7Ci0gICAgICAgICAgICBMT0coRVJST1IsICJWYWwgaW4geGVuc3RvcmUg ZGF0YSBub3QgTlVMIHRlcm1pbmF0ZWQiKTsKKyAgICAgICAgICAgIExPR0QoRVJST1IsIGRvbWlk LCAiVmFsIGluIHhlbnN0b3JlIGRhdGEgbm90IE5VTCB0ZXJtaW5hdGVkIik7CiAgICAgICAgICAg ICBnb3RvIG91dDsKICAgICAgICAgfQogCi0tIAoyLjEwLjEKCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1k ZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK