From: Anthony PERARD Subject: [PATCH v6 02/11] libxl_qmp: Separate QMP message generation from qmp_send_prepare Date: Mon, 12 Nov 2018 16:49:21 +0000 Message-ID: <20181112164930.25893-3-anthony.perard@citrix.com> References: <20181112164930.25893-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 1gMFP6-0000pR-2A for xen-devel@lists.xenproject.org; Mon, 12 Nov 2018 16:49:36 +0000 In-Reply-To: <20181112164930.25893-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 cmFyZEBjaXRyaXguY29tPgotLS0KCk5vdGVzOgogICAgdjY6CiAgICAgICAgY29tbWVudCBhYm91 dCBvd25lcnNoaXAgb2YgYnVmCiAgICAgICAgdXNlIGxpYl9fc3ByaW50ZiBpbnN0ZWFkIG9mIHR3 byBzdHJuY3B5CiAgICB2NToKICAgICAgICByZW5hbWUgcW1wX3ByZXBhcmVfcW1wX2NtZCB0byBx bXBfcHJlcGFyZV9jbWQKICAgICAgICBmaXggY29kaW5nIHN0eWxlCgogdG9vbHMvbGlieGwvbGli eGxfcW1wLmMgfCA1NyArKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLQog MSBmaWxlIGNoYW5nZWQsIDM5IGluc2VydGlvbnMoKyksIDE4IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL3Rvb2xzL2xpYnhsL2xpYnhsX3FtcC5jIGIvdG9vbHMvbGlieGwvbGlieGxfcW1wLmMK aW5kZXggNmE1Yzk5NzU0Ni4uMmRkNTRkNTM5OCAxMDA2NDQKLS0tIGEvdG9vbHMvbGlieGwvbGli eGxfcW1wLmMKKysrIGIvdG9vbHMvbGlieGwvbGlieGxfcW1wLmMKQEAgLTU3MSwxNyArNTcxLDE2 IEBAIHN0YXRpYyBpbnQgcW1wX25leHQobGlieGxfX2djICpnYywgbGlieGxfX3FtcF9oYW5kbGVy ICpxbXApCiAgICAgcmV0dXJuIHJjOwogfQogCi1zdGF0aWMgY2hhciAqcW1wX3NlbmRfcHJlcGFy ZShsaWJ4bF9fZ2MgKmdjLCBsaWJ4bF9fcW1wX2hhbmRsZXIgKnFtcCwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGNvbnN0IGNoYXIgKmNtZCwgbGlieGxfX2pzb25fb2JqZWN0ICphcmdz LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcW1wX2NhbGxiYWNrX3QgY2FsbGJhY2ss IHZvaWQgKm9wYXF1ZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHFtcF9yZXF1ZXN0 X2NvbnRleHQgKmNvbnRleHQpCitzdGF0aWMgY2hhciAqcW1wX3ByZXBhcmVfY21kKGxpYnhsX19n YyAqZ2MsIGNvbnN0IGNoYXIgKmNtZCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29u c3QgbGlieGxfX2pzb25fb2JqZWN0ICphcmdzLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBpbnQgaWQsIHNpemVfdCAqbGVuX3IpCiB7Ci0gICAgY29uc3QgdW5zaWduZWQgY2hhciAqYnVm ID0gTlVMTDsKLSAgICBjaGFyICpyZXQgPSBOVUxMOwotICAgIGxpYnhsX3lhamxfbGVuZ3RoIGxl biA9IDA7CisgICAgeWFqbF9nZW4gaGFuZCA9IE5VTEw7CisgICAgLyogbWVtb3J5IGZvciAnYnVm JyBpcyBvd25lZCBieSAnaGFuZCcgKi8KKyAgICBjb25zdCB1bnNpZ25lZCBjaGFyICpidWY7Cisg ICAgbGlieGxfeWFqbF9sZW5ndGggbGVuOwogICAgIHlhamxfZ2VuX3N0YXR1cyBzOwotICAgIHlh amxfZ2VuIGhhbmQ7Ci0gICAgY2FsbGJhY2tfaWRfcGFpciAqZWxtID0gTlVMTDsKKyAgICBjaGFy ICpyZXQgPSBOVUxMOwogCiAgICAgaGFuZCA9IGxpYnhsX3lhamxfZ2VuX2FsbG9jKE5VTEwpOwog CkBAIC01OTgsNyArNTk3LDcgQEAgc3RhdGljIGNoYXIgKnFtcF9zZW5kX3ByZXBhcmUobGlieGxf X2djICpnYywgbGlieGxfX3FtcF9oYW5kbGVyICpxbXAsCiAgICAgbGlieGxfX3lhamxfZ2VuX2Fz Y2lpeihoYW5kLCAiZXhlY3V0ZSIpOwogICAgIGxpYnhsX195YWpsX2dlbl9hc2NpaXooaGFuZCwg Y21kKTsKICAgICBsaWJ4bF9feWFqbF9nZW5fYXNjaWl6KGhhbmQsICJpZCIpOwotICAgIHlhamxf Z2VuX2ludGVnZXIoaGFuZCwgKytxbXAtPmxhc3RfaWRfdXNlZCk7CisgICAgeWFqbF9nZW5faW50 ZWdlcihoYW5kLCBpZCk7CiAgICAgaWYgKGFyZ3MpIHsKICAgICAgICAgbGlieGxfX3lhamxfZ2Vu X2FzY2lpeihoYW5kLCAiYXJndW1lbnRzIik7CiAgICAgICAgIGxpYnhsX19qc29uX29iamVjdF90 b195YWpsX2dlbihnYywgaGFuZCwgYXJncyk7CkBAIC02MDgsNiArNjA3LDMyIEBAIHN0YXRpYyBj aGFyICpxbXBfc2VuZF9wcmVwYXJlKGxpYnhsX19nYyAqZ2MsIGxpYnhsX19xbXBfaGFuZGxlciAq cW1wLAogICAgIHMgPSB5YWpsX2dlbl9nZXRfYnVmKGhhbmQsICZidWYsICZsZW4pOwogCiAgICAg aWYgKHMpIHsKKyAgICAgICAgZ290byBvdXQ7CisgICAgfQorCisgICAgcmV0ID0gbGlieGxfX3Nw cmludGYoTk9HQywgIiUqLipzXHJcbiIsIChpbnQpbGVuLCAoaW50KWxlbiwgYnVmKTsKKyAgICBs ZW4gKz0gMjsKKworICAgIGlmIChsZW5fcikKKyAgICAgICAgKmxlbl9yID0gbGVuOworCitvdXQ6 CisgICAgeWFqbF9nZW5fZnJlZShoYW5kKTsKKyAgICByZXR1cm4gcmV0OworfQorCitzdGF0aWMg Y2hhciAqcW1wX3NlbmRfcHJlcGFyZShsaWJ4bF9fZ2MgKmdjLCBsaWJ4bF9fcW1wX2hhbmRsZXIg KnFtcCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGNoYXIgKmNtZCwgbGli eGxfX2pzb25fb2JqZWN0ICphcmdzLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcW1w X2NhbGxiYWNrX3QgY2FsbGJhY2ssIHZvaWQgKm9wYXF1ZSwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHFtcF9yZXF1ZXN0X2NvbnRleHQgKmNvbnRleHQsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBzaXplX3QgKmxlbl9yKQoreworICAgIGNoYXIgKmJ1ZjsKKyAgICBjYWxs YmFja19pZF9wYWlyICplbG07CisKKyAgICBidWYgPSBxbXBfcHJlcGFyZV9jbWQoZ2MsIGNtZCwg YXJncywgKytxbXAtPmxhc3RfaWRfdXNlZCwgTlVMTCk7CisKKyAgICBpZiAoIWJ1ZikgewogICAg ICAgICBMT0dEKEVSUk9SLCBxbXAtPmRvbWlkLCAiRmFpbGVkIHRvIGdlbmVyYXRlIGEgcW1wIGNv bW1hbmQiKTsKICAgICAgICAgZ290byBvdXQ7CiAgICAgfQpAQCAtNjIzLDEzICs2NDgsMTAgQEAg c3RhdGljIGNoYXIgKnFtcF9zZW5kX3ByZXBhcmUobGlieGxfX2djICpnYywgbGlieGxfX3FtcF9o YW5kbGVyICpxbXAsCiAgICAgZWxtLT5jb250ZXh0ID0gY29udGV4dDsKICAgICBMSUJYTF9TVEFJ TFFfSU5TRVJUX1RBSUwoJnFtcC0+Y2FsbGJhY2tfbGlzdCwgZWxtLCBuZXh0KTsKIAotICAgIHJl dCA9IGxpYnhsX19zdHJuZHVwKGdjLCAoY29uc3QgY2hhciopYnVmLCBsZW4pOwotCiAgICAgTE9H RChERUJVRywgcW1wLT5kb21pZCwgIm5leHQgcW1wIGNvbW1hbmQ6ICclcyciLCBidWYpOwogCiBv dXQ6Ci0gICAgeWFqbF9nZW5fZnJlZShoYW5kKTsKLSAgICByZXR1cm4gcmV0OworICAgIHJldHVy biBidWY7CiB9CiAKIHN0YXRpYyBpbnQgcW1wX3NlbmQobGlieGxfX3FtcF9oYW5kbGVyICpxbXAs CkBAIC02NDEsNyArNjYzLDggQEAgc3RhdGljIGludCBxbXBfc2VuZChsaWJ4bF9fcW1wX2hhbmRs ZXIgKnFtcCwKICAgICBpbnQgcmMgPSAtMTsKICAgICBHQ19JTklUKHFtcC0+Y3R4KTsKIAotICAg IGJ1ZiA9IHFtcF9zZW5kX3ByZXBhcmUoZ2MsIHFtcCwgY21kLCBhcmdzLCBjYWxsYmFjaywgb3Bh cXVlLCBjb250ZXh0KTsKKyAgICBidWYgPSBxbXBfc2VuZF9wcmVwYXJlKGdjLCBxbXAsIGNtZCwg YXJncywgY2FsbGJhY2ssIG9wYXF1ZSwgY29udGV4dCwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgIE5VTEwpOwogCiAgICAgaWYgKGJ1ZiA9PSBOVUxMKSB7CiAgICAgICAgIGdvdG8gb3V0OwpA QCAtNjUwLDEyICs2NzMsMTAgQEAgc3RhdGljIGludCBxbXBfc2VuZChsaWJ4bF9fcW1wX2hhbmRs ZXIgKnFtcCwKICAgICBpZiAobGlieGxfd3JpdGVfZXhhY3RseShxbXAtPmN0eCwgcW1wLT5xbXBf ZmQsIGJ1Ziwgc3RybGVuKGJ1ZiksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIlFNUCBj b21tYW5kIiwgIlFNUCBzb2NrZXQiKSkKICAgICAgICAgZ290byBvdXQ7Ci0gICAgaWYgKGxpYnhs X3dyaXRlX2V4YWN0bHkocW1wLT5jdHgsIHFtcC0+cW1wX2ZkLCAiXHJcbiIsIDIsCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgIkNSTEYiLCAiUU1QIHNvY2tldCIpKQotICAgICAgICBnb3Rv IG91dDsKIAogICAgIHJjID0gcW1wLT5sYXN0X2lkX3VzZWQ7CiBvdXQ6CisgICAgZnJlZShidWYp OwogICAgIEdDX0ZSRUU7CiAgICAgcmV0dXJuIHJjOwogfQotLSAKQW50aG9ueSBQRVJBUkQKCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwg bWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3Rz LnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs