From: Pawel Wieczorkiewicz Subject: [livepatch-build-tools part3 3/3] create-diff-object: Strip all undefined entires of known size Date: Tue, 16 Apr 2019 12:22:41 +0000 Message-ID: <20190416122241.28342-3-wipawel@amazon.de> References: <20190416122241.28342-1-wipawel@amazon.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190416122241.28342-1-wipawel@amazon.de> 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 Cc: mpohlack@amazon.de, ross.lagerwall@citrix.com, Pawel Wieczorkiewicz , konrad.wilk@oracle.com List-Id: xen-devel@lists.xenproject.org VGhlIHBhdGNoZWQgRUxGIG9iamVjdCBmaWxlIGNvbnRhaW5zIGFsbCBzZWN0aW9ucyBhbmQgc3lt Ym9scyBhcwpyZXN1bHRlZCBmcm9tIHRoZSBjb21waWxhdGlvbi4gSG93ZXZlciwgY2VydGFpbiBz eW1ib2xzIG1heSBub3QgYmUKY29waWVkIG92ZXIgdG8gdGhlIHJlc3VsdGluZyBvYmplY3QgZmls ZSwgZHVlIHRvIGJlaW5nIHVuY2hhbmdlZCBvcgpub3QgaW5jbHVkZWQgZm9yIG90aGVyIHJlYXNv bnMuCkluIHN1Y2ggc2l0dWF0aW9uIHRoZSByZXN1bHRpbmcgb2JqZWN0IGZpbGUgaGFzIHRoZSBl bnRpcmUgc2VjdGlvbnMKY29waWVkIGFsb25nICh3aXRoIGFsbCB0aGVpciBlbnRyaWVzIHVuY2hh bmdlZCksIHdoaWxlIHNvbWUgb2YgdGhlCmNvcnJlc3BvbmRpbmcgc3ltYm9scyBhcmUgbm90IGNv cGllZCBhbG9uZyBhdCBhbGwuClRoaXMgbGVhZHMgdG8gaGF2aW5nIGluY29ycmVjdCBkdW1teSAo U1ROX1VOREVGKSBlbnRyaWVzIGluIHRoZSBmaW5hbApob3RwYXRjaCBFTEYgZmlsZS4KClRoZSBu ZXdseSBhZGRlZCBmdW5jdGlvbiBsaXZlcGF0Y2hfc3RyaXBfdW5kZWZpbmVkX2VsZW1lbnRzKCkg ZGV0ZWN0cwphbmQgcmVtb3ZlcyBhbGwgdW5kZWZpbmVkIFJFTEEgZW50cmllcyBhcyB3ZWxsIGFz IHRoZWlyIGNvcnJlc3BvbmRpbmcKUFJPR0JJVFMgc2VjdGlvbiBlbnRyaWVzLgpTaW5jZSB0aGUg c2VjdGlvbnMgbWF5IGNvbnRhaW4gZWxlbWVudHMgb2YgdW5rbm93biBzaXplIChzaC5zaF9lbnRz aXplCj09IDApLCBwZXJmb3JtIHRoZSBzdHJpcCBvbmx5IG9uIHNlY3Rpb25zIHdpdGggd2VsbCBk ZWZpbmVkIGVudHJ5CnNpemVzLgoKQWZ0ZXIgcmVwbGFjaW5nIHRoZSBzdHJpcHBlZCByZWxhIGxp c3QsIGl0IGlzIGFzc3VtZWQgdGhhdCB0aGUgbmV4dAppbnZvY2F0aW9uIG9mIHRoZSBrcGF0Y2hf cmVidWlsZF9yZWxhX3NlY3Rpb25fZGF0YSgpIHdpbGwgYWRqdXN0IGFsbApzZWN0aW9uIGhlYWRl ciBwYXJhbWV0ZXJzIGFjY29yZGluZyB0byB0aGUgY3VycmVudCBzdGF0ZS4KClNpZ25lZC1vZmYt Ynk6IFBhd2VsIFdpZWN6b3JraWV3aWN6IDx3aXBhd2VsQGFtYXpvbi5kZT4KUmV2aWV3ZWQtYnk6 IE1hcnRpbiBQb2hsYWNrIDxtcG9obGFja0BhbWF6b24uZGU+ClJldmlld2VkLWJ5OiBCam9lcm4g RG9lYmVsIDxkb2ViZWxAYW1hem9uLmRlPgpSZXZpZXdlZC1ieTogTm9yYmVydCBNYW50aGV5IDxu bWFudGhleUBhbWF6b24uZGU+ClJldmlld2VkLWJ5OiBBbmRyYS1JcmluYSBQYXJhc2NoaXYgPGFu ZHJhcHJzQGFtYXpvbi5jb20+CgpDUjogaHR0cHM6Ly9jb2RlLmFtYXpvbi5jb20vcmV2aWV3cy9D Ui03MzY4NjYyCi0tLQogY3JlYXRlLWRpZmYtb2JqZWN0LmMgfCAxMTUgKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystCiAxIGZpbGUgY2hhbmdlZCwgMTEz IGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvY3JlYXRlLWRpZmYt b2JqZWN0LmMgYi9jcmVhdGUtZGlmZi1vYmplY3QuYwppbmRleCA5NmI2NzE2Li40ZjAzMWVmIDEw MDY0NAotLS0gYS9jcmVhdGUtZGlmZi1vYmplY3QuYworKysgYi9jcmVhdGUtZGlmZi1vYmplY3Qu YwpAQCAtMTQ3Myw2ICsxNDczLDEzIEBAIHN0YXRpYyBpbmxpbmUgaW50IGdldF9zZWN0aW9uX2Vu dHJ5X3NpemUoY29uc3Qgc3RydWN0IHNlY3Rpb24gKnNlYywgc3RydWN0IGtwYXRjCiAgICAgICAg IHJldHVybiBlbnRyeV9zaXplOwogfQogCisvKiBDaGVjayBpZiBSRUxBIGVudHJ5IGhhcyB1bmRl ZmluZWQgKFNUTl9VTkRFRikgb3IgdW5jaGFuZ2VkL25vdC1pbmNsdWRlZCBlbGVtZW50cy4gKi8K K3N0YXRpYyBpbmxpbmUgYm9vbCBoYXNfcmVsYV91bmRlZmluZWRfZWxlbWVudChjb25zdCBzdHJ1 Y3QgcmVsYSAqcmVsYSkKK3sKKwlyZXR1cm4gKEdFTEZfUl9TWU0ocmVsYS0+cmVsYS5yX2luZm8p ID09IFNUTl9VTkRFRikgfHwKKwkgICAgICAgKCFyZWxhLT5zeW0tPmluY2x1ZGUgJiYgKHJlbGEt PnN5bS0+c3RhdHVzID09IFNBTUUpKTsKK30KKwogc3RhdGljIHZvaWQga3BhdGNoX3ZlcmlmeV9w YXRjaGFiaWxpdHkoc3RydWN0IGtwYXRjaF9lbGYgKmtlbGYpCiB7CiAJc3RydWN0IHNlY3Rpb24g KnNlYzsKQEAgLTE1MjAsOCArMTUyNyw3IEBAIHN0YXRpYyB2b2lkIGtwYXRjaF92ZXJpZnlfcGF0 Y2hhYmlsaXR5KHN0cnVjdCBrcGF0Y2hfZWxmICprZWxmKQogCQkJCQkJaWYgKHJlbGEtPm9mZnNl dCA8IG9mZnNldCB8fCByZWxhLT5vZmZzZXQgPj0gb2Zmc2V0ICsgZW50cnlfc2l6ZSkKIAkJCQkJ CQljb250aW51ZTsKIAotCQkJCQkJaWYgKChHRUxGX1JfU1lNKHJlbGEtPnJlbGEucl9pbmZvKSA9 PSBTVE5fVU5ERUYpIHx8Ci0JCQkJCQkgICAgKCFyZWxhLT5zeW0tPmluY2x1ZGUgJiYgKHJlbGEt PnN5bS0+c3RhdHVzID09IFNBTUUpKSkgeworCQkJCQkJaWYgKGhhc19yZWxhX3VuZGVmaW5lZF9l bGVtZW50KHJlbGEpKSB7CiAJCQkJCQkJbG9nX25vcm1hbCgic2VjdGlvbiAlcyBoYXMgYW4gZW50 cnkgd2l0aCBhIFNUTl9VTkRFRiBzeW1ib2w6ICVzXG4iLAogCQkJCQkJCQkgICBzZWMtPm5hbWUs IHJlbGEtPnN5bS0+bmFtZSA/IHJlbGEtPnN5bS0+bmFtZSA6ICJub25lIik7CiAJCQkJCQkJZXJy cysrOwpAQCAtMTg4OSw2ICsxODk1LDEwOSBAQCBzdGF0aWMgdm9pZCBsaXZlcGF0Y2hfY3JlYXRl X3BhdGNoZXNfc2VjdGlvbnMoc3RydWN0IGtwYXRjaF9lbGYgKmtlbGYsCiAKIH0KIAorLyoKKyAq IFRoZSBwYXRjaGVkIEVMRiBvYmplY3QgZmlsZSBjb250YWlucyBhbGwgc2VjdGlvbnMgYW5kIHN5 bWJvbHMgYXMgcmVzdWx0ZWQKKyAqIGZyb20gdGhlIGNvbXBpbGF0aW9uLiBIb3dldmVyLCBjZXJ0 YWluIHN5bWJvbHMgbWF5IG5vdCBiZSBjb3BpZWQgb3ZlciB0bworICogdGhlIHJlc3VsdGluZyBv YmplY3QgZmlsZSwgZHVlIHRvIGJlaW5nIHVuY2hhbmdlZCBvciBub3QgaW5jbHVkZWQgZm9yIG90 aGVyCisgKiByZWFzb25zLgorICogSW4gc3VjaCBzaXR1YXRpb24gdGhlIHJlc3VsdGluZyBvYmpl Y3QgZmlsZSBoYXMgdGhlIGVudGlyZSBzZWN0aW9ucyBjb3BpZWQKKyAqIGFsb25nICh3aXRoIGFs bCB0aGVpciBlbnRyaWVzIHVuY2hhbmdlZCksIHdoaWxlIHNvbWUgb2YgdGhlIGNvcnJlc3BvbmRp bmcKKyAqIHN5bWJvbHMgYXJlIG5vdCBjb3BpZWQgYWxvbmcgYXQgYWxsLgorICogVGhpcyBsZWFk cyB0byBoYXZpbmcgaW5jb3JyZWN0IGR1bW15IChTVE5fVU5ERUYpIGVudHJpZXMgaW4gdGhlIGZp bmFsCisgKiBob3RwYXRjaCBFTEYgZmlsZS4KKyAqIFRoaXMgZnVuY3Rpb25zIHJlbW92ZXMgYWxs IHVuZGVmaW5lZCBlbnRyaWVzIG9mIGtub3duIHNpemUgZnJvbSBib3RoCisgKiBSRUxBIGFuZCBQ Uk9HQklUUyBzZWN0aW9ucyBvZiB0aGUgcGF0Y2hlZCBlbGYgb2JqZWN0LgorICovCitzdGF0aWMg dm9pZCBsaXZlcGF0Y2hfc3RyaXBfdW5kZWZpbmVkX2VsZW1lbnRzKHN0cnVjdCBrcGF0Y2hfZWxm ICprZWxmKQoreworCXN0cnVjdCBzZWN0aW9uICpzZWM7CisKKwlsaXN0X2Zvcl9lYWNoX2VudHJ5 KHNlYywgJmtlbGYtPnNlY3Rpb25zLCBsaXN0KSB7CisJCXN0cnVjdCByZWxhICpyZWxhLCAqc2Fm ZTsKKwkJaW50IHNyY19vZmZzZXQgPSAwLCBkc3Rfb2Zmc2V0ID0gMDsKKwkJaW50IGVudHJ5X3Np emUsIGFsaWduLCBhbGlnbmVkX3NpemU7CisJCWNoYXIgKnNyYywgKmRzdDsKKwkJTElTVF9IRUFE KG5ld3JlbGFzKTsKKworCQkvKiB1c2UgUkVMQSBzZWN0aW9uIHRvIGZpbmQgYWxsIGl0cyB1bmRl ZmluZWQgZW50cmllcyAqLworCQlpZiAoIWlzX3JlbGFfc2VjdGlvbihzZWMpKQorCQkJY29udGlu dWU7CisKKwkJLyogb25seSBrbm93biwgZml4ZWQtc2l6ZSBlbnRyaWVzIGNhbiBiZSBzdHJpcHBl ZCAqLworCQllbnRyeV9zaXplID0gZ2V0X3NlY3Rpb25fZW50cnlfc2l6ZShzZWMtPmJhc2UsIGtl bGYpOworCQlpZiAoZW50cnlfc2l6ZSA9PSAwKQorCQkJY29udGludWU7CisKKwkJLyogYWxsb2Mg YnVmZmVyIGZvciBuZXcgYmFzZSBzZWN0aW9uICovCisJCWRzdCA9IG1hbGxvYyhzZWMtPmJhc2Ut PnNoLnNoX3NpemUpOworCQlpZiAoIWRzdCkKKwkJCUVSUk9SKCJtYWxsb2MiKTsKKworCQkvKiBp dGVyYXRlIHRocm91Z2ggYWxsIGVudHJpZXMgb2YgYSBjb3JyZXNwb25kaW5nIGJhc2Ugc2VjdGlv biBmb3IgdGhpcyBSRUxBIHNlY3Rpb24gKi8KKwkJZm9yICggc3JjID0gc2VjLT5iYXNlLT5kYXRh LT5kX2J1Zjsgc3JjX29mZnNldCA8IHNlYy0+YmFzZS0+c2guc2hfc2l6ZTsgc3JjX29mZnNldCAr PSBlbnRyeV9zaXplICkgeworCQkJYm9vbCBmb3VuZF92YWxpZCA9IGZhbHNlOworCisJCQlsaXN0 X2Zvcl9lYWNoX2VudHJ5X3NhZmUocmVsYSwgc2FmZSwgJnNlYy0+cmVsYXMsIGxpc3QpIHsKKwkJ CQkvKiBjaGVjayBhbGwgUkVMQSBlbGVtZW50cyBsb29raW5nIGZvciBjb3JyZXNwb25kaW5nIGVu dHJ5IHJlZmVyZW5jZXMgKi8KKwkJCQlpZiAocmVsYS0+b2Zmc2V0IDwgc3JjX29mZnNldCB8fCBy ZWxhLT5vZmZzZXQgPj0gc3JjX29mZnNldCArIGVudHJ5X3NpemUpCisJCQkJCWNvbnRpbnVlOwor CisJCQkJLyogaWdub3JlIGFsbCB1bmRlZmluZWQgKFNUTl9VTkRFRikgb3IgdW5jaGFuZ2VkL25v dC1pbmNsdWRlZCBlbGVtZW50cyAqLworCQkJCWlmIChoYXNfcmVsYV91bmRlZmluZWRfZWxlbWVu dChyZWxhKSkgeworCQkJCQlsb2dfbm9ybWFsKCJGb3VuZCBhIFNUTl9VTkRFRiBzeW1ib2wgJXMg aW4gc2VjdGlvbiAlc1xuIiwKKwkJCQkJCSAgIHJlbGEtPnN5bS0+bmFtZSwgc2VjLT5uYW1lKTsK KwkJCQkJY29udGludWU7CisJCQkJfQorCisJCQkJLyoKKwkJCQkgKiBBIGNvcnJlY3QgbWF0Y2gg aGFzIGJlZW4gZm91bmQsIHNvIG1vdmUgaXQgdG8gYSBuZXcgbGlzdC4KKwkJCQkgKiBPcmlnaW5h bCBsaXN0IHdpbGwgYmUgZGVzdHJveWVkIGFsb25nIHdpdGggdGhlIGVudGlyZSBrZWxmCisJCQkJ ICogb2JqZWN0LCBzbyB0aGUgcmVmZXJlbmNlIG11c3QgYmUgcHJlc2VydmVkLgorCQkJCSAqLwor CQkJCWZvdW5kX3ZhbGlkID0gdHJ1ZTsKKwkJCQlsaXN0X2RlbCgmcmVsYS0+bGlzdCk7CisJCQkJ bGlzdF9hZGRfdGFpbCgmcmVsYS0+bGlzdCwgJm5ld3JlbGFzKTsKKworCQkJCXJlbGEtPm9mZnNl dCAtPSBzcmNfb2Zmc2V0IC0gZHN0X29mZnNldDsKKwkJCQlyZWxhLT5yZWxhLnJfb2Zmc2V0ID0g cmVsYS0+b2Zmc2V0OworCQkJfQorCisJCQkvKiB0aGVyZSBpcyBhIHZhbGlkIFJFTEEgZW50cnks IHNvIGNvcHkgY3VycmVudCBlbnRyeSAqLworCQkJaWYgKGZvdW5kX3ZhbGlkKSB7CisJCQkJLyog Y29weSBiYXNlIHNlY3Rpb24gZ3JvdXAgKi8KKwkJCQltZW1jcHkoZHN0ICsgZHN0X29mZnNldCwg c3JjICsgc3JjX29mZnNldCwgZW50cnlfc2l6ZSk7CisJCQkJZHN0X29mZnNldCArPSBlbnRyeV9z aXplOworCQkJfQorCQl9CisKKwkJLyogdmVyaWZ5IHRoYXQgZW50cnlfc2l6ZSBpcyBhIGRpdmlz b3Igb2YgYWxpZ25lZCBzZWN0aW9uIHNpemUgKi8KKwkJYWxpZ24gPSBzZWMtPmJhc2UtPnNoLnNo X2FkZHJhbGlnbjsKKwkJYWxpZ25lZF9zaXplID0gKChzZWMtPmJhc2UtPnNoLnNoX3NpemUgKyBh bGlnbiAtIDEpIC8gYWxpZ24pICogYWxpZ247CisJCWlmIChzcmNfb2Zmc2V0ICE9IGFsaWduZWRf c2l6ZSkKKwkJCUVSUk9SKCJncm91cCBzaXplIG1pc21hdGNoIGZvciBzZWN0aW9uICVzXG4iLCBz ZWMtPmJhc2UtPm5hbWUpOworCisJCWlmICghZHN0X29mZnNldCkgeworCQkJLyogbm8gY2hhbmdl ZCBvciBnbG9iYWwgZnVuY3Rpb25zIHJlZmVyZW5jZWQgKi8KKwkJCXNlYy0+c3RhdHVzID0gc2Vj LT5iYXNlLT5zdGF0dXMgPSBTQU1FOworCQkJc2VjLT5pbmNsdWRlID0gc2VjLT5iYXNlLT5pbmNs dWRlID0gMDsKKwkJCWZyZWUoZHN0KTsKKwkJCWNvbnRpbnVlOworCQl9CisKKwkJLyogb3Zlcndy aXRlIHdpdGggbmV3IHJlbGFzIGxpc3QgKi8KKwkJbGlzdF9yZXBsYWNlKCZuZXdyZWxhcywgJnNl Yy0+cmVsYXMpOworCisJCS8qCisJCSAqIFVwZGF0ZSB0ZXh0IHNlY3Rpb24gZGF0YSBidWYgYW5k IHNpemUuCisJCSAqCisJCSAqIFRoZSByZWxhIHNlY3Rpb24ncyBkYXRhIGJ1ZiBhbmQgc2l6ZSB3 aWxsIGJlIHJlZ2VuZXJhdGVkIGluCisJCSAqIGtwYXRjaF9yZWJ1aWxkX3JlbGFfc2VjdGlvbl9k YXRhKCkuCisJCSAqLworCQlzZWMtPmJhc2UtPmRhdGEtPmRfYnVmID0gZHN0OworCQlzZWMtPmJh c2UtPmRhdGEtPmRfc2l6ZSA9IGRzdF9vZmZzZXQ7CisJfQorfQorCiBzdGF0aWMgaW50IGlzX251 bGxfc3ltKHN0cnVjdCBzeW1ib2wgKnN5bSkKIHsKIAlyZXR1cm4gIXN0cmxlbihzeW0tPm5hbWUp OwpAQCAtMjA4Myw2ICsyMTkyLDggQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkK IAogCWxvZ19kZWJ1ZygiUHJvY2VzcyBzcGVjaWFsIHNlY3Rpb25zXG4iKTsKIAlrcGF0Y2hfcHJv Y2Vzc19zcGVjaWFsX3NlY3Rpb25zKGtlbGZfcGF0Y2hlZCk7CisJbG9nX2RlYnVnKCJTdHJpcCB1 bmRlZmluZWQgZWxlbWVudHMgb2Yga25vd24gc2l6ZVxuIik7CisJbGl2ZXBhdGNoX3N0cmlwX3Vu ZGVmaW5lZF9lbGVtZW50cyhrZWxmX3BhdGNoZWQpOwogCWxvZ19kZWJ1ZygiVmVyaWZ5IHBhdGNo YWJpbGl0eVxuIik7CiAJa3BhdGNoX3ZlcmlmeV9wYXRjaGFiaWxpdHkoa2VsZl9wYXRjaGVkKTsK IAotLSAKMi4xNi41CgoKCgpBbWF6b24gRGV2ZWxvcG1lbnQgQ2VudGVyIEdlcm1hbnkgR21iSApL cmF1c2Vuc3RyLiAzOAoxMDExNyBCZXJsaW4KR2VzY2hhZWZ0c2Z1ZWhyZXI6IENocmlzdGlhbiBT Y2hsYWVnZXIsIFJhbGYgSGVyYnJpY2gKVXN0LUlEOiBERSAyODkgMjM3IDg3OQpFaW5nZXRyYWdl biBhbSBBbXRzZ2VyaWNodCBDaGFybG90dGVuYnVyZyBIUkIgMTQ5MTczIEIKCgoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcg bGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9q ZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA==