From: Anthony PERARD Subject: [RFC v2 4/9] libxl_qmp: Move the buffer realloc to the same scope level as read Date: Mon, 16 Apr 2018 18:32:22 +0100 Message-ID: <20180416173227.22671-5-anthony.perard@citrix.com> References: <20180416173227.22671-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 1f87zU-0006iF-SS for xen-devel@lists.xenproject.org; Mon, 16 Apr 2018 17:32:32 +0000 In-Reply-To: <20180416173227.22671-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 SW4gcW1wX25leHQoKSwgdGhlIGlubmVyIGxvb3Agc2hvdWxkIG9ubHkgdHJ5IHRvIHBhcnNlIG1l c3NhZ2VzIGZyb20KUU1QLCBpZiB0aGVyZSBpcyBtb3JlIHRoYW4gb25lLgoKVGhlIGhhbmRsaW5n IG9mIHRoZSByZWNlaXZlIGJ1ZmZlciAoJ2luY29tcGxldGUnKSwgc2hvdWxkIGJlIGRvbmUgYXQg dGhlCnNhbWUgc2NvcGUgbGV2ZWwgYXMgcmVhZCgpLiBJdCBkb2Vzbid0IG5lZWQgdG8gYmUgaGFu ZGxlIG1vcmUgdGhhdCBvbmNlCmFmdGVyIGEgcmVhZC4KCkJlZm9yZSB0aGlzIHBhdGNoLCB3aGVu IG9uIG1lc3NhZ2Ugd2hhdCBoYW5kbGVkLCB0aGUgaW5uZXIgbG9vcCB3b3VsZApyZXN0YXJ0IGJ5 IGFkZGluZyB0aGUgJ2J1ZmZlcicgaW50byAnaW5jb21wbGV0ZScgKGFmdGVyIHJlYWxsb2NhdGlv bikuClNpbmNlICdyZCcgd2FzIG5vdCByZXNldCwgdGhlIGJ1ZmZlciB3b3VsZCBiZSBzdHJjYXQg YSBzZWNvbmQgdGltZS4KQWZ0ZXIgdGhhdCwgdGhlIHN0cmVhbSBmcm9tIHRoZSBRTVAgc2VydmVy IHdvdWxkIGhhdmUgc3ludGF4IGVycm9yLCBhbmQKdGhlIHBhcnNvciB3b3VsZCB0aHJvdyBlcnJv cnMuCgpUaGlzIGlzIHVubGlrZWx5IHRvIGhhcHBlbiBhcyB0aGUgcmVjZWl2ZSBidWZmZXIgaXMg dmVyeSBsYXJnZS4gQW5kCnJlY2VpdmluZyB0d28gbWVzc2FnZXMgaW4gYSByb3cgaXMgdW5saWtl bHkuIEluIHRoZSBjdXJyZW50IGNhc2UsIHRoaXMKY291bGQgYmUgYW4gZXZlbnQgYW5kIGEgcmVz cG9uc2UgdG8gYSBjb21tYW5kLgoKU2lnbmVkLW9mZi1ieTogQW50aG9ueSBQRVJBUkQgPGFudGhv bnkucGVyYXJkQGNpdHJpeC5jb20+Ci0tLQogdG9vbHMvbGlieGwvbGlieGxfcW1wLmMgfCAzMSAr KysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTYgaW5zZXJ0 aW9ucygrKSwgMTUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvdG9vbHMvbGlieGwvbGlieGxf cW1wLmMgYi90b29scy9saWJ4bC9saWJ4bF9xbXAuYwppbmRleCA0ZDIwN2MzODQyLi5hMjVmNDQ1 ZmI2IDEwMDY0NAotLS0gYS90b29scy9saWJ4bC9saWJ4bF9xbXAuYworKysgYi90b29scy9saWJ4 bC9saWJ4bF9xbXAuYwpAQCAtNTI0LDIzICs1MjQsMjQgQEAgc3RhdGljIGludCBxbXBfbmV4dChs aWJ4bF9fZ2MgKmdjLCBsaWJ4bF9fcW1wX2hhbmRsZXIgKnFtcCkKIAogICAgICAgICBERUJVR19S RVBPUlRfUkVDRUlWRUQocW1wLT5kb21pZCwgcW1wLT5idWZmZXIsIChpbnQpcmQpOwogCisgICAg ICAgIGlmIChpbmNvbXBsZXRlKSB7CisgICAgICAgICAgICBzaXplX3QgY3VycmVudF9wb3MgPSBz IC0gaW5jb21wbGV0ZTsKKyAgICAgICAgICAgIGluY29tcGxldGUgPSBsaWJ4bF9fcmVhbGxvYyhn YywgaW5jb21wbGV0ZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBp bmNvbXBsZXRlX3NpemUgKyByZCArIDEpOworICAgICAgICAgICAgc3RybmNhdChpbmNvbXBsZXRl ICsgaW5jb21wbGV0ZV9zaXplLCBxbXAtPmJ1ZmZlciwgcmQpOworICAgICAgICAgICAgcyA9IGlu Y29tcGxldGUgKyBjdXJyZW50X3BvczsKKyAgICAgICAgICAgIGluY29tcGxldGVfc2l6ZSArPSBy ZDsKKyAgICAgICAgICAgIHNfZW5kID0gaW5jb21wbGV0ZSArIGluY29tcGxldGVfc2l6ZTsKKyAg ICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIGluY29tcGxldGUgPSBsaWJ4bF9fc3RybmR1cChn YywgcW1wLT5idWZmZXIsIHJkKTsKKyAgICAgICAgICAgIGluY29tcGxldGVfc2l6ZSA9IHJkOwor ICAgICAgICAgICAgcyA9IGluY29tcGxldGU7CisgICAgICAgICAgICBzX2VuZCA9IHMgKyByZDsK KyAgICAgICAgICAgIHJkID0gMDsKKyAgICAgICAgfQorCiAgICAgICAgIGRvIHsKICAgICAgICAg ICAgIGNoYXIgKmVuZCA9IE5VTEw7Ci0gICAgICAgICAgICBpZiAoaW5jb21wbGV0ZSkgewotICAg ICAgICAgICAgICAgIHNpemVfdCBjdXJyZW50X3BvcyA9IHMgLSBpbmNvbXBsZXRlOwotICAgICAg ICAgICAgICAgIGluY29tcGxldGUgPSBsaWJ4bF9fcmVhbGxvYyhnYywgaW5jb21wbGV0ZSwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW5jb21wbGV0ZV9zaXpl ICsgcmQgKyAxKTsKLSAgICAgICAgICAgICAgICBzdHJuY2F0KGluY29tcGxldGUgKyBpbmNvbXBs ZXRlX3NpemUsIHFtcC0+YnVmZmVyLCByZCk7Ci0gICAgICAgICAgICAgICAgcyA9IGluY29tcGxl dGUgKyBjdXJyZW50X3BvczsKLSAgICAgICAgICAgICAgICBpbmNvbXBsZXRlX3NpemUgKz0gcmQ7 Ci0gICAgICAgICAgICAgICAgc19lbmQgPSBpbmNvbXBsZXRlICsgaW5jb21wbGV0ZV9zaXplOwot ICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICBpbmNvbXBsZXRlID0gbGlieGxf X3N0cm5kdXAoZ2MsIHFtcC0+YnVmZmVyLCByZCk7Ci0gICAgICAgICAgICAgICAgaW5jb21wbGV0 ZV9zaXplID0gcmQ7Ci0gICAgICAgICAgICAgICAgcyA9IGluY29tcGxldGU7Ci0gICAgICAgICAg ICAgICAgc19lbmQgPSBzICsgcmQ7Ci0gICAgICAgICAgICAgICAgcmQgPSAwOwotICAgICAgICAg ICAgfQogCiAgICAgICAgICAgICBlbmQgPSBzdHJzdHIocywgIlxyXG4iKTsKICAgICAgICAgICAg IGlmIChlbmQpIHsKLS0gCkFudGhvbnkgUEVSQVJECgoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxA bGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFu L2xpc3RpbmZvL3hlbi1kZXZlbA==