From mboxrd@z Thu Jan  1 00:00:00 1970
From: Andrew Cooper <andrew.cooper3@citrix.com>
Subject: [PATCH for-4.7] tools/libxl: Fix legacy migration
	following COLO backchannel breakage
Date: Thu, 14 Apr 2016 20:54:15 +0100
Message-ID: <1460663655-8226-1-git-send-email-andrew.cooper3@citrix.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <xen-devel-bounces@lists.xen.org>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
 <mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
 <mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Errors-To: xen-devel-bounces@lists.xen.org
Sender: "Xen-devel" <xen-devel-bounces@lists.xen.org>
To: Xen-devel <xen-devel@lists.xen.org>
Cc: Olaf Hering <olaf@aepfle.de>, Changlong Xie <xiecl.fnst@cn.fujitsu.com>, Wei Liu <wei.liu2@citrix.com>, Wen Congyang <wency@cn.fujitsu.com>, Andrew Cooper <andrew.cooper3@citrix.com>, Ian Jackson <Ian.Jackson@eu.citrix.com>, Yang Hongyang <hongyang.yang@easystack.cn>
List-Id: xen-devel@lists.xenproject.org

Yy9zIGY1ZDk0N2JmMWIgInRvb2xzL2xpYnhsOiBhZGQgYmFjayBjaGFubmVsIHN1cHBvcnQgdG8g
cmVhZCBzdHJlYW0iCm1hZGUgYSBib2d1cyBhZGp1c3RtZW50IHRvIGxpYnhsX19zdHJlYW1fcmVh
ZF9zdGFydCgpLCBpbmNsdWRpbmcKcmVtb3ZpbmcgdGhlIGNvbW1lbnQgaGludGluZyBhdCB3aGF0
IHdhcyBnb2luZyBvbiwgd2hpY2ggYnJlYWtzCmNvbnZlcnNpb24gb2YgYSBsZWdhY3kgbWlncmF0
aW9uIHN0cmVhbS4KClN5bXB0b21zIGxvb2sgbGlrZToKCiAgcm9vdEBhbm9ueW1pOn4gIyB4bCBt
aWdyYXRlIGRvbVUgaG9zdAogIG1pZ3JhdGlvbiB0YXJnZXQ6IFJlYWR5IHRvIHJlY2VpdmUgZG9t
YWluLgogIFNhdmluZyB0byBtaWdyYXRpb24gc3RyZWFtIG5ldyB4bCBmb3JtYXQgKGluZm8gMHgx
LzB4MC8yNjc3KQogIHhjOiBlcnJvcjogZXJyb3IgcG9sbGluZyBzdXNwZW5kIG5vdGlmaWNhdGlv
biBjaGFubmVsOiAtMTogSW50ZXJuYWwgZXJyb3IKICBMb2FkaW5nIG5ldyBzYXZlIGZpbGUgPGlu
Y29taW5nIG1pZ3JhdGlvbiBzdHJlYW0+IChuZXcgeGwgZm10IGluZm8gMHgxLzB4MC8yNjc3KQog
ICBTYXZlZmlsZSBjb250YWlucyB4bCBkb21haW4gY29uZmlnIGluIEpTT04gZm9ybWF0CiAgUGFy
c2luZyBjb25maWcgZnJvbSA8c2F2ZWQ+CiAgbGlieGw6IGVycm9yOiBsaWJ4bF9zdHJlYW1fcmVh
ZC5jOjMyNzpzdHJlYW1faGVhZGVyX2RvbmU6IEludmFsaWQgaWRlbnQ6IGV4cGVjdGVkIDB4NGM2
OTYyNzg2YzQ2NmQ3NCwgZ290IDB4MDFmMDBmMDAwMDAwMDAwMAogIGxpYnhsOiBlcnJvcjogbGli
eGxfdXRpbHMuYzo0MzA6bGlieGxfcmVhZF9leGFjdGx5OiBmaWxlL3N0cmVhbSB0cnVuY2F0ZWQg
cmVhZGluZyBpcGMgbXNnIGhlYWRlciBmcm9tIGRvbWFpbiAxIHNhdmUvcmVzdG9yZSBoZWxwZXIg
c3Rkb3V0IHBpcGUKClRoZSBhZGp1c3RtZW50IGlzIG5vdCByZXF1aXJlZCBmb3IgYmFja2NoYW5u
ZWwgc3VwcG9ydCAoYXMgdGhlcmUgaXMgbm8KaW50ZXJhY3Rpb24gYmV0d2VlbiBiYWNrIGNoYW5u
ZWxzIGFuZCBsZWdhY3kgY29udmVyc2lvbiksIGFuZCBjYXVzZWQKc3RyZWFtLT5mZCB0byBiZSBs
YXRjaGVkIGluIHRoZSBkYXRhY29waWVyIGJlZm9yZSBsZWdhY3kgY29udmVyc2lvbgpzdWJzdGl0
dXRlcyBpdCBmb3IgdGhlIGZkIHdoaWNoIGlzIHRoZSBvdXRwdXQgb2YgdGhlIGNvbnZlcnNpb24g
c2NyaXB0LgoKVGhpcyBjYXVzZXMgbGlieGwgdG8gY29uc3VtZSBkYXRhIGZyb20gdGhlIGxlZ2Fj
eSBzdHJlYW0gcmF0aGVyIHRoYW4gdGhlCnYyIHN0cmVhbSwgYW5kIGZvciB0aGUgY29udmVyc2lv
biBzY3JpcHQgdG8gZW5jb3VudGVyIGFuIGVycm9yIGFzIHRoZQpsZWdhY3kgc3RyZWFtIGFwcGVh
cnMgdG8gc2tpcCBhaGVhZC4KClVuZG8gdGhlIGFkanVzdG1lbnRzIHRvIGxpYnhsX19zdHJlYW1f
cmVhZF9zdGFydCgpLCBhbmQgaW50cm9kdWNlIGEKYmV0dGVyIGRlc2NyaXB0aW9uIG9mIHdoYXQg
aXMgZ29pbmcgb24uICBJbnRyb2R1Y2Ugc29tZSBleHRyYSBhc3NlcnRpb25zCnRvIHRyeSBhbmQg
Y2F0Y2ggc2ltaWxhciBicmVha2FnZSBpbiB0aGUgZnV0dXJlLgoKUmVwb3J0ZWQtYnk6IE9sYWYg
SGVyaW5nIDxvbGFmQGFlcGZsZS5kZT4KU2lnbmVkLW9mZi1ieTogQW5kcmV3IENvb3BlciA8YW5k
cmV3LmNvb3BlcjNAY2l0cml4LmNvbT4KLS0tCkNDOiBJYW4gSmFja3NvbiA8SWFuLkphY2tzb25A
ZXUuY2l0cml4LmNvbT4KQ0M6IFdlaSBMaXUgPHdlaS5saXUyQGNpdHJpeC5jb20+CkNDOiBPbGFm
IEhlcmluZyA8b2xhZkBhZXBmbGUuZGU+CkNDOiBZYW5nIEhvbmd5YW5nIDxob25neWFuZy55YW5n
QGVhc3lzdGFjay5jbj4KQ0M6IFdlbiBDb25neWFuZyA8d2VuY3lAY24uZnVqaXRzdS5jb20+CkND
OiBDaGFuZ2xvbmcgWGllIDx4aWVjbC5mbnN0QGNuLmZ1aml0c3UuY29tPgotLS0KIHRvb2xzL2xp
YnhsL2xpYnhsX3N0cmVhbV9yZWFkLmMgfCAzMyArKysrKysrKysrKysrKysrKysrKysrKystLS0t
LS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyNCBpbnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygtKQoK
ZGlmZiAtLWdpdCBhL3Rvb2xzL2xpYnhsL2xpYnhsX3N0cmVhbV9yZWFkLmMgYi90b29scy9saWJ4
bC9saWJ4bF9zdHJlYW1fcmVhZC5jCmluZGV4IDk2NTkwNTEuLjg5YzJmMjEgMTAwNjQ0Ci0tLSBh
L3Rvb2xzL2xpYnhsL2xpYnhsX3N0cmVhbV9yZWFkLmMKKysrIGIvdG9vbHMvbGlieGwvbGlieGxf
c3RyZWFtX3JlYWQuYwpAQCAtMjM0LDE2ICsyMzQsMTYgQEAgdm9pZCBsaWJ4bF9fc3RyZWFtX3Jl
YWRfc3RhcnQobGlieGxfX2VnYyAqZWdjLAogICAgIHN0cmVhbS0+cnVubmluZyA9IHRydWU7CiAg
ICAgc3RyZWFtLT5waGFzZSAgID0gU1JTX1BIQVNFX05PUk1BTDsKIAotICAgIGRjLT5hbyAgICAg
ICA9IHN0cmVhbS0+YW87Ci0gICAgZGMtPmNvcHl3aGF0ID0gInJlc3RvcmUgdjIgc3RyZWFtIjsK
LSAgICBkYy0+cmVhZGZkID0gc3RyZWFtLT5mZDsKLSAgICBkYy0+d3JpdGVmZCAgPSAtMTsKLQot
ICAgIGlmIChzdHJlYW0tPmJhY2tfY2hhbm5lbCkKLSAgICAgICAgcmV0dXJuOwotCiAgICAgaWYg
KHN0cmVhbS0+bGVnYWN5KSB7Ci0gICAgICAgIC8qIENvbnZlcnQgdGhlIGxlZ2FjeSBzdHJlYW0u
ICovCisgICAgICAgIC8qCisgICAgICAgICAqIENvbnZlcnQgdGhlIGxlZ2FjeSBzdHJlYW0uCisg
ICAgICAgICAqCisgICAgICAgICAqIFRoaXMgcmVzdWx0cyBpbiBhIGZvcmsoKS9leGVjKCkgb2Yg
Y29udmVyc2lvbiBoZWxwZXIgc2NyaXB0LiAgSXQgaXMKKyAgICAgICAgICogcGFzc2VkIHRoZSBl
eGl0aW5nIHN0cmVhbS0+ZmQgYXMgYW4gaW5wdXQsIGFuZCByZXR1cm5zIHRoZQorICAgICAgICAg
KiB0cmFuc2Zvcm1lZCBzdHJlYW0gdmlhIGEgbmV3IHBpcGUuICBUaGUgZmQgb2YgdGhpcyBuZXcg
cGlwZSB0aGVuCisgICAgICAgICAqIHJlcGxhY2VzIHN0cmVhbS0+ZmQsIHRvIG1ha2UgdGhlIHJl
c3Qgb2YgdGhlIHN0cmVhbSByZWFkIGNvZGUKKyAgICAgICAgICogYWdub3N0aWMgdG8gd2hldGhl
ciBsZWdhY3kgY29udmVyc2lvbiBpcyBoYXBwZW5pbmcgb3Igbm90LgorICAgICAgICAgKi8KICAg
ICAgICAgbGlieGxfX2NvbnZlcnNpb25faGVscGVyX3N0YXRlICpjaHMgPSAmc3RyZWFtLT5jaHM7
CiAKICAgICAgICAgY2hzLT5sZWdhY3lfZmQgPSBzdHJlYW0tPmZkOwpAQCAtMjU4LDEwICsyNTgs
MjUgQEAgdm9pZCBsaWJ4bF9fc3RyZWFtX3JlYWRfc3RhcnQobGlieGxfX2VnYyAqZWdjLAogICAg
ICAgICAgICAgZ290byBlcnI7CiAgICAgICAgIH0KIAorICAgICAgICAvKiBUaGVyZSBzaG91bGQg
YmUgbm8gaW50ZXJhY3Rpb24gb2YgQ09MTyBiYWNrY2hhbm5lbHMgYW5kIGxlZ2FjeQorICAgICAg
ICAgKiBzdHJlYW0gY29udmVyc2lvbi4gKi8KKyAgICAgICAgYXNzZXJ0KCFzdHJlYW0tPmJhY2tf
Y2hhbm5lbCk7CisKKyAgICAgICAgLyogQ29uZmlybSAqZGMgaXMgc3RpbGwgemVyb2VkIG91dCwg
d2hpbGUgd2Ugc2h1ZmZsZSBzdHJlYW0tPmZkLiAqLworICAgICAgICBhc3NlcnQoZGMtPmFvID09
IE5VTEwpOwogICAgICAgICBhc3NlcnQoc3RyZWFtLT5jaHMudjJfY2FyZWZkKTsKICAgICAgICAg
c3RyZWFtLT5mZCA9IGxpYnhsX19jYXJlZmRfZmQoc3RyZWFtLT5jaHMudjJfY2FyZWZkKTsKICAg
ICAgICAgc3RyZWFtLT5kY3MtPmxpYnhjX2ZkID0gc3RyZWFtLT5mZDsKICAgICB9CisgICAgLyog
c3RyZWFtLT5mZCBpcyBub3cgYSB2MiBzdHJlYW0uICovCisKKyAgICBkYy0+YW8gICAgICAgPSBz
dHJlYW0tPmFvOworICAgIGRjLT5jb3B5d2hhdCA9ICJyZXN0b3JlIHYyIHN0cmVhbSI7CisgICAg
ZGMtPnJlYWRmZCAgID0gc3RyZWFtLT5mZDsKKyAgICBkYy0+d3JpdGVmZCAgPSAtMTsKKworICAg
IGlmIChzdHJlYW0tPmJhY2tfY2hhbm5lbCkKKyAgICAgICAgcmV0dXJuOwogCiAgICAgLyogU3Rh
cnQgcmVhZGluZyB0aGUgc3RyZWFtIGhlYWRlci4gKi8KICAgICByYyA9IHNldHVwX3JlYWQoc3Ry
ZWFtLCAic3RyZWFtIGhlYWRlciIsCi0tIAoyLjEuNAoKCl9fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVs
QGxpc3RzLnhlbi5vcmcKaHR0cDovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg==