From mboxrd@z Thu Jan 1 00:00:00 1970 From: Konrad Rzeszutek Wilk Subject: [PATCH v4 5/9] livepatch: Move code from prepare_payload to own routine Date: Tue, 23 Aug 2016 22:22:08 -0400 Message-ID: <1472005332-32207-6-git-send-email-konrad.wilk@oracle.com> References: <1472005332-32207-1-git-send-email-konrad.wilk@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bcNq5-00030Q-9f for xen-devel@lists.xenproject.org; Wed, 24 Aug 2016 02:22:49 +0000 In-Reply-To: <1472005332-32207-1-git-send-email-konrad.wilk@oracle.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org, konrad@kernel.org, ross.lagerwall@citrix.com Cc: Konrad Rzeszutek Wilk List-Id: xen-devel@lists.xenproject.org U3BlY2lmaWNhbGx5IHRoZSBjb2RlIHRoYXQgaXMgbG9va2luZyB1cCBmLT5vbGRfYWRkciAtIHdo aWNoCmNhbiBiZSBpbiBpdHMgb3duIHJvdXRpbmUgaW5zdGVhZCBvZiBoYXZpbmcgaXQgcGFydCBv ZiBwcmVwYXJlX3BheWxvYWQuCgpObyBmdW5jdGlvbmFsIGNoYW5nZS4KClNpZ25lZC1vZmYtYnk6 IEtvbnJhZCBSemVzenV0ZWsgV2lsayA8a29ucmFkLndpbGtAb3JhY2xlLmNvbT4KCi0tLQpDYzog Um9zcyBMYWdlcndhbGwgPHJvc3MubGFnZXJ3YWxsQGNpdHJpeC5jb20+Cgp2MzogRmlyc3Qgc3Vi bWlzc2lvbi4KdjQ6IEFkZGVkIGNvbnN0IHRvIGxhc3QgcGFyYW1ldGVyIG9mICBsaXZlcGF0Y2hf c3ltYm9sc19sb29rdXAgZnVuY3Rpb24uCiAgICBSZW5hbWUgZnVuY3Rpb24gdG8gcmVzb2x2ZV9v bGRfYWRkcmVzcwogICAgTW92ZSBjb21tZW50IGRlc2NyaWJpbmcgZnVuY3Rpb24gcHVycG9zZSBh Ym92ZSBmdW5jdGlvbgotLS0KIHhlbi9jb21tb24vbGl2ZXBhdGNoLmMgfCA0NCArKysrKysrKysr KysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDI3IGlu c2VydGlvbnMoKyksIDE3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9jb21tb24vbGl2 ZXBhdGNoLmMgYi94ZW4vY29tbW9uL2xpdmVwYXRjaC5jCmluZGV4IGJkNjU3MTIuLmU1OTY4YTcg MTAwNjQ0Ci0tLSBhL3hlbi9jb21tb24vbGl2ZXBhdGNoLmMKKysrIGIveGVuL2NvbW1vbi9saXZl cGF0Y2guYwpAQCAtMjMzLDYgKzIzMywzMCBAQCBzdGF0aWMgY29uc3QgY2hhciAqbGl2ZXBhdGNo X3N5bWJvbHNfbG9va3VwKHVuc2lnbmVkIGxvbmcgYWRkciwKICAgICByZXR1cm4gbjsKIH0KIAor LyogTG9va3VwIGZ1bmN0aW9uJ3Mgb2xkIGFkZHJlc3MgaWYgbm90IGFscmVhZHkgcmVzb2x2ZWQu ICovCitzdGF0aWMgaW50IHJlc29sdmVfb2xkX2FkZHJlc3Moc3RydWN0IGxpdmVwYXRjaF9mdW5j ICpmLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IHN0cnVjdCBsaXZlcGF0 Y2hfZWxmICplbGYpCit7CisgICAgaWYgKCBmLT5vbGRfYWRkciApCisgICAgICAgIHJldHVybiAw OworCisgICAgZi0+b2xkX2FkZHIgPSAodm9pZCAqKXN5bWJvbHNfbG9va3VwX2J5X25hbWUoZi0+ bmFtZSk7CisgICAgaWYgKCAhZi0+b2xkX2FkZHIgKQorICAgIHsKKyAgICAgICAgZi0+b2xkX2Fk ZHIgPSAodm9pZCAqKWxpdmVwYXRjaF9zeW1ib2xzX2xvb2t1cF9ieV9uYW1lKGYtPm5hbWUpOwor ICAgICAgICBpZiAoICFmLT5vbGRfYWRkciApCisgICAgICAgIHsKKyAgICAgICAgICAgIGRwcmlu dGsoWEVOTE9HX0VSUiwgTElWRVBBVENIICIlczogQ291bGQgbm90IHJlc29sdmUgb2xkIGFkZHJl c3Mgb2YgJXNcbiIsCisgICAgICAgICAgICAgICAgICAgIGVsZi0+bmFtZSwgZi0+bmFtZSk7Cisg ICAgICAgICAgICByZXR1cm4gLUVOT0VOVDsKKyAgICAgICAgfQorICAgIH0KKyAgICBkcHJpbnRr KFhFTkxPR19ERUJVRywgTElWRVBBVENIICIlczogUmVzb2x2ZWQgb2xkIGFkZHJlc3MgJXMgPT4g JXBcbiIsCisgICAgICAgICAgICBlbGYtPm5hbWUsIGYtPm5hbWUsIGYtPm9sZF9hZGRyKTsKKwor ICAgIHJldHVybiAwOworfQorCiBzdGF0aWMgc3RydWN0IHBheWxvYWQgKmZpbmRfcGF5bG9hZChj b25zdCBjaGFyICpuYW1lKQogewogICAgIHN0cnVjdCBwYXlsb2FkICpkYXRhLCAqZm91bmQgPSBO VUxMOwpAQCAtNTI1LDIzICs1NDksOSBAQCBzdGF0aWMgaW50IHByZXBhcmVfcGF5bG9hZChzdHJ1 Y3QgcGF5bG9hZCAqcGF5bG9hZCwKICAgICAgICAgaWYgKCByYyApCiAgICAgICAgICAgICByZXR1 cm4gcmM7CiAKLSAgICAgICAgLyogTG9va3VwIGZ1bmN0aW9uJ3Mgb2xkIGFkZHJlc3MgaWYgbm90 IGFscmVhZHkgcmVzb2x2ZWQuICovCi0gICAgICAgIGlmICggIWYtPm9sZF9hZGRyICkKLSAgICAg ICAgewotICAgICAgICAgICAgZi0+b2xkX2FkZHIgPSAodm9pZCAqKXN5bWJvbHNfbG9va3VwX2J5 X25hbWUoZi0+bmFtZSk7Ci0gICAgICAgICAgICBpZiAoICFmLT5vbGRfYWRkciApCi0gICAgICAg ICAgICB7Ci0gICAgICAgICAgICAgICAgZi0+b2xkX2FkZHIgPSAodm9pZCAqKWxpdmVwYXRjaF9z eW1ib2xzX2xvb2t1cF9ieV9uYW1lKGYtPm5hbWUpOwotICAgICAgICAgICAgICAgIGlmICggIWYt Pm9sZF9hZGRyICkKLSAgICAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgICAgIGRwcmlu dGsoWEVOTE9HX0VSUiwgTElWRVBBVENIICIlczogQ291bGQgbm90IHJlc29sdmUgb2xkIGFkZHJl c3Mgb2YgJXNcbiIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgZWxmLT5uYW1lLCBmLT5u YW1lKTsKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuIC1FTk9FTlQ7Ci0gICAgICAgICAgICAg ICAgfQotICAgICAgICAgICAgfQotICAgICAgICAgICAgZHByaW50ayhYRU5MT0dfREVCVUcsIExJ VkVQQVRDSCAiJXM6IFJlc29sdmVkIG9sZCBhZGRyZXNzICVzID0+ICVwXG4iLAotICAgICAgICAg ICAgICAgICAgICBlbGYtPm5hbWUsIGYtPm5hbWUsIGYtPm9sZF9hZGRyKTsKLSAgICAgICAgfQor ICAgICAgICByYyA9IHJlc29sdmVfb2xkX2FkZHJlc3MoZiwgZWxmKTsKKyAgICAgICAgaWYgKCBy YyApCisgICAgICAgICAgICByZXR1cm4gcmM7CiAgICAgfQogCiAgICAgc2VjID0gbGl2ZXBhdGNo X2VsZl9zZWNfYnlfbmFtZShlbGYsIEVMRl9CVUlMRF9JRF9OT1RFKTsKLS0gCjIuNC4xMQoKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBt YWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3Jn L3hlbi1kZXZlbAo=