From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= Subject: [PATCH v2 28/35] libxl/libxl_qmp.c: used LOG*D functions Date: Thu, 17 Nov 2016 18:36:10 +0100 Message-ID: <20161117173617.6697-29-cbosdonnat@suse.com> References: <20161117173617.6697-1-cbosdonnat@suse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20161117173617.6697-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: Wei Liu , Ian Jackson , Cedric Bosdonnat List-Id: xen-devel@lists.xenproject.org RnJvbTogQ2VkcmljIEJvc2Rvbm5hdCA8Y2Jvc2Rvbm5hdEBzdXNlLmNvbT4KClVzZSBMT0cqRCBs b2dnaW5nIGZ1bmN0aW9ucyB3aGVyZSBwb3NzaWJsZSBpbnN0ZWFkIG9mIHRoZSBMT0cqIG9uZXMu CgpTaWduZWQtb2ZmLWJ5OiBDw6lkcmljIEJvc2Rvbm5hdCA8Y2Jvc2Rvbm5hdEBzdXNlLmNvbT4K LS0tCiB0b29scy9saWJ4bC9saWJ4bF9xbXAuYyB8IDU2ICsrKysrKysrKysrKysrKysrKysrKysr Ky0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyOCBpbnNlcnRpb25z KCspLCAyOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS90b29scy9saWJ4bC9saWJ4bF9xbXAu YyBiL3Rvb2xzL2xpYnhsL2xpYnhsX3FtcC5jCmluZGV4IGY4YWRkZjkuLmFkMjJhZDQgMTAwNjQ0 Ci0tLSBhL3Rvb2xzL2xpYnhsL2xpYnhsX3FtcC5jCisrKyBiL3Rvb2xzL2xpYnhsL2xpYnhsX3Ft cC5jCkBAIC0zMCwxMCArMzAsMTAgQEAKIC8qICNkZWZpbmUgREVCVUdfUkVDRUlWRUQgKi8KIAog I2lmZGVmIERFQlVHX1JFQ0VJVkVECi0jICBkZWZpbmUgREVCVUdfUkVQT1JUX1JFQ0VJVkVEKGJ1 ZiwgbGVuKSBcCi0gICAgTE9HKERFQlVHLCAicmVjZWl2ZWQ6ICclLipzJyIsIGxlbiwgYnVmKQor IyAgZGVmaW5lIERFQlVHX1JFUE9SVF9SRUNFSVZFRChkb20sIGJ1ZiwgbGVuKSBcCisgICAgTE9H RChERUJVRywgZG9tLCAicmVjZWl2ZWQ6ICclLipzJyIsIGxlbiwgYnVmKQogI2Vsc2UKLSMgIGRl ZmluZSBERUJVR19SRVBPUlRfUkVDRUlWRUQoYnVmLCBsZW4pICgodm9pZCkwKQorIyAgZGVmaW5l IERFQlVHX1JFUE9SVF9SRUNFSVZFRChkb20sIGJ1ZiwgbGVuKSAoKHZvaWQpMCkKICNlbmRpZgog CiAvKgpAQCAtMTM3LDE1ICsxMzcsMTUgQEAgc3RhdGljIGludCByZWdpc3Rlcl9zZXJpYWxzX2No YXJkZXZfY2FsbGJhY2sobGlieGxfX3FtcF9oYW5kbGVyICpxbXAsCiAgICAgICAgICAgICBzICs9 IHN0cmxlbigic2VyaWFsIik7CiAgICAgICAgICAgICBwb3J0X251bWJlciA9IHN0cnRvbChzLCAm ZW5kcHRyLCAxMCk7CiAgICAgICAgICAgICBpZiAoKnMgPT0gMCB8fCAqZW5kcHRyICE9IDApIHsK LSAgICAgICAgICAgICAgICBMSUJYTF9fTE9HKHFtcC0+Y3R4LCBMSUJYTF9fTE9HX0VSUk9SLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgIkludmFsaWQgc2VyaWFsIHBvcnQgbnVtYmVyOiAl cyIsIHMpOworICAgICAgICAgICAgICAgIExJQlhMX19MT0dEKHFtcC0+Y3R4LCBMSUJYTF9fTE9H X0VSUk9SLCBxbXAtPmRvbWlkLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICJJbnZhbGlk IHNlcmlhbCBwb3J0IG51bWJlcjogJXMiLCBzKTsKICAgICAgICAgICAgICAgICByZXR1cm4gLTE7 CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICByZXQgPSBzdG9yZV9zZXJpYWxfcG9ydF9pbmZv KHFtcCwgY2hhcmRldiwgcG9ydF9udW1iZXIpOwogICAgICAgICAgICAgaWYgKHJldCkgewotICAg ICAgICAgICAgICAgIExJQlhMX19MT0dfRVJSTk8ocW1wLT5jdHgsIExJQlhMX19MT0dfRVJST1Is Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiRmFpbGVkIHRvIHN0b3JlIHNlcmlh bCBwb3J0IGluZm9ybWF0aW9uIgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIiBp biB4ZW5zdG9yZSIpOworICAgICAgICAgICAgICAgIExJQlhMX19MT0dEX0VSUk5PKHFtcC0+Y3R4 LCBMSUJYTF9fTE9HX0VSUk9SLCBxbXAtPmRvbWlkLAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICJGYWlsZWQgdG8gc3RvcmUgc2VyaWFsIHBvcnQgaW5mb3JtYXRpb24iCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIiBpbiB4ZW5zdG9yZSIpOwogICAgICAgICAg ICAgICAgIHJldHVybiByZXQ7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KQEAgLTE5MCw3ICsx OTAsNyBAQCBzdGF0aWMgaW50IHFtcF9yZWdpc3Rlcl92bmNfY2FsbGJhY2sobGlieGxfX3FtcF9o YW5kbGVyICpxbXAsCiAgICAgcG9ydCA9IGxpYnhsX19qc29uX29iamVjdF9nZXRfc3RyaW5nKG9i aik7CiAKICAgICBpZiAoIWFkZHIgfHwgIXBvcnQpIHsKLSAgICAgICAgTE9HKEVSUk9SLCAiRmFp bGVkIHRvIHJldHJlaXZlIFZOQyBjb25uZWN0IGluZm9ybWF0aW9uLiIpOworICAgICAgICBMT0dE KEVSUk9SLCBxbXAtPmRvbWlkLCAiRmFpbGVkIHRvIHJldHJlaXZlIFZOQyBjb25uZWN0IGluZm9y bWF0aW9uLiIpOwogICAgICAgICBnb3RvIG91dDsKICAgICB9CiAKQEAgLTI4Myw4ICsyODMsOCBA QCBzdGF0aWMgdm9pZCBxbXBfaGFuZGxlX2Vycm9yX3Jlc3BvbnNlKGxpYnhsX19nYyAqZ2MsIGxp YnhsX19xbXBfaGFuZGxlciAqcW1wLAogICAgICAgICBmcmVlKHBwKTsKICAgICB9CiAKLSAgICBM T0coRVJST1IsICJyZWNlaXZlZCBhbiBlcnJvciBtZXNzYWdlIGZyb20gUU1QIHNlcnZlcjogJXMi LAotICAgICAgICBsaWJ4bF9fanNvbl9vYmplY3RfZ2V0X3N0cmluZyhyZXNwKSk7CisgICAgTE9H RChFUlJPUiwgcW1wLT5kb21pZCwgInJlY2VpdmVkIGFuIGVycm9yIG1lc3NhZ2UgZnJvbSBRTVAg c2VydmVyOiAlcyIsCisgICAgICAgICBsaWJ4bF9fanNvbl9vYmplY3RfZ2V0X3N0cmluZyhyZXNw KSk7CiB9CiAKIHN0YXRpYyBpbnQgcW1wX2hhbmRsZV9yZXNwb25zZShsaWJ4bF9fZ2MgKmdjLCBs aWJ4bF9fcW1wX2hhbmRsZXIgKnFtcCwKQEAgLTI5Myw3ICsyOTMsNyBAQCBzdGF0aWMgaW50IHFt cF9oYW5kbGVfcmVzcG9uc2UobGlieGxfX2djICpnYywgbGlieGxfX3FtcF9oYW5kbGVyICpxbXAs CiAgICAgbGlieGxfX3FtcF9tZXNzYWdlX3R5cGUgdHlwZSA9IExJQlhMX19RTVBfTUVTU0FHRV9U WVBFX0lOVkFMSUQ7CiAKICAgICB0eXBlID0gcW1wX3Jlc3BvbnNlX3R5cGUocW1wLCByZXNwKTsK LSAgICBMT0coREVCVUcsICJtZXNzYWdlIHR5cGU6ICVzIiwgbGlieGxfX3FtcF9tZXNzYWdlX3R5 cGVfdG9fc3RyaW5nKHR5cGUpKTsKKyAgICBMT0dEKERFQlVHLCBxbXAtPmRvbWlkLCAibWVzc2Fn ZSB0eXBlOiAlcyIsIGxpYnhsX19xbXBfbWVzc2FnZV90eXBlX3RvX3N0cmluZyh0eXBlKSk7CiAK ICAgICBzd2l0Y2ggKHR5cGUpIHsKICAgICBjYXNlIExJQlhMX19RTVBfTUVTU0FHRV9UWVBFX1FN UDoKQEAgLTM0Miw3ICszNDIsNyBAQCBzdGF0aWMgbGlieGxfX3FtcF9oYW5kbGVyICpxbXBfaW5p dF9oYW5kbGVyKGxpYnhsX19nYyAqZ2MsIHVpbnQzMl90IGRvbWlkKQogCiAgICAgcW1wID0gY2Fs bG9jKDEsIHNpemVvZiAobGlieGxfX3FtcF9oYW5kbGVyKSk7CiAgICAgaWYgKHFtcCA9PSBOVUxM KSB7Ci0gICAgICAgIExPR0UoRVJST1IsICJGYWlsZWQgdG8gYWxsb2NhdGUgcW1wX2hhbmRsZXIi KTsKKyAgICAgICAgTE9HRUQoRVJST1IsIGRvbWlkLCAiRmFpbGVkIHRvIGFsbG9jYXRlIHFtcF9o YW5kbGVyIik7CiAgICAgICAgIHJldHVybiBOVUxMOwogICAgIH0KICAgICBxbXAtPmN0eCA9IENU WDsKQEAgLTQ0MCwyNiArNDQwLDI2IEBAIHN0YXRpYyBpbnQgcW1wX25leHQobGlieGxfX2djICpn YywgbGlieGxfX3FtcF9oYW5kbGVyICpxbXApCiAKICAgICAgICAgcmV0ID0gc2VsZWN0KHFtcC0+ cW1wX2ZkICsgMSwgJnJmZHMsIE5VTEwsIE5VTEwsICZ0aW1lb3V0KTsKICAgICAgICAgaWYgKHJl dCA9PSAwKSB7Ci0gICAgICAgICAgICBMT0coRVJST1IsICJ0aW1lb3V0Iik7CisgICAgICAgICAg ICBMT0dEKEVSUk9SLCBxbXAtPmRvbWlkLCAidGltZW91dCIpOwogICAgICAgICAgICAgcmV0dXJu IC0xOwogICAgICAgICB9IGVsc2UgaWYgKHJldCA8IDApIHsKICAgICAgICAgICAgIGlmIChlcnJu byA9PSBFSU5UUikKICAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgIExPR0Uo RVJST1IsICJTZWxlY3QgZXJyb3IiKTsKKyAgICAgICAgICAgIExPR0VEKEVSUk9SLCBxbXAtPmRv bWlkLCAiU2VsZWN0IGVycm9yIik7CiAgICAgICAgICAgICByZXR1cm4gLTE7CiAgICAgICAgIH0K IAogICAgICAgICByZCA9IHJlYWQocW1wLT5xbXBfZmQsIHFtcC0+YnVmZmVyLCBRTVBfUkVDRUlW RV9CVUZGRVJfU0laRSk7CiAgICAgICAgIGlmIChyZCA9PSAwKSB7Ci0gICAgICAgICAgICBMT0co RVJST1IsICJVbmV4cGVjdGVkIGVuZCBvZiBzb2NrZXQiKTsKKyAgICAgICAgICAgIExPR0QoRVJS T1IsIHFtcC0+ZG9taWQsICJVbmV4cGVjdGVkIGVuZCBvZiBzb2NrZXQiKTsKICAgICAgICAgICAg IHJldHVybiAtMTsKICAgICAgICAgfSBlbHNlIGlmIChyZCA8IDApIHsKLSAgICAgICAgICAgIExP R0UoRVJST1IsICJTb2NrZXQgcmVhZCBlcnJvciIpOworICAgICAgICAgICAgTE9HRUQoRVJST1Is IHFtcC0+ZG9taWQsICJTb2NrZXQgcmVhZCBlcnJvciIpOwogICAgICAgICAgICAgcmV0dXJuIHJk OwogICAgICAgICB9CiAgICAgICAgIHFtcC0+YnVmZmVyW3JkXSA9ICdcMCc7CiAKLSAgICAgICAg REVCVUdfUkVQT1JUX1JFQ0VJVkVEKHFtcC0+YnVmZmVyLCByZCk7CisgICAgICAgIERFQlVHX1JF UE9SVF9SRUNFSVZFRChxbXAtPmRvbWlkLCBxbXAtPmJ1ZmZlciwgcmQpOwogCiAgICAgICAgIGRv IHsKICAgICAgICAgICAgIGNoYXIgKmVuZCA9IE5VTEw7CkBAIC00OTAsNyArNDkwLDcgQEAgc3Rh dGljIGludCBxbXBfbmV4dChsaWJ4bF9fZ2MgKmdjLCBsaWJ4bF9fcW1wX2hhbmRsZXIgKnFtcCkK ICAgICAgICAgICAgICAgICBpZiAobykgewogICAgICAgICAgICAgICAgICAgICByYyA9IHFtcF9o YW5kbGVfcmVzcG9uc2UoZ2MsIHFtcCwgbyk7CiAgICAgICAgICAgICAgICAgfSBlbHNlIHsKLSAg ICAgICAgICAgICAgICAgICAgTE9HKEVSUk9SLCAiUGFyc2UgZXJyb3Igb2YgOiAlcyIsIHMpOwor ICAgICAgICAgICAgICAgICAgICBMT0dEKEVSUk9SLCBxbXAtPmRvbWlkLCAiUGFyc2UgZXJyb3Ig b2YgOiAlcyIsIHMpOwogICAgICAgICAgICAgICAgICAgICByZXR1cm4gLTE7CiAgICAgICAgICAg ICAgICAgfQogCkBAIC01MzYsMTMgKzUzNiwxMyBAQCBzdGF0aWMgY2hhciAqcW1wX3NlbmRfcHJl cGFyZShsaWJ4bF9fZ2MgKmdjLCBsaWJ4bF9fcW1wX2hhbmRsZXIgKnFtcCwKICAgICBzID0geWFq bF9nZW5fZ2V0X2J1ZihoYW5kLCAmYnVmLCAmbGVuKTsKIAogICAgIGlmIChzKSB7Ci0gICAgICAg IExPRyhFUlJPUiwgIkZhaWxlZCB0byBnZW5lcmF0ZSBhIHFtcCBjb21tYW5kIik7CisgICAgICAg IExPR0QoRVJST1IsIHFtcC0+ZG9taWQsICJGYWlsZWQgdG8gZ2VuZXJhdGUgYSBxbXAgY29tbWFu ZCIpOwogICAgICAgICBnb3RvIG91dDsKICAgICB9CiAKICAgICBlbG0gPSBtYWxsb2Moc2l6ZW9m IChjYWxsYmFja19pZF9wYWlyKSk7CiAgICAgaWYgKGVsbSA9PSBOVUxMKSB7Ci0gICAgICAgIExP R0UoRVJST1IsICJGYWlsZWQgdG8gYWxsb2NhdGUgYSBRTVAgY2FsbGJhY2siKTsKKyAgICAgICAg TE9HRUQoRVJST1IsIHFtcC0+ZG9taWQsICJGYWlsZWQgdG8gYWxsb2NhdGUgYSBRTVAgY2FsbGJh Y2siKTsKICAgICAgICAgZ290byBvdXQ7CiAgICAgfQogICAgIGVsbS0+aWQgPSBxbXAtPmxhc3Rf aWRfdXNlZDsKQEAgLTU1Myw3ICs1NTMsNyBAQCBzdGF0aWMgY2hhciAqcW1wX3NlbmRfcHJlcGFy ZShsaWJ4bF9fZ2MgKmdjLCBsaWJ4bF9fcW1wX2hhbmRsZXIgKnFtcCwKIAogICAgIHJldCA9IGxp YnhsX19zdHJuZHVwKGdjLCAoY29uc3QgY2hhciopYnVmLCBsZW4pOwogCi0gICAgTE9HKERFQlVH LCAibmV4dCBxbXAgY29tbWFuZDogJyVzJyIsIGJ1Zik7CisgICAgTE9HRChERUJVRywgcW1wLT5k b21pZCwgIm5leHQgcW1wIGNvbW1hbmQ6ICclcyciLCBidWYpOwogCiBvdXQ6CiAgICAgeWFqbF9n ZW5fZnJlZShoYW5kKTsKQEAgLTY5OSwxMiArNjk5LDEyIEBAIGxpYnhsX19xbXBfaGFuZGxlciAq bGlieGxfX3FtcF9pbml0aWFsaXplKGxpYnhsX19nYyAqZ2MsIHVpbnQzMl90IGRvbWlkKQogCiAg ICAgcW1wX3NvY2tldCA9IEdDU1BSSU5URigiJXMvcW1wLWxpYnhsLSVkIiwgbGlieGxfX3J1bl9k aXJfcGF0aCgpLCBkb21pZCk7CiAgICAgaWYgKChyZXQgPSBxbXBfb3BlbihxbXAsIHFtcF9zb2Nr ZXQsIFFNUF9TT0NLRVRfQ09OTkVDVF9USU1FT1VUKSkgPCAwKSB7Ci0gICAgICAgIExPR0UoRVJS T1IsICJDb25uZWN0aW9uIGVycm9yIik7CisgICAgICAgIExPR0VEKEVSUk9SLCBkb21pZCwgIkNv bm5lY3Rpb24gZXJyb3IiKTsKICAgICAgICAgcW1wX2ZyZWVfaGFuZGxlcihxbXApOwogICAgICAg ICByZXR1cm4gTlVMTDsKICAgICB9CiAKLSAgICBMT0coREVCVUcsICJjb25uZWN0ZWQgdG8gJXMi LCBxbXBfc29ja2V0KTsKKyAgICBMT0dEKERFQlVHLCBkb21pZCwgImNvbm5lY3RlZCB0byAlcyIs IHFtcF9zb2NrZXQpOwogCiAgICAgLyogV2FpdCBmb3IgdGhlIHJlc3BvbnNlIHRvIHFtcF9jYXBh YmlsaXRpZXMgKi8KICAgICB3aGlsZSAoIXFtcC0+Y29ubmVjdGVkKSB7CkBAIC03MTQsNyArNzE0 LDcgQEAgbGlieGxfX3FtcF9oYW5kbGVyICpsaWJ4bF9fcW1wX2luaXRpYWxpemUobGlieGxfX2dj ICpnYywgdWludDMyX3QgZG9taWQpCiAgICAgfQogCiAgICAgaWYgKCFxbXAtPmNvbm5lY3RlZCkg ewotICAgICAgICBMT0coRVJST1IsICJGYWlsZWQgdG8gY29ubmVjdCB0byBRTVAiKTsKKyAgICAg ICAgTE9HRChFUlJPUiwgZG9taWQsICJGYWlsZWQgdG8gY29ubmVjdCB0byBRTVAiKTsKICAgICAg ICAgbGlieGxfX3FtcF9jbG9zZShxbXApOwogICAgICAgICByZXR1cm4gTlVMTDsKICAgICB9CkBA IC03MzYsMTQgKzczNiwxNCBAQCB2b2lkIGxpYnhsX19xbXBfY2xlYW51cChsaWJ4bF9fZ2MgKmdj LCB1aW50MzJfdCBkb21pZCkKICAgICBxbXBfc29ja2V0ID0gR0NTUFJJTlRGKCIlcy9xbXAtbGli eGwtJWQiLCBsaWJ4bF9fcnVuX2Rpcl9wYXRoKCksIGRvbWlkKTsKICAgICBpZiAodW5saW5rKHFt cF9zb2NrZXQpID09IC0xKSB7CiAgICAgICAgIGlmIChlcnJubyAhPSBFTk9FTlQpIHsKLSAgICAg ICAgICAgIExPR0UoRVJST1IsICJGYWlsZWQgdG8gcmVtb3ZlIFFNUCBzb2NrZXQgZmlsZSAlcyIs IHFtcF9zb2NrZXQpOworICAgICAgICAgICAgTE9HRUQoRVJST1IsIGRvbWlkLCAiRmFpbGVkIHRv IHJlbW92ZSBRTVAgc29ja2V0IGZpbGUgJXMiLCBxbXBfc29ja2V0KTsKICAgICAgICAgfQogICAg IH0KIAogICAgIHFtcF9zb2NrZXQgPSBHQ1NQUklOVEYoIiVzL3FtcC1saWJ4ZW5zdGF0LSVkIiwg bGlieGxfX3J1bl9kaXJfcGF0aCgpLCBkb21pZCk7CiAgICAgaWYgKHVubGluayhxbXBfc29ja2V0 KSA9PSAtMSkgewogICAgICAgICBpZiAoZXJybm8gIT0gRU5PRU5UKSB7Ci0gICAgICAgICAgICBM T0dFKEVSUk9SLCAiRmFpbGVkIHRvIHJlbW92ZSBRTVAgc29ja2V0IGZpbGUgJXMiLCBxbXBfc29j a2V0KTsKKyAgICAgICAgICAgIExPR0VEKEVSUk9SLCBkb21pZCwgIkZhaWxlZCB0byByZW1vdmUg UU1QIHNvY2tldCBmaWxlICVzIiwgcW1wX3NvY2tldCk7CiAgICAgICAgIH0KICAgICB9CiB9CkBA IC0xMDEyLDcgKzEwMTIsNyBAQCBzdGF0aWMgaW50IHF1ZXJ5X2NwdXNfY2FsbGJhY2sobGlieGxf X3FtcF9oYW5kbGVyICpxbXAsCiAKICAgICAgICAgbyA9IGxpYnhsX19qc29uX21hcF9nZXQoIkNQ VSIsIGNwdSwgSlNPTl9JTlRFR0VSKTsKICAgICAgICAgaWYgKCFvKSB7Ci0gICAgICAgICAgICBM T0coRVJST1IsICJGYWlsZWQgdG8gcmV0cmlldmUgQ1BVIGluZGV4LiIpOworICAgICAgICAgICAg TE9HRChFUlJPUiwgcW1wLT5kb21pZCwgIkZhaWxlZCB0byByZXRyaWV2ZSBDUFUgaW5kZXguIik7 CiAgICAgICAgICAgICByYyA9IEVSUk9SX0ZBSUw7CiAgICAgICAgICAgICBnb3RvIG91dDsKICAg ICAgICAgfQotLSAKMi4xMC4xCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9y ZwpodHRwczovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg==