From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bruno Alvisio Subject: [PATCH RFC v3 RESEND 03/12] Migration with Local Disks Mirroring: Refactored migrate_read_fixedmessage Date: Sat, 23 Dec 2017 14:03:27 +0000 Message-ID: <1514037816-40864-4-git-send-email-bruno.alvisio@gmail.com> References: <1514037816-40864-1-git-send-email-bruno.alvisio@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1514037816-40864-1-git-send-email-bruno.alvisio@gmail.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: xen-devel@lists.xen.org, wei.liu2@citrix.com, dave@recoil.org, ian.jackson@eu.citrix.com List-Id: xen-devel@lists.xenproject.org VGhlIGZ1bmN0aW9uIG1pZ3JhdGVfZml4ZWRfbWVzc2FnZSBpcyBnb2luZyB0byBiZSB1c2VkIGlu IHRoZSBsaWJ4bCBjcmVhdGUgYW5kCnNhdmUgZmxvdyBmb3IgZXZlbnQgc3luY2hyb25pemF0aW9u IGR1cmluZyBtaWdyYXRpb24uIEl0IG5lZWRzIHRvIGJlIGFjY2Vzc2libGUKZnJvbSBsaWJ4bF9j cmVhdGUgYW5kIGxpYnhsX2RvbV9zYXZlIGFuZCB0aHVzIGl0IGlzIG1vdmVkIHRvIGxpYnhsX3V0 aWxzLgoKU2lnbmVkLW9mZi1ieTogQnJ1bm8gQWx2aXNpbyA8YnJ1bm8uYWx2aXNpb0BnbWFpbC5j b20+Ci0tLQogdG9vbHMvbGlieGwvbGlieGxfdXRpbHMuYyB8IDIxICsrKysrKysrKysrKysrKysr KysKIHRvb2xzL2xpYnhsL2xpYnhsX3V0aWxzLmggfCAgMyArKysKIHRvb2xzL3hsL3hsX21pZ3Jh dGUuYyAgICAgfCA1MiArKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLQogMyBmaWxlcyBjaGFuZ2VkLCA0MCBpbnNlcnRpb25zKCspLCAzNiBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS90b29scy9saWJ4bC9saWJ4bF91dGlscy5jIGIvdG9vbHMvbGlieGwvbGli eGxfdXRpbHMuYwppbmRleCA1MDdlZTU2Li41MTM5MzIwIDEwMDY0NAotLS0gYS90b29scy9saWJ4 bC9saWJ4bF91dGlscy5jCisrKyBiL3Rvb2xzL2xpYnhsL2xpYnhsX3V0aWxzLmMKQEAgLTUxMCw2 ICs1MTAsMjcgQEAgaW50IGxpYnhsX19yZWFkX3N5c2ZzX2ZpbGVfY29udGVudHMobGlieGxfX2dj ICpnYywgY29uc3QgY2hhciAqZmlsZW5hbWUsCiBSRUFEX1dSSVRFX0VYQUNUTFkocmVhZCwgMSwg LyogKi8pCiBSRUFEX1dSSVRFX0VYQUNUTFkod3JpdGUsIDAsIGNvbnN0KQogCitpbnQgbGlieGxf cmVhZF9maXhlZG1lc3NhZ2UobGlieGxfY3R4ICpjdHgsIGludCBmZCwgY29uc3Qgdm9pZCAqbXNn LCBpbnQgbXNnc3osCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgY2hhciAqd2hh dCwgY29uc3QgY2hhciAqcnVuZSkKK3sKKyAgICBjaGFyIGJ1Zlttc2dzel07CisgICAgY29uc3Qg Y2hhciAqc3RyZWFtOworICAgIGludCByYzsKKworICAgIHN0cmVhbSA9IHJ1bmUgPyAibWlncmF0 aW9uIHJlY2VpdmVyIHN0cmVhbSIgOiAibWlncmF0aW9uIHN0cmVhbSI7CisgICAgcmMgPSBsaWJ4 bF9yZWFkX2V4YWN0bHkoY3R4LCBmZCwgYnVmLCBtc2dzeiwgc3RyZWFtLCB3aGF0KTsKKyAgICBp ZiAocmMpIHJldHVybiAxOworCisgICAgaWYgKG1lbWNtcChidWYsIG1zZywgbXNnc3opKSB7Cisg ICAgICAgIGZwcmludGYoc3RkZXJyLCAiJXMgY29udGFpbmVkIHVuZXhwZWN0ZWQgZGF0YSBpbnN0 ZWFkIG9mICVzXG4iLAorICAgICAgICAgICAgICAgIHN0cmVhbSwgd2hhdCk7CisgICAgICAgIGlm IChydW5lKQorICAgICAgICAgICAgZnByaW50ZihzdGRlcnIsICIoY29tbWFuZCBydW4gd2FzOiAl cyApXG4iLCBydW5lKTsKKyAgICAgICAgcmV0dXJuIDE7CisgICAgfQorICAgIHJldHVybiAwOwor fQorCiBpbnQgbGlieGxfX3JlbW92ZV9maWxlKGxpYnhsX19nYyAqZ2MsIGNvbnN0IGNoYXIgKnBh dGgpCiB7CiAgICAgZm9yICg7OykgewpkaWZmIC0tZ2l0IGEvdG9vbHMvbGlieGwvbGlieGxfdXRp bHMuaCBiL3Rvb2xzL2xpYnhsL2xpYnhsX3V0aWxzLmgKaW5kZXggOWU3NDNkYy4uZDFlODBlZiAx MDA2NDQKLS0tIGEvdG9vbHMvbGlieGwvbGlieGxfdXRpbHMuaAorKysgYi90b29scy9saWJ4bC9s aWJ4bF91dGlscy5oCkBAIC01Niw2ICs1Niw5IEBAIGludCBsaWJ4bF93cml0ZV9leGFjdGx5KGxp YnhsX2N0eCAqY3R4LCBpbnQgZmQsIGNvbnN0IHZvaWQgKmRhdGEsCiAgICAqIGxvZ2dlZCB1c2lu ZyBmaWxlbmFtZSAod2hpY2ggaXMgb25seSB1c2VkIGZvciBsb2dnaW5nKSBhbmQgd2hhdAogICAg KiAod2hpY2ggbWF5IGJlIDApLiAqLwogCitpbnQgbGlieGxfcmVhZF9maXhlZG1lc3NhZ2UobGli eGxfY3R4ICpjdHgsIGludCBmZCwgY29uc3Qgdm9pZCAqbXNnLCBpbnQgbXNnc3osCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgY29uc3QgY2hhciAqd2hhdCwgY29uc3QgY2hhciAqcnVuZSk7 CisKIGludCBsaWJ4bF9waXBlKGxpYnhsX2N0eCAqY3R4LCBpbnQgcGlwZXNbMl0pOwogICAvKiBK dXN0IGxpa2UgcGlwZSgyKSwgYnV0IGxvZyBlcnJvcnMuICovCiAKZGlmZiAtLWdpdCBhL3Rvb2xz L3hsL3hsX21pZ3JhdGUuYyBiL3Rvb2xzL3hsL3hsX21pZ3JhdGUuYwppbmRleCAxZjBlODdkLi4z M2QzOWU4IDEwMDY0NAotLS0gYS90b29scy94bC94bF9taWdyYXRlLmMKKysrIGIvdG9vbHMveGwv eGxfbWlncmF0ZS5jCkBAIC02OCwyNiArNjgsNiBAQCBzdGF0aWMgcGlkX3QgY3JlYXRlX21pZ3Jh dGlvbl9jaGlsZChjb25zdCBjaGFyICpydW5lLCBpbnQgKnNlbmRfZmQsCiAgICAgcmV0dXJuIGNo aWxkOwogfQogCi1zdGF0aWMgaW50IG1pZ3JhdGVfcmVhZF9maXhlZG1lc3NhZ2UoaW50IGZkLCBj b25zdCB2b2lkICptc2csIGludCBtc2dzeiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBjb25zdCBjaGFyICp3aGF0LCBjb25zdCBjaGFyICpydW5lKSB7Ci0gICAgY2hhciBi dWZbbXNnc3pdOwotICAgIGNvbnN0IGNoYXIgKnN0cmVhbTsKLSAgICBpbnQgcmM7Ci0KLSAgICBz dHJlYW0gPSBydW5lID8gIm1pZ3JhdGlvbiByZWNlaXZlciBzdHJlYW0iIDogIm1pZ3JhdGlvbiBz dHJlYW0iOwotICAgIHJjID0gbGlieGxfcmVhZF9leGFjdGx5KGN0eCwgZmQsIGJ1ZiwgbXNnc3os IHN0cmVhbSwgd2hhdCk7Ci0gICAgaWYgKHJjKSByZXR1cm4gMTsKLQotICAgIGlmIChtZW1jbXAo YnVmLCBtc2csIG1zZ3N6KSkgewotICAgICAgICBmcHJpbnRmKHN0ZGVyciwgIiVzIGNvbnRhaW5l ZCB1bmV4cGVjdGVkIGRhdGEgaW5zdGVhZCBvZiAlc1xuIiwKLSAgICAgICAgICAgICAgICBzdHJl YW0sIHdoYXQpOwotICAgICAgICBpZiAocnVuZSkKLSAgICAgICAgICAgIGZwcmludGYoc3RkZXJy LCAiKGNvbW1hbmQgcnVuIHdhczogJXMgKVxuIiwgcnVuZSk7Ci0gICAgICAgIHJldHVybiAxOwot ICAgIH0KLSAgICByZXR1cm4gMDsKLX0KLQogc3RhdGljIHZvaWQgbWlncmF0aW9uX2NoaWxkX3Jl cG9ydChpbnQgcmVjdl9mZCkgewogICAgIHBpZF90IGNoaWxkOwogICAgIGludCBzdGF0dXMsIHNy OwpAQCAtMTYyLDkgKzE0Miw5IEBAIHN0YXRpYyB2b2lkIG1pZ3JhdGVfZG9fcHJlYW1ibGUoaW50 IHNlbmRfZmQsIGludCByZWN2X2ZkLCBwaWRfdCBjaGlsZCwKICAgICAgICAgZXhpdChFWElUX0ZB SUxVUkUpOwogICAgIH0KIAotICAgIHJjID0gbWlncmF0ZV9yZWFkX2ZpeGVkbWVzc2FnZShyZWN2 X2ZkLCBtaWdyYXRlX3JlY2VpdmVyX2Jhbm5lciwKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgc2l6ZW9mKG1pZ3JhdGVfcmVjZWl2ZXJfYmFubmVyKS0xLAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAiYmFubmVyIiwgcnVuZSk7CisgICAgcmMgPSBsaWJ4bF9y ZWFkX2ZpeGVkbWVzc2FnZShjdHgsIHJlY3ZfZmQsIG1pZ3JhdGVfcmVjZWl2ZXJfYmFubmVyLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2l6ZW9mKG1pZ3JhdGVfcmVjZWl2ZXJf YmFubmVyKS0xLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgImJhbm5lciIsIHJ1 bmUpOwogICAgIGlmIChyYykgewogICAgICAgICBjbG9zZShzZW5kX2ZkKTsKICAgICAgICAgbWln cmF0aW9uX2NoaWxkX3JlcG9ydChyZWN2X2ZkKTsKQEAgLTIxOSw5ICsxOTksOSBAQCBzdGF0aWMg dm9pZCBtaWdyYXRlX2RvbWFpbih1aW50MzJfdCBkb21pZCwgY29uc3QgY2hhciAqcnVuZSwgaW50 IGRlYnVnLAogICAgIC8vIFNob3VsZCBvbmx5IGJlIHByaW50ZWQgd2hlbiBkZWJ1Z2dpbmcgYXMg aXQncyBhIGJpdCBtZXNzeSB3aXRoCiAgICAgLy8gcHJvZ3Jlc3MgaW5kaWNhdGlvbi4KIAotICAg IHJjID0gbWlncmF0ZV9yZWFkX2ZpeGVkbWVzc2FnZShyZWN2X2ZkLCBtaWdyYXRlX3JlY2VpdmVy X3JlYWR5LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzaXplb2YobWlncmF0 ZV9yZWNlaXZlcl9yZWFkeSksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJy ZWFkeSBtZXNzYWdlIiwgcnVuZSk7CisgICAgcmMgPSBsaWJ4bF9yZWFkX2ZpeGVkbWVzc2FnZShj dHgsIHJlY3ZfZmQsIG1pZ3JhdGVfcmVjZWl2ZXJfcmVhZHksCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBzaXplb2YobWlncmF0ZV9yZWNlaXZlcl9yZWFkeSksCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAicmVhZHkgbWVzc2FnZSIsIHJ1bmUpOwogICAgIGlmIChy YykgZ290byBmYWlsZWRfcmVzdW1lOwogCiAgICAgeHRsX3N0ZGlvc3RyZWFtX2FkanVzdF9mbGFn cyhsb2dnZXIsIDAsIFhUTF9TVERJT1NUUkVBTV9ISURFX1BST0dSRVNTKTsKQEAgLTI1MSw5ICsy MzEsOSBAQCBzdGF0aWMgdm9pZCBtaWdyYXRlX2RvbWFpbih1aW50MzJfdCBkb21pZCwgY29uc3Qg Y2hhciAqcnVuZSwgaW50IGRlYnVnLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAibWln cmF0aW9uIHN0cmVhbSIsICJHTyBtZXNzYWdlIik7CiAgICAgaWYgKHJjKSBnb3RvIGZhaWxlZF9i YWRseTsKIAotICAgIHJjID0gbWlncmF0ZV9yZWFkX2ZpeGVkbWVzc2FnZShyZWN2X2ZkLCBtaWdy YXRlX3JlcG9ydCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2l6ZW9mKG1p Z3JhdGVfcmVwb3J0KSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgInN1Y2Nl c3MvZmFpbHVyZSByZXBvcnQgbWVzc2FnZSIsIHJ1bmUpOworICAgIHJjID0gbGlieGxfcmVhZF9m aXhlZG1lc3NhZ2UoY3R4LCByZWN2X2ZkLCBtaWdyYXRlX3JlcG9ydCwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHNpemVvZihtaWdyYXRlX3JlcG9ydCksCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAic3VjY2Vzcy9mYWlsdXJlIHJlcG9ydCBtZXNzYWdlIiwgcnVu ZSk7CiAgICAgaWYgKHJjKSBnb3RvIGZhaWxlZF9iYWRseTsKIAogICAgIHJjID0gbGlieGxfcmVh ZF9leGFjdGx5KGN0eCwgcmVjdl9mZCwKQEAgLTI2NSwxMCArMjQ1LDEwIEBAIHN0YXRpYyB2b2lk IG1pZ3JhdGVfZG9tYWluKHVpbnQzMl90IGRvbWlkLCBjb25zdCBjaGFyICpydW5lLCBpbnQgZGVi dWcsCiAgICAgICAgIGZwcmludGYoc3RkZXJyLCAibWlncmF0aW9uIHNlbmRlcjogVGFyZ2V0IHJl cG9ydHMgc3RhcnR1cCBmYWlsdXJlIgogICAgICAgICAgICAgICAgICIgKHN0YXR1cyBjb2RlICVk KS5cbiIsIHJjX2J1Zik7CiAKLSAgICAgICAgcmMgPSBtaWdyYXRlX3JlYWRfZml4ZWRtZXNzYWdl KHJlY3ZfZmQsIG1pZ3JhdGVfcGVybWlzc2lvbl90b19nbywKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHNpemVvZihtaWdyYXRlX3Blcm1pc3Npb25fdG9fZ28pLAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgInBlcm1pc3Npb24gZm9yIHNlbmRl ciB0byByZXN1bWUiLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcnVu ZSk7CisgICAgICAgIHJjID0gbGlieGxfcmVhZF9maXhlZG1lc3NhZ2UoY3R4LCByZWN2X2ZkLCBt aWdyYXRlX3Blcm1pc3Npb25fdG9fZ28sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgc2l6ZW9mKG1pZ3JhdGVfcGVybWlzc2lvbl90b19nbyksCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgInBlcm1pc3Npb24gZm9yIHNlbmRlciB0byByZXN1bWUiLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJ1bmUpOwogICAgICAgICBpZiAo cmMpIGdvdG8gZmFpbGVkX2JhZGx5OwogCiAgICAgICAgIGZwcmludGYoc3RkZXJyLCAibWlncmF0 aW9uIHNlbmRlcjogVHJ5aW5nIHRvIHJlc3VtZSBhdCBvdXIgZW5kLlxuIik7CkBAIC00MTYsOSAr Mzk2LDkgQEAgc3RhdGljIHZvaWQgbWlncmF0ZV9yZWNlaXZlKGludCBkZWJ1ZywgaW50IGRhZW1v bml6ZSwgaW50IG1vbml0b3IsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJtaWdyYXRp b24gYWNrIHN0cmVhbSIsICJyZWFkeSBtZXNzYWdlIik7CiAgICAgaWYgKHJjKSBleGl0KEVYSVRf RkFJTFVSRSk7CiAKLSAgICByYyA9IG1pZ3JhdGVfcmVhZF9maXhlZG1lc3NhZ2UocmVjdl9mZCwg bWlncmF0ZV9wZXJtaXNzaW9uX3RvX2dvLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBzaXplb2YobWlncmF0ZV9wZXJtaXNzaW9uX3RvX2dvKSwKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIkdPIG1lc3NhZ2UiLCAwKTsKKyAgICByYyA9IGxpYnhsX3JlYWRf Zml4ZWRtZXNzYWdlKGN0eCwgcmVjdl9mZCwgbWlncmF0ZV9wZXJtaXNzaW9uX3RvX2dvLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2l6ZW9mKG1pZ3JhdGVfcGVybWlzc2lvbl90 b19nbyksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiR08gbWVzc2FnZSIsIDAp OwogICAgIGlmIChyYykgZ290byBwZXJoYXBzX2Rlc3Ryb3lfbm90aWZ5X3JjOwogCiAgICAgZnBy aW50ZihzdGRlcnIsICJtaWdyYXRpb24gdGFyZ2V0OiBHb3QgcGVybWlzc2lvbiwgc3RhcnRpbmcg ZG9tYWluLlxuIik7Ci0tIAoyLjMuMiAoQXBwbGUgR2l0LTU1KQoKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVu LWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcv bWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw=