From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Jackson Subject: [OSSTEST PATCH 5/6] flight preservation: Honour flight allocation during expiry Date: Tue, 4 Oct 2016 13:26:33 +0100 Message-ID: <1475583994-30203-5-git-send-email-ian.jackson@eu.citrix.com> References: <1475583994-30203-1-git-send-email-ian.jackson@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1brOo5-0001WG-TG for xen-devel@lists.xenproject.org; Tue, 04 Oct 2016 12:26:49 +0000 In-Reply-To: <1475583994-30203-1-git-send-email-ian.jackson@eu.citrix.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 Cc: Ian Jackson List-Id: xen-devel@lists.xenproject.org TG9vayBpbiB0aGUgcmVzb3VyY2VzIGFuZCB0YXNrcyB0YWJsZSBmb3IgYSByZXNvdXJjZXMgdGFi bGUgZW50cnkKY29ycmVzcG9uZGluZyB0byBlYWNoIGZsaWdodCwgb3duZWQgYnkgYSBsaXZlIHRh c2suICBTdWNoIGZsaWdodHMgYXJlCm5vdCBkZWxldGVkLgoKU3BlY2lmaWNhbGx5OgogKiBBdCB0 aGUgc3RhcnQsIHdlIGdldCBhIGxpc3Qgb2YgYWxsIHRoZSBwcmVzZXJ2ZWQgZmxpZ2h0cywgYW5k CiAgIGFsc28gcHJpbnQgdGhlIGluZm9ybWF0aW9uIHRvIHN0ZG91dC4KICogV2hlbmV2ZXIgd2Ug Y29tcGFyZSBmbGlnaHQgbnVtYmVycyBmb3IgaW5lcXVhbGl0eSAoYXMgYSBwcm94eQogICBmb3Ig ZmxpZ2h0IGFnZSksIHdlIGZpcnN0IGNvbXBhcmUgd2hlcmUgdGhlIGZsaWdodHMgYXJlIGFsbG9j YXRlZC4KICAgKFdoZW4gdGhlcmUgYXJlIHJlZmVyZW5jZXMsIHRoZSBlZmZlY3QgaXMgdGhhdCBh biBhbGxvY2F0ZWQKICAgcmVmZXJyaW5nIGZsaWdodCBjb3VudHMgYXMgdmVyeSBsYXRlLCBzbyAk bGF0ZXN0cmVmIHdpbGwgY29udGFpbiBpdC4pCiAqIEJlZm9yZSBhY3R1YWxseSBkZWxldGluZyB0 aGUgc2VsZWN0ZWQgZmxpZ2h0IHdlIGNoZWNrIGl0J3Mgbm90CiAgIGFsbG9jYXRlZC4gIChTdHJp Y3RseSwgd2UgY2hlY2sgaXQncyAibGF0ZXN0IiByZWZlcmVuY2UgaXMgbm90CiAgIGFsbG9jYXRl ZC4pCgpDdXJyZW50bHkgdGhlcmUgaXMgbm90aGluZyB3aGljaCBjcmVhdGVzIHN1Y2ggcmVzb3Vy Y2VzIHRhYmxlIGVudHJpZXMKc28gdGhlcmUgaXMgbm8gb3ZlcmFsbCBmdW5jdGlvbmFsIGNoYW5n ZS4gIEFsc28sIGFzIGEgcmVzdWx0LCB0aGUgZG9jCnJlYWRzIHJhdGhlciBvZGRseS4gIFRoaXMg d2lsbCBiZSBmaXhlZCBpbiB0aGUgbmV4dCBwYXRjaC4KClNpZ25lZC1vZmYtYnk6IElhbiBKYWNr c29uIDxJYW4uSmFja3NvbkBldS5jaXRyaXguY29tPgotLS0KIFJFQURNRS5wbGFubmVyICAgICAg IHwgMTEgKysrKysrKysrKysKIGNyLWVuc3VyZS1kaXNrLXNwYWNlIHwgNTIgKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLQogMiBmaWxlcyBjaGFuZ2Vk LCA2MSBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1JFQURNRS5w bGFubmVyIGIvUkVBRE1FLnBsYW5uZXIKaW5kZXggYmIxODQzMi4uOWQzNWI0MCAxMDA2NDQKLS0t IGEvUkVBRE1FLnBsYW5uZXIKKysrIGIvUkVBRE1FLnBsYW5uZXIKQEAgLTE5OSw2ICsxOTksMTcg QEAgdGhhdCBzaGFyZWQgc3lzdGVtcyBnZXQgcmVncm9vdmVkIG9jY2FzaW9uYWxseSBldmVuIGlm IG5vdGhpbmcgZGVjaWRlcwogdG8gdW5zaGFyZSB0aGVtLgogCiAKK0ZsaWdodHMKKy0tLS0tLS0K KworRmxpZ2h0IGxvZ3MgYW5kIGJ1aWxkIGFydGVmYWN0cyBhcmUgbm9ybWFsbHkgZXhwaXJlZCBi YXNlZCBvbiB0aGVpcgorc3RhcnQgdGltZSwgb3IgdGhlIHN0YXJ0IHRpbWUgb2YgdGhlIG1vc3Qg cmVjZW50IGZsaWdodCB3aGljaCByZWZlcnMKK3RvIHRoZW0uCisKK0ZsaWdodHMgY2FuIGJlIHBy b3RlY3RlZCAocHJlc2VydmVkKSBieSBhbGxvY2F0aW5nIHRoZW0gc29tZWhvdzoKK0ZsaWdodHMg YXJlIHJlcHJlc2VudGVkIGJ5IHJlc3R5cGU9J3NoYXJlLWZsaWdodCcgZW50cmllcyBpbiB0aGUK K3Jlc291cmNlcyB0YWJsZS4KKwogCiBERVRBSUxFRCBQUk9UT0NPTCBOT1RFUwogPT09PT09PT09 PT09PT09PT09PT09PT0KZGlmZiAtLWdpdCBhL2NyLWVuc3VyZS1kaXNrLXNwYWNlIGIvY3ItZW5z dXJlLWRpc2stc3BhY2UKaW5kZXggODMzNzJjYS4uNzg0NjU4MCAxMDA3NTUKLS0tIGEvY3ItZW5z dXJlLWRpc2stc3BhY2UKKysrIGIvY3ItZW5zdXJlLWRpc2stc3BhY2UKQEAgLTEwMCw5ICsxMDAs NDUgQEAgbXkgJHJlZnE9IGRiX3ByZXBhcmUoPDxFTkQpOwogICAgICAgIEFORCBmbGlnaHQgPj0g PwogRU5ECiAKK215ICRhbGxvY3F0eHQgPSA8PEVORDsKKyAgICBTRUxFQ1QgcmVzbmFtZSBBUyBm bGlnaHQsCisgICAgICAgICAgIHNoYXJlaXgsCisgICAgICAgICAgICh0YXNrcy4gdGFza2lkICB8 fCAgJyAnIHx8CisgICAgICAgICAgICB0YXNrcy50eXBlICAgICB8fCAgJyAnIHx8CisgICAgICAg ICAgICB0YXNrcy5yZWZrZXkgICB8fCAnOiAnIHx8CisgICBDT0FMRVNDRSh0YXNrcy51c2VybmFt ZSwnW25vIHVzZXJuYW1lXScpIHx8ICAnICcgfHwKKyAgIENPQUxFU0NFKHRhc2tzLmNvbW1lbnQs ICdbbm8gY29tbWVudF0nKQorICAgICAgICAgICApIEFTIGluZm8KKyAgICAgIEZST00gcmVzb3Vy Y2VzCisgICAgICBKT0lOIHRhc2tzCisgICAgICAgIE9OIG93bnRhc2tpZCA9IHRhc2tpZAorICAg ICBXSEVSRSBsaXZlCisgICAgICAgQU5EIG93bnRhc2tpZCAhPSAoU0VMRUNUIHRhc2tpZCBGUk9N IHRhc2tzCisgICAgICAgICAgICAgICAgICAgICAgICAgV0hFUkUgdHlwZT0nbWFnaWMnIEFORCBy ZWZrZXk9J2FsbG9jYXRhYmxlJykKKyAgICAgICBBTkQgcmVzdHlwZT0nc2hhcmUtZmxpZ2h0Jwor RU5ECisKK215ICRhbGxvY3EgPSBkYl9wcmVwYXJlKDw8RU5EKTsKKyRhbGxvY3F0eHQKKyAgICAg ICBBTkQgcmVzbmFtZSA6OmludCA+PSA/CitFTkQKKworbXkgJGFsbG9jY2hrcSA9IGRiX3ByZXBh cmUoPDxFTkQpOworJGFsbG9jcXR4dAorICAgICAgIEFORCByZXNuYW1lID0gPworICAgICBMSU1J VCAxCitFTkQKKwogb3VyIEBmbGlnaHRzOworb3VyICVhbGxvY2Q7CiBvdXIgJWxhdGVzdHJlZjsK IAorc3ViIGZsaWdodF9udW1fY21wICgkJCkgeworICAgIG15ICgkeCwkeSkgPSBAXzsKKyAgICAh ISRhbGxvY2R7JHh9IDw9PiAhISRhbGxvY2R7JHl9IG9yCisgICAgICAgICAgICAkeCAgICA8PT4g ICAgICAgICAgICR5OworfQorCiBzdWIgaXRlcmF0aW9uX3Byb2NlZWQgKCkgewogICAgIGlmICgh QGZsaWdodHMpIHsKIAklbGF0ZXN0cmVmID0gKCk7CkBAIC0xMTksMjAgKzE1NSwyNyBAQCBzdWIg aXRlcmF0aW9uX3Byb2NlZWQgKCkgewogCiAJcHJpbnQgREVCVUcgIk1JTkZMSUdIVCAkbWluZmxp Z2h0XG4iOwogCisJJWFsbG9jZCA9ICgpOworCSRhbGxvY3EtPmV4ZWN1dGUoJG1pbmZsaWdodCk7 CisJd2hpbGUgKG15ICRhcj0gJGFsbG9jcS0+ZmV0Y2hyb3dfaGFzaHJlZikgeworCSAgICBwcmlu dCBERUJVRyAicHJlc2VydmluZyBhbGxvY2F0ZWQgJGFyLT57ZmxpZ2h0fTogJGFyLT57aW5mb31c biI7CisJICAgIHB1c2ggQHsgJGFsbG9jZHsgJGFyLT57ZmxpZ2h0fSB9IH0sICRhci0+e2luZm99 OworCX0KKwogCSRyZWZxLT5leGVjdXRlKCRtaW5mbGlnaHQpOwogCXdoaWxlIChteSAkcnI9ICRy ZWZxLT5mZXRjaHJvd19oYXNocmVmKSB7CiAJICAgIG15ICR0ZXN0ZmxpZ2h0ID0gJHJyLT57Zmxp Z2h0fTsKIAkgICAgbmV4dCB1bmxlc3MgJHJyLT57dmFsfSA9fiBtL14oXGQrKVwuLzsKIAkgICAg bXkgJGJ1aWxkZmxpZ2h0ID0gJDE7CiAJICAgIG5leHQgdW5sZXNzIGV4aXN0cyAkbGF0ZXN0cmVm eyRidWlsZGZsaWdodH07Ci0JICAgIGlmICgkdGVzdGZsaWdodCA+ICRsYXRlc3RyZWZ7JGJ1aWxk ZmxpZ2h0fSkgeworCSAgICBpZiAoZmxpZ2h0X251bV9jbXAoJHRlc3RmbGlnaHQsICRsYXRlc3Ry ZWZ7JGJ1aWxkZmxpZ2h0fSkgPiAwKSB7CiAJCXByaW50IERFQlVHICJSRUYgJGJ1aWxkZmxpZ2h0 IDwtICR0ZXN0ZmxpZ2h0XG4iOwogCQkkbGF0ZXN0cmVmeyRidWlsZGZsaWdodH0gPSAkdGVzdGZs aWdodDsKIAkgICAgfQogCX0KIAogCUBmbGlnaHRzID0KLQkgICAgc29ydCB7ICRsYXRlc3RyZWZ7 JGJ9IDw9PiAkbGF0ZXN0cmVmeyRhfSB9CisJICAgIHNvcnQgeyBmbGlnaHRfbnVtX2NtcCgkbGF0 ZXN0cmVmeyRifSwgJGxhdGVzdHJlZnskYX0pIH0KIAkgICAga2V5cyAlbGF0ZXN0cmVmOwogICAg ICAgICBwcmludGYgIiglZCBmbGlnaHRzKSAiLCBzY2FsYXIgQGZsaWdodHM7CiAgICAgICAgIGRp ZSB1bmxlc3MgQGZsaWdodHM7CkBAIC0xNTEsNiArMTk0LDExIEBAIHN1YiBpdGVyYXRpb25fcHJv Y2VlZCAoKSB7CiAKICAgICBkaWUgImFnZSAkYWdlIiBpZiAkYWdlIDwgbG9nY2ZnKCdNaW5FeHBp cmVBZ2UnKTsKIAorICAgICRhbGxvY2Noa3EtPmV4ZWN1dGUoJGxhdGVzdHJlZik7CisgICAgbXkg JGFyb3c9ICRhbGxvY2Noa3EtPmZldGNocm93X2hhc2hyZWYoKTsKKyAgICAkYWxsb2NjaGtxLT5m aW5pc2goKTsKKyAgICBkaWUgImFsbG9jICRhcm93LT57aW5mb30gISIgaWYgJGFyb3c7CisKICAg ICBwcmludGYgIi4uLiI7CiAKICAgICBkaWUgImRyeSBydW4iIGlmICRkcnlydW47Ci0tIAoyLjEu NAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1k ZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54 ZW4ub3JnL3hlbi1kZXZlbAo=