From mboxrd@z Thu Jan 1 00:00:00 1970 From: Anthony PERARD Subject: [PATCH v5 05/15] libxl_qmp: Separate QMP message generation from qmp_send_prepare Date: Fri, 7 Sep 2018 16:10:54 +0100 Message-ID: <20180907151104.32306-6-anthony.perard@citrix.com> References: <20180907151104.32306-1-anthony.perard@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1fyIPe-0003If-4Z for xen-devel@lists.xenproject.org; Fri, 07 Sep 2018 15:11:10 +0000 In-Reply-To: <20180907151104.32306-1-anthony.perard@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: Anthony PERARD , Ian Jackson , Wei Liu List-Id: xen-devel@lists.xenproject.org VG8gYmUgYWJsZSB0byByZS11c2UgcW1wX3ByZXBhcmVfcW1wX2NtZCB3aXRoIGxpYnhsX19ldl9x bXAuCgpBbHNvLCBhZGQgdGhlIFFNUCBlbmQgb2YgY29tbWFuZCAnXHJcbicgaW50byB0aGUgZ2Vu ZXJhdGVkIHN0cmluZy4KClNpZ25lZC1vZmYtYnk6IEFudGhvbnkgUEVSQVJEIDxhbnRob255LnBl cmFyZEBjaXRyaXguY29tPgotLS0KCk5vdGVzOgogICAgdjU6CiAgICAgICAgcmVuYW1lIHFtcF9w cmVwYXJlX3FtcF9jbWQgdG8gcW1wX3ByZXBhcmVfY21kCiAgICAgICAgZml4IGNvZGluZyBzdHls ZQoKIHRvb2xzL2xpYnhsL2xpYnhsX3FtcC5jIHwgNTYgKysrKysrKysrKysrKysrKysrKysrKysr KysrKy0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAzOSBpbnNlcnRpb25zKCspLCAxNyBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS90b29scy9saWJ4bC9saWJ4bF9xbXAuYyBiL3Rvb2xz L2xpYnhsL2xpYnhsX3FtcC5jCmluZGV4IDM4MTdjNzA4MzAuLmE1MzdkZDEzZTggMTAwNjQ0Ci0t LSBhL3Rvb2xzL2xpYnhsL2xpYnhsX3FtcC5jCisrKyBiL3Rvb2xzL2xpYnhsL2xpYnhsX3FtcC5j CkBAIC01NzcsMTcgKzU3NywxNSBAQCBzdGF0aWMgaW50IHFtcF9uZXh0KGxpYnhsX19nYyAqZ2Ms IGxpYnhsX19xbXBfaGFuZGxlciAqcW1wKQogICAgIHJldHVybiByYzsKIH0KIAotc3RhdGljIGNo YXIgKnFtcF9zZW5kX3ByZXBhcmUobGlieGxfX2djICpnYywgbGlieGxfX3FtcF9oYW5kbGVyICpx bXAsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBjaGFyICpjbWQsIGxpYnhs X19qc29uX29iamVjdCAqYXJncywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHFtcF9j YWxsYmFja190IGNhbGxiYWNrLCB2b2lkICpvcGFxdWUsCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBxbXBfcmVxdWVzdF9jb250ZXh0ICpjb250ZXh0KQorc3RhdGljIGNoYXIgKnFtcF9w cmVwYXJlX2NtZChsaWJ4bF9fZ2MgKmdjLCBjb25zdCBjaGFyICpjbWQsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGNvbnN0IGxpYnhsX19qc29uX29iamVjdCAqYXJncywKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgaW50IGlkLCBzaXplX3QgKmxlbl9yKQogewotICAgIGNvbnN0 IHVuc2lnbmVkIGNoYXIgKmJ1ZiA9IE5VTEw7Ci0gICAgY2hhciAqcmV0ID0gTlVMTDsKLSAgICBs aWJ4bF95YWpsX2xlbmd0aCBsZW4gPSAwOworICAgIGNvbnN0IHVuc2lnbmVkIGNoYXIgKmJ1ZjsK KyAgICBsaWJ4bF95YWpsX2xlbmd0aCBsZW47CiAgICAgeWFqbF9nZW5fc3RhdHVzIHM7CiAgICAg eWFqbF9nZW4gaGFuZDsKLSAgICBjYWxsYmFja19pZF9wYWlyICplbG0gPSBOVUxMOworICAgIGNo YXIgKnJldCA9IE5VTEw7CiAKICAgICBoYW5kID0gbGlieGxfeWFqbF9nZW5fYWxsb2MoTlVMTCk7 CiAKQEAgLTYwNCw3ICs2MDIsNyBAQCBzdGF0aWMgY2hhciAqcW1wX3NlbmRfcHJlcGFyZShsaWJ4 bF9fZ2MgKmdjLCBsaWJ4bF9fcW1wX2hhbmRsZXIgKnFtcCwKICAgICBsaWJ4bF9feWFqbF9nZW5f YXNjaWl6KGhhbmQsICJleGVjdXRlIik7CiAgICAgbGlieGxfX3lhamxfZ2VuX2FzY2lpeihoYW5k LCBjbWQpOwogICAgIGxpYnhsX195YWpsX2dlbl9hc2NpaXooaGFuZCwgImlkIik7Ci0gICAgeWFq bF9nZW5faW50ZWdlcihoYW5kLCArK3FtcC0+bGFzdF9pZF91c2VkKTsKKyAgICB5YWpsX2dlbl9p bnRlZ2VyKGhhbmQsIGlkKTsKICAgICBpZiAoYXJncykgewogICAgICAgICBsaWJ4bF9feWFqbF9n ZW5fYXNjaWl6KGhhbmQsICJhcmd1bWVudHMiKTsKICAgICAgICAgbGlieGxfX2pzb25fb2JqZWN0 X3RvX3lhamxfZ2VuKGdjLCBoYW5kLCBhcmdzKTsKQEAgLTYxNCw2ICs2MTIsMzQgQEAgc3RhdGlj IGNoYXIgKnFtcF9zZW5kX3ByZXBhcmUobGlieGxfX2djICpnYywgbGlieGxfX3FtcF9oYW5kbGVy ICpxbXAsCiAgICAgcyA9IHlhamxfZ2VuX2dldF9idWYoaGFuZCwgJmJ1ZiwgJmxlbik7CiAKICAg ICBpZiAocykgeworICAgICAgICBnb3RvIG91dDsKKyAgICB9CisKKyAgICByZXQgPSBsaWJ4bF9f bWFsbG9jKE5PR0MsIGxlbiArIDMpOworICAgIHN0cm5jcHkocmV0LCAoY29uc3QgY2hhciAqKWJ1 ZiwgbGVuICsgMyk7CisgICAgc3RybmNweShyZXQgKyBsZW4sICJcclxuIiwgMyk7CisgICAgbGVu ICs9IDI7CisKKyAgICBpZiAobGVuX3IpCisgICAgICAgICpsZW5fciA9IGxlbjsKKworb3V0Ogor ICAgIHlhamxfZ2VuX2ZyZWUoaGFuZCk7CisgICAgcmV0dXJuIHJldDsKK30KKworc3RhdGljIGNo YXIgKnFtcF9zZW5kX3ByZXBhcmUobGlieGxfX2djICpnYywgbGlieGxfX3FtcF9oYW5kbGVyICpx bXAsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBjaGFyICpjbWQsIGxpYnhs X19qc29uX29iamVjdCAqYXJncywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHFtcF9j YWxsYmFja190IGNhbGxiYWNrLCB2b2lkICpvcGFxdWUsCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBxbXBfcmVxdWVzdF9jb250ZXh0ICpjb250ZXh0LAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgc2l6ZV90ICpsZW5fcikKK3sKKyAgICBjaGFyICpidWY7CisgICAgY2FsbGJh Y2tfaWRfcGFpciAqZWxtOworCisgICAgYnVmID0gcW1wX3ByZXBhcmVfY21kKGdjLCBjbWQsIGFy Z3MsICsrcW1wLT5sYXN0X2lkX3VzZWQsIE5VTEwpOworCisgICAgaWYgKCFidWYpIHsKICAgICAg ICAgTE9HRChFUlJPUiwgcW1wLT5kb21pZCwgIkZhaWxlZCB0byBnZW5lcmF0ZSBhIHFtcCBjb21t YW5kIik7CiAgICAgICAgIGdvdG8gb3V0OwogICAgIH0KQEAgLTYyOSwxMyArNjU1LDEwIEBAIHN0 YXRpYyBjaGFyICpxbXBfc2VuZF9wcmVwYXJlKGxpYnhsX19nYyAqZ2MsIGxpYnhsX19xbXBfaGFu ZGxlciAqcW1wLAogICAgIGVsbS0+Y29udGV4dCA9IGNvbnRleHQ7CiAgICAgTElCWExfU1RBSUxR X0lOU0VSVF9UQUlMKCZxbXAtPmNhbGxiYWNrX2xpc3QsIGVsbSwgbmV4dCk7CiAKLSAgICByZXQg PSBsaWJ4bF9fc3RybmR1cChnYywgKGNvbnN0IGNoYXIqKWJ1ZiwgbGVuKTsKLQogICAgIExPR0Qo REVCVUcsIHFtcC0+ZG9taWQsICJuZXh0IHFtcCBjb21tYW5kOiAnJXMnIiwgYnVmKTsKIAogb3V0 OgotICAgIHlhamxfZ2VuX2ZyZWUoaGFuZCk7Ci0gICAgcmV0dXJuIHJldDsKKyAgICByZXR1cm4g YnVmOwogfQogCiBzdGF0aWMgaW50IHFtcF9zZW5kKGxpYnhsX19xbXBfaGFuZGxlciAqcW1wLApA QCAtNjQ3LDcgKzY3MCw4IEBAIHN0YXRpYyBpbnQgcW1wX3NlbmQobGlieGxfX3FtcF9oYW5kbGVy ICpxbXAsCiAgICAgaW50IHJjID0gLTE7CiAgICAgR0NfSU5JVChxbXAtPmN0eCk7CiAKLSAgICBi dWYgPSBxbXBfc2VuZF9wcmVwYXJlKGdjLCBxbXAsIGNtZCwgYXJncywgY2FsbGJhY2ssIG9wYXF1 ZSwgY29udGV4dCk7CisgICAgYnVmID0gcW1wX3NlbmRfcHJlcGFyZShnYywgcW1wLCBjbWQsIGFy Z3MsIGNhbGxiYWNrLCBvcGFxdWUsIGNvbnRleHQsCisgICAgICAgICAgICAgICAgICAgICAgICAg ICBOVUxMKTsKIAogICAgIGlmIChidWYgPT0gTlVMTCkgewogICAgICAgICBnb3RvIG91dDsKQEAg LTY1NiwxMiArNjgwLDEwIEBAIHN0YXRpYyBpbnQgcW1wX3NlbmQobGlieGxfX3FtcF9oYW5kbGVy ICpxbXAsCiAgICAgaWYgKGxpYnhsX3dyaXRlX2V4YWN0bHkocW1wLT5jdHgsIHFtcC0+cW1wX2Zk LCBidWYsIHN0cmxlbihidWYpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICJRTVAgY29t bWFuZCIsICJRTVAgc29ja2V0IikpCiAgICAgICAgIGdvdG8gb3V0OwotICAgIGlmIChsaWJ4bF93 cml0ZV9leGFjdGx5KHFtcC0+Y3R4LCBxbXAtPnFtcF9mZCwgIlxyXG4iLCAyLAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICJDUkxGIiwgIlFNUCBzb2NrZXQiKSkKLSAgICAgICAgZ290byBv dXQ7CiAKICAgICByYyA9IHFtcC0+bGFzdF9pZF91c2VkOwogb3V0OgorICAgIGZyZWUoYnVmKTsK ICAgICBHQ19GUkVFOwogICAgIHJldHVybiByYzsKIH0KLS0gCkFudGhvbnkgUEVSQVJECgoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1h aWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54 ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA==