From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dulloor Subject: [vNUMA v2][PATCH 5/8] cleanup setup_guest function Date: Sun, 1 Aug 2010 15:04:02 -0700 Message-ID: References: <1BEA8649F0C00540AB2811D7922ECB6C9338B4D1@orsmsx507.amr.corp.intel.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=0016368332d606ad98048cca4376 Return-path: In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org --0016368332d606ad98048cca4376 Content-Type: text/plain; charset=ISO-8859-1 Cleanup and code re-org in setup_guest, in preparation for next patch. No logic change. -dulloor Signed-off-by : Dulloor --0016368332d606ad98048cca4376 Content-Type: text/x-patch; charset=US-ASCII; name="xen-05-setup-guest-cleanup.patch" Content-Disposition: attachment; filename="xen-05-setup-guest-cleanup.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gcc0m6031 c2V0dXBfZ3Vlc3QgY2xlYW51cAoKZGlmZiAtLWdpdCBhL3Rvb2xzL2xpYnhjL3hjX2h2bV9idWls ZC5jIGIvdG9vbHMvbGlieGMveGNfaHZtX2J1aWxkLmMKLS0tIGEvdG9vbHMvbGlieGMveGNfaHZt X2J1aWxkLmMKKysrIGIvdG9vbHMvbGlieGMveGNfaHZtX2J1aWxkLmMKQEAgLTExNSw1OCArMTE1 LDQ1IEBAIHN0YXRpYyBpbnQgY2hlY2tfbW1pb19ob2xlKHVpbnQ2NF90IHN0YXIKICAgICAgICAg cmV0dXJuIDE7CiB9CiAKLXN0YXRpYyBpbnQgc2V0dXBfZ3Vlc3QoeGNfaW50ZXJmYWNlICp4Y2gs Ci0gICAgICAgICAgICAgICAgICAgICAgIHVpbnQzMl90IGRvbSwgaW50IG1lbXNpemUsIGludCB0 YXJnZXQsCi0gICAgICAgICAgICAgICAgICAgICAgIGNoYXIgKmltYWdlLCB1bnNpZ25lZCBsb25n IGltYWdlX3NpemUpCitzdGF0aWMgbG9uZyBwb3B1bGF0ZV9waHlzbWFwKHhjX2ludGVyZmFjZSAq eGNoLCB1aW50MzJfdCBkb21pZCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25l ZCBsb25nIGNvdW50LCB1bnNpZ25lZCBsb25nIGV4dGVudF9vcmRlciwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICB1bnNpZ25lZCBpbnQgbWVtX2ZsYWdzLCB4ZW5fcGZuX3QgKmV4dGVudF9z dGFydCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBsb25nIGN1cl9wYWdl cykKK3sKKyAgICBpbnQgaTsKKyAgICB4ZW5fcGZuX3Qgc3BfZXh0ZW50c1tjb3VudCA+PiBleHRl bnRfb3JkZXJdOworICAgIHN0cnVjdCB4ZW5fbWVtb3J5X3Jlc2VydmF0aW9uIHJlc2VydmF0aW9u ID0geworICAgICAgICAubnJfZXh0ZW50cyAgID0gY291bnQgPj4gZXh0ZW50X29yZGVyLAorICAg ICAgICAuZXh0ZW50X29yZGVyID0gZXh0ZW50X29yZGVyLAorICAgICAgICAubWVtX2ZsYWdzICAg ID0gbWVtX2ZsYWdzLAorICAgICAgICAuZG9taWQgICAgICAgID0gZG9taWQKKyAgICB9OworCisg ICAgaWYgKGV4dGVudF9vcmRlcikKKyAgICB7CisgICAgICAgIGZvciAoIGkgPSAwOyBpIDwgcmVz ZXJ2YXRpb24ubnJfZXh0ZW50czsgaSsrICkKKyAgICAgICAgICAgIHNwX2V4dGVudHNbaV0gPSBl eHRlbnRfc3RhcnRbY3VyX3BhZ2VzKyhpPDxTVVBFUlBBR0VfMk1CX1NISUZUKV07CisgICAgICAg IGV4dGVudF9zdGFydCA9IHNwX2V4dGVudHM7CisgICAgfQorICAgIGVsc2UKKyAgICAgICAgZXh0 ZW50X3N0YXJ0ICs9IGN1cl9wYWdlczsKKyAgICBzZXRfeGVuX2d1ZXN0X2hhbmRsZShyZXNlcnZh dGlvbi5leHRlbnRfc3RhcnQsIGV4dGVudF9zdGFydCk7CisKKyAgICByZXR1cm4geGNfbWVtb3J5 X29wKHhjaCwgWEVOTUVNX3BvcHVsYXRlX3BoeXNtYXAsICZyZXNlcnZhdGlvbik7Cit9CisKK3N0 YXRpYyBpbnQgc2V0dXBfZ3Vlc3RfbWVtb3J5KHhjX2ludGVyZmFjZSAqeGNoLCB1aW50MzJfdCBk b20sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgbG9uZyBucl9wYWdlcywg dW5zaWduZWQgbG9uZyB0YXJnZXRfcGFnZXMsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg c3RydWN0IGVsZl9iaW5hcnkgKmVsZikKIHsKICAgICB4ZW5fcGZuX3QgKnBhZ2VfYXJyYXkgPSBO VUxMOwotICAgIHVuc2lnbmVkIGxvbmcgaSwgbnJfcGFnZXMgPSAodW5zaWduZWQgbG9uZyltZW1z aXplIDw8ICgyMCAtIFBBR0VfU0hJRlQpOwotICAgIHVuc2lnbmVkIGxvbmcgdGFyZ2V0X3BhZ2Vz ID0gKHVuc2lnbmVkIGxvbmcpdGFyZ2V0IDw8ICgyMCAtIFBBR0VfU0hJRlQpOwotICAgIHVuc2ln bmVkIGxvbmcgcG9kX3BhZ2VzID0gMDsKLSAgICB1bnNpZ25lZCBsb25nIGVudHJ5X2VpcCwgY3Vy X3BhZ2VzOwotICAgIHZvaWQgKmh2bV9pbmZvX3BhZ2U7Ci0gICAgdWludDMyX3QgKmlkZW50X3B0 OwotICAgIHN0cnVjdCBlbGZfYmluYXJ5IGVsZjsKLSAgICB1aW50NjRfdCB2X3N0YXJ0LCB2X2Vu ZDsKLSAgICBpbnQgcmM7Ci0gICAgeGVuX2NhcGFiaWxpdGllc19pbmZvX3QgY2FwczsKLSAgICB1 bnNpZ25lZCBsb25nIHN0YXRfbm9ybWFsX3BhZ2VzID0gMCwgc3RhdF8ybWJfcGFnZXMgPSAwLCAK LSAgICAgICAgc3RhdF8xZ2JfcGFnZXMgPSAwOworICAgIHVuc2lnbmVkIGxvbmcgcG9kX3BhZ2Vz ID0gMCwgY3VyX3BhZ2VzLCBpOworICAgIHVuc2lnbmVkIGxvbmcgc3RhdF9ub3JtYWxfcGFnZXMg PSAwLCBzdGF0XzJtYl9wYWdlcyA9IDAsIHN0YXRfMWdiX3BhZ2VzID0gMDsKICAgICBpbnQgcG9k X21vZGUgPSAwOwogCi0gICAgLyogQW4gSFZNIGd1ZXN0IG11c3QgYmUgaW5pdGlhbGlzZWQgd2l0 aCBhdCBsZWFzdCAyTUIgbWVtb3J5LiAqLwotICAgIGlmICggbWVtc2l6ZSA8IDIgfHwgdGFyZ2V0 IDwgMiApCi0gICAgICAgIGdvdG8gZXJyb3Jfb3V0OwotCi0gICAgaWYgKCBtZW1zaXplID4gdGFy Z2V0ICkKKyAgICBpZiAoIG5yX3BhZ2VzID4gdGFyZ2V0X3BhZ2VzICkKICAgICAgICAgcG9kX21v ZGUgPSAxOwogCi0gICAgaWYgKCBlbGZfaW5pdCgmZWxmLCBpbWFnZSwgaW1hZ2Vfc2l6ZSkgIT0g MCApCi0gICAgICAgIGdvdG8gZXJyb3Jfb3V0OwotICAgIGVsZl9wYXJzZV9iaW5hcnkoJmVsZik7 Ci0gICAgdl9zdGFydCA9IDA7Ci0gICAgdl9lbmQgPSAodW5zaWduZWQgbG9uZyBsb25nKW1lbXNp emUgPDwgMjA7Ci0KLSAgICBpZiAoIHhjX3ZlcnNpb24oeGNoLCBYRU5WRVJfY2FwYWJpbGl0aWVz LCAmY2FwcykgIT0gMCApCi0gICAgewotICAgICAgICBQRVJST1IoIkNvdWxkIG5vdCBnZXQgWGVu IGNhcGFiaWxpdGllcyIpOwotICAgICAgICBnb3RvIGVycm9yX291dDsKLSAgICB9Ci0KLSAgICBp ZiAoIChlbGYucHN0YXJ0ICYgKFBBR0VfU0laRSAtIDEpKSAhPSAwICkKLSAgICB7Ci0gICAgICAg IFBFUlJPUigiR3Vlc3QgT1MgbXVzdCBsb2FkIHRvIGEgcGFnZSBib3VuZGFyeS4iKTsKLSAgICAg ICAgZ290byBlcnJvcl9vdXQ7Ci0gICAgfQotCi0gICAgSVBSSU5URigiVklSVFVBTCBNRU1PUlkg QVJSQU5HRU1FTlQ6XG4iCi0gICAgICAgICAgICAiICBMb2FkZXI6ICAgICAgICAlMDE2IlBSSXg2 NCItPiUwMTYiUFJJeDY0IlxuIgotICAgICAgICAgICAgIiAgVE9UQUw6ICAgICAgICAgJTAxNiJQ Ukl4NjQiLT4lMDE2IlBSSXg2NCJcbiIKLSAgICAgICAgICAgICIgIEVOVFJZIEFERFJFU1M6ICUw MTYiUFJJeDY0IlxuIiwKLSAgICAgICAgICAgIGVsZi5wc3RhcnQsIGVsZi5wZW5kLAotICAgICAg ICAgICAgdl9zdGFydCwgdl9lbmQsCi0gICAgICAgICAgICBlbGZfdXZhbCgmZWxmLCBlbGYuZWhk ciwgZV9lbnRyeSkpOwotCiAgICAgaWYgKCAocGFnZV9hcnJheSA9IG1hbGxvYyhucl9wYWdlcyAq IHNpemVvZih4ZW5fcGZuX3QpKSkgPT0gTlVMTCApCiAgICAgewogICAgICAgICBQRVJST1IoIkNv dWxkIG5vdCBhbGxvY2F0ZSBtZW1vcnkuIik7CkBAIC0xODgsNTQgKzE3NSw3MiBAQCBzdGF0aWMg aW50IHNldHVwX2d1ZXN0KHhjX2ludGVyZmFjZSAqeGNoCiAgICAgICogVW5kZXIgMk1CIG1vZGUs IHdlIGFsbG9jYXRlIHBhZ2VzIGluIGJhdGNoZXMgb2Ygbm8gbW9yZSB0aGFuIDhNQiB0byAKICAg ICAgKiBlbnN1cmUgdGhhdCB3ZSBjYW4gYmUgcHJlZW1wdGVkIGFuZCBoZW5jZSBkb20wIHJlbWFp bnMgcmVzcG9uc2l2ZS4KICAgICAgKi8KLSAgICByYyA9IHhjX2RvbWFpbl9tZW1vcnlfcG9wdWxh dGVfcGh5c21hcCgKLSAgICAgICAgeGNoLCBkb20sIDB4YTAsIDAsIDAsICZwYWdlX2FycmF5WzB4 MDBdKTsKKyAgICBpZiAocG9wdWxhdGVfcGh5c21hcCh4Y2gsIGRvbSwgMHhhMCwgMCwgMCwgcGFn ZV9hcnJheSwgMHgwMCkgIT0gMHhhMCApCisgICAgeworICAgICAgICBQRVJST1IoIkNvdWxkIG5v dCBhbGxvY2F0ZSBtZW1vcnkuIik7CisgICAgICAgIGdvdG8gZXJyb3Jfb3V0OworICAgIH0KICAg ICBjdXJfcGFnZXMgPSAweGMwOwogICAgIHN0YXRfbm9ybWFsX3BhZ2VzID0gMHhjMDsKLSAgICB3 aGlsZSAoIChyYyA9PSAwKSAmJiAobnJfcGFnZXMgPiBjdXJfcGFnZXMpICkKKworI2RlZmluZSBB TElHTl9DT1VOVF9UT19NQVhfUEFHRVMoY291bnQsIGN1cl9wYWdlcywgbWF4X3BhZ2VzKSAgICAg ICBcCitkb3sgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIFwKKyAgICAvKiBUYWtlIGNhcmUgdGhlIGNvcm5lciBjYXNlcyBvZiBz dXBlciBwYWdlIHRhaWxzICovICAgICAgICAgICAgXAorICAgIGlmICggKChjdXJfcGFnZXMgJiAo bWF4X3BhZ2VzLTEpKSAhPSAwKSAmJiAgICAgICAgICAgICAgICAgICAgICBcCisgICAgICAgICAg ICAgICAgKGNvdW50ID4gKC1jdXJfcGFnZXMgJiAobWF4X3BhZ2VzLTEpKSkgKSAgICAgICAgICAg IFwKKyAgICAgICAgICAgICAgICAgICAgY291bnQgPSAtY3VyX3BhZ2VzICYgKG1heF9wYWdlcy0x KTsgICAgICAgICAgICAgXAorICAgIGVsc2UgaWYgKCAoKGNvdW50ICYgKG1heF9wYWdlcy0xKSkg IT0gMCkgJiYgICAgICAgICAgICAgICAgICAgICBcCisgICAgICAgICAgICAgICAgKGNvdW50ID4g bWF4X3BhZ2VzKSApICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKKyAgICAgICAgICAg ICAgICAgICAgY291bnQgJj0gfihtYXhfcGFnZXMtMSk7ICAgICAgICAgICAgICAgICAgICAgICAg XAorfXdoaWxlKDApCisKKyAgICB3aGlsZSAoIG5yX3BhZ2VzID4gY3VyX3BhZ2VzICkKICAgICB7 CiAgICAgICAgIC8qIENsaXAgY291bnQgdG8gbWF4aW11bSAxR0IgZXh0ZW50LiAqLworICAgICAg ICBsb25nIGRvbmU7CiAgICAgICAgIHVuc2lnbmVkIGxvbmcgY291bnQgPSBucl9wYWdlcyAtIGN1 cl9wYWdlczsKLSAgICAgICAgdW5zaWduZWQgbG9uZyBtYXhfcGFnZXMgPSBTVVBFUlBBR0VfMUdC X05SX1BGTlM7CiAKLSAgICAgICAgaWYgKCBjb3VudCA+IG1heF9wYWdlcyApCi0gICAgICAgICAg ICBjb3VudCA9IG1heF9wYWdlczsKLSAgICAgICAgCi0gICAgICAgIC8qIFRha2UgY2FyZSB0aGUg Y29ybmVyIGNhc2VzIG9mIHN1cGVyIHBhZ2UgdGFpbHMgKi8KLSAgICAgICAgaWYgKCAoKGN1cl9w YWdlcyAmIChTVVBFUlBBR0VfMUdCX05SX1BGTlMtMSkpICE9IDApICYmCi0gICAgICAgICAgICAg KGNvdW50ID4gKC1jdXJfcGFnZXMgJiAoU1VQRVJQQUdFXzFHQl9OUl9QRk5TLTEpKSkgKQotICAg ICAgICAgICAgY291bnQgPSAtY3VyX3BhZ2VzICYgKFNVUEVSUEFHRV8xR0JfTlJfUEZOUy0xKTsK LSAgICAgICAgZWxzZSBpZiAoICgoY291bnQgJiAoU1VQRVJQQUdFXzFHQl9OUl9QRk5TLTEpKSAh PSAwKSAmJgotICAgICAgICAgICAgICAgICAgKGNvdW50ID4gU1VQRVJQQUdFXzFHQl9OUl9QRk5T KSApCi0gICAgICAgICAgICBjb3VudCAmPSB+KFNVUEVSUEFHRV8xR0JfTlJfUEZOUyAtIDEpOwor ICAgICAgICBpZiAoIGNvdW50ID4gU1VQRVJQQUdFXzFHQl9OUl9QRk5TICkKKyAgICAgICAgICAg IGNvdW50ID0gU1VQRVJQQUdFXzFHQl9OUl9QRk5TOwogCi0gICAgICAgIC8qIEF0dGVtcCB0byBh bGxvY2F0ZSAxR0Igc3VwZXIgcGFnZS4gQmVjYXVzZSBpbiBlYWNoIHBhc3Mgd2Ugb25seQorICAg ICAgICAvKiBBdHRlbXB0IHRvIGFsbG9jYXRlIDFHQiBzdXBlciBwYWdlLiBCZWNhdXNlIGluIGVh Y2ggcGFzcyB3ZSBvbmx5CiAgICAgICAgICAqIGFsbG9jYXRlIGF0IG1vc3QgMUdCLCB3ZSBkb24n dCBoYXZlIHRvIGNsaXAgc3VwZXIgcGFnZSBib3VuZGFyaWVzLgogICAgICAgICAgKi8KKyAgICAg ICAgQUxJR05fQ09VTlRfVE9fTUFYX1BBR0VTKGNvdW50LCBjdXJfcGFnZXMsIFNVUEVSUEFHRV8x R0JfTlJfUEZOUyk7CiAgICAgICAgIGlmICggKChjb3VudCB8IGN1cl9wYWdlcykgJiAoU1VQRVJQ QUdFXzFHQl9OUl9QRk5TIC0gMSkpID09IDAgJiYKICAgICAgICAgICAgICAvKiBDaGVjayBpZiB0 aGVyZSBleGlzdHMgTU1JTyBob2xlIGluIHRoZSAxR0IgbWVtb3J5IHJhbmdlICovCiAgICAgICAg ICAgICAgIWNoZWNrX21taW9faG9sZShjdXJfcGFnZXMgPDwgUEFHRV9TSElGVCwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIFNVUEVSUEFHRV8xR0JfTlJfUEZOUyA8PCBQQUdFX1NISUZU KSApCiAgICAgICAgIHsKLSAgICAgICAgICAgIGxvbmcgZG9uZTsKLSAgICAgICAgICAgIHhlbl9w Zm5fdCBzcF9leHRlbnRzW2NvdW50ID4+IFNVUEVSUEFHRV8xR0JfU0hJRlRdOwotICAgICAgICAg ICAgc3RydWN0IHhlbl9tZW1vcnlfcmVzZXJ2YXRpb24gc3BfcmVxID0gewotICAgICAgICAgICAg ICAgIC5ucl9leHRlbnRzICAgPSBjb3VudCA+PiBTVVBFUlBBR0VfMUdCX1NISUZULAotICAgICAg ICAgICAgICAgIC5leHRlbnRfb3JkZXIgPSBTVVBFUlBBR0VfMUdCX1NISUZULAotICAgICAgICAg ICAgICAgIC5kb21pZCAgICAgICAgPSBkb20KLSAgICAgICAgICAgIH07CisgICAgICAgICAgICBk b25lID0gcG9wdWxhdGVfcGh5c21hcCh4Y2gsIGRvbSwgY291bnQsIFNVUEVSUEFHRV8xR0JfU0hJ RlQsIAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHBvZF9tb2RlKT9YRU5N RU1GX3BvcHVsYXRlX29uX2RlbWFuZDowLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgcGFnZV9hcnJheSwgY3VyX3BhZ2VzKTsKKyAgICAgICAgICAgIHN0YXRfMWdiX3BhZ2Vz ICs9IGRvbmU7CisgICAgICAgICAgICBkb25lIDw8PSBTVVBFUlBBR0VfMUdCX1NISUZUOworICAg ICAgICAgICAgaWYgKCBwb2RfbW9kZSAmJiB0YXJnZXRfcGFnZXMgPiBjdXJfcGFnZXMgKQorICAg ICAgICAgICAgeworICAgICAgICAgICAgICAgIGludCBkID0gdGFyZ2V0X3BhZ2VzIC0gY3VyX3Bh Z2VzOworICAgICAgICAgICAgICAgIHBvZF9wYWdlcyArPSAoIGRvbmUgPCBkICkgPyBkb25lIDog ZDsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGN1cl9wYWdlcyArPSBkb25lOworICAgICAg ICAgICAgY291bnQgLT0gZG9uZTsKKyAgICAgICAgfQogCi0gICAgICAgICAgICBpZiAoIHBvZF9t b2RlICkKLSAgICAgICAgICAgICAgICBzcF9yZXEubWVtX2ZsYWdzID0gWEVOTUVNRl9wb3B1bGF0 ZV9vbl9kZW1hbmQ7Ci0KLSAgICAgICAgICAgIHNldF94ZW5fZ3Vlc3RfaGFuZGxlKHNwX3JlcS5l eHRlbnRfc3RhcnQsIHNwX2V4dGVudHMpOwotICAgICAgICAgICAgZm9yICggaSA9IDA7IGkgPCBz cF9yZXEubnJfZXh0ZW50czsgaSsrICkKLSAgICAgICAgICAgICAgICBzcF9leHRlbnRzW2ldID0g cGFnZV9hcnJheVtjdXJfcGFnZXMrKGk8PFNVUEVSUEFHRV8xR0JfU0hJRlQpXTsKLSAgICAgICAg ICAgIGRvbmUgPSB4Y19tZW1vcnlfb3AoeGNoLCBYRU5NRU1fcG9wdWxhdGVfcGh5c21hcCwgJnNw X3JlcSk7Ci0gICAgICAgICAgICBpZiAoIGRvbmUgPiAwICkKKyAgICAgICAgaWYgKCBjb3VudCAh PSAwICkKKyAgICAgICAgeworICAgICAgICAgICAgLyogQ2xpcCBjb3VudCB0byBtYXhpbXVtIDhN QiBleHRlbnQuICovCisgICAgICAgICAgICBpZiAoIGNvdW50ID4gU1VQRVJQQUdFXzJNQl9OUl9Q Rk5TKjQgKQorICAgICAgICAgICAgICAgIGNvdW50ID0gU1VQRVJQQUdFXzJNQl9OUl9QRk5TKjQ7 CisgICAgICAgICAgICAKKyAgICAgICAgICAgIC8qIEF0dGVtcHQgdG8gYWxsb2NhdGUgc3VwZXJw YWdlIGV4dGVudHMuICovCisgICAgICAgICAgICBBTElHTl9DT1VOVF9UT19NQVhfUEFHRVMoY291 bnQsIGN1cl9wYWdlcywgU1VQRVJQQUdFXzJNQl9OUl9QRk5TKTsKKyAgICAgICAgICAgIGlmICgg KChjb3VudCB8IGN1cl9wYWdlcykgJiAoU1VQRVJQQUdFXzJNQl9OUl9QRk5TIC0gMSkpID09IDAg KQogICAgICAgICAgICAgewotICAgICAgICAgICAgICAgIHN0YXRfMWdiX3BhZ2VzICs9IGRvbmU7 Ci0gICAgICAgICAgICAgICAgZG9uZSA8PD0gU1VQRVJQQUdFXzFHQl9TSElGVDsKKyAgICAgICAg ICAgICAgICBkb25lID0gcG9wdWxhdGVfcGh5c21hcCh4Y2gsIGRvbSwgY291bnQsIFNVUEVSUEFH RV8yTUJfU0hJRlQsIAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHBvZF9t b2RlKT9YRU5NRU1GX3BvcHVsYXRlX29uX2RlbWFuZDowLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgcGFnZV9hcnJheSwgY3VyX3BhZ2VzKTsKKyAgICAgICAgICAgICAgICBz dGF0XzJtYl9wYWdlcyArPSBkb25lOworICAgICAgICAgICAgICAgIGRvbmUgPDw9IFNVUEVSUEFH RV8yTUJfU0hJRlQ7CiAgICAgICAgICAgICAgICAgaWYgKCBwb2RfbW9kZSAmJiB0YXJnZXRfcGFn ZXMgPiBjdXJfcGFnZXMgKQogICAgICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAgICAg aW50IGQgPSB0YXJnZXRfcGFnZXMgLSBjdXJfcGFnZXM7CkBAIC0yNDYsNzYgKzI1MSwzMiBAQCBz dGF0aWMgaW50IHNldHVwX2d1ZXN0KHhjX2ludGVyZmFjZSAqeGNoCiAgICAgICAgICAgICB9CiAg ICAgICAgIH0KIAotICAgICAgICBpZiAoIGNvdW50ICE9IDAgKQotICAgICAgICB7Ci0gICAgICAg ICAgICAvKiBDbGlwIGNvdW50IHRvIG1heGltdW0gOE1CIGV4dGVudC4gKi8KLSAgICAgICAgICAg IG1heF9wYWdlcyA9IFNVUEVSUEFHRV8yTUJfTlJfUEZOUyAqIDQ7Ci0gICAgICAgICAgICBpZiAo IGNvdW50ID4gbWF4X3BhZ2VzICkKLSAgICAgICAgICAgICAgICBjb3VudCA9IG1heF9wYWdlczsK LSAgICAgICAgICAgIAotICAgICAgICAgICAgLyogQ2xpcCBwYXJ0aWFsIHN1cGVycGFnZSBleHRl bnRzIHRvIHN1cGVycGFnZSBib3VuZGFyaWVzLiAqLwotICAgICAgICAgICAgaWYgKCAoKGN1cl9w YWdlcyAmIChTVVBFUlBBR0VfMk1CX05SX1BGTlMtMSkpICE9IDApICYmCi0gICAgICAgICAgICAg ICAgIChjb3VudCA+ICgtY3VyX3BhZ2VzICYgKFNVUEVSUEFHRV8yTUJfTlJfUEZOUy0xKSkpICkK LSAgICAgICAgICAgICAgICBjb3VudCA9IC1jdXJfcGFnZXMgJiAoU1VQRVJQQUdFXzJNQl9OUl9Q Rk5TLTEpOwotICAgICAgICAgICAgZWxzZSBpZiAoICgoY291bnQgJiAoU1VQRVJQQUdFXzJNQl9O Ul9QRk5TLTEpKSAhPSAwKSAmJgotICAgICAgICAgICAgICAgICAgICAgIChjb3VudCA+IFNVUEVS UEFHRV8yTUJfTlJfUEZOUykgKQotICAgICAgICAgICAgICAgIGNvdW50ICY9IH4oU1VQRVJQQUdF XzJNQl9OUl9QRk5TIC0gMSk7IC8qIGNsaXAgbm9uLXMucC4gdGFpbCAqLwotCi0gICAgICAgICAg ICAvKiBBdHRlbXB0IHRvIGFsbG9jYXRlIHN1cGVycGFnZSBleHRlbnRzLiAqLwotICAgICAgICAg ICAgaWYgKCAoKGNvdW50IHwgY3VyX3BhZ2VzKSAmIChTVVBFUlBBR0VfMk1CX05SX1BGTlMgLSAx KSkgPT0gMCApCi0gICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgbG9uZyBkb25lOwotICAg ICAgICAgICAgICAgIHhlbl9wZm5fdCBzcF9leHRlbnRzW2NvdW50ID4+IFNVUEVSUEFHRV8yTUJf U0hJRlRdOwotICAgICAgICAgICAgICAgIHN0cnVjdCB4ZW5fbWVtb3J5X3Jlc2VydmF0aW9uIHNw X3JlcSA9IHsKLSAgICAgICAgICAgICAgICAgICAgLm5yX2V4dGVudHMgICA9IGNvdW50ID4+IFNV UEVSUEFHRV8yTUJfU0hJRlQsCi0gICAgICAgICAgICAgICAgICAgIC5leHRlbnRfb3JkZXIgPSBT VVBFUlBBR0VfMk1CX1NISUZULAotICAgICAgICAgICAgICAgICAgICAuZG9taWQgICAgICAgID0g ZG9tCi0gICAgICAgICAgICAgICAgfTsKLQotICAgICAgICAgICAgICAgIGlmICggcG9kX21vZGUg KQotICAgICAgICAgICAgICAgICAgICBzcF9yZXEubWVtX2ZsYWdzID0gWEVOTUVNRl9wb3B1bGF0 ZV9vbl9kZW1hbmQ7Ci0KLSAgICAgICAgICAgICAgICBzZXRfeGVuX2d1ZXN0X2hhbmRsZShzcF9y ZXEuZXh0ZW50X3N0YXJ0LCBzcF9leHRlbnRzKTsKLSAgICAgICAgICAgICAgICBmb3IgKCBpID0g MDsgaSA8IHNwX3JlcS5ucl9leHRlbnRzOyBpKysgKQotICAgICAgICAgICAgICAgICAgICBzcF9l eHRlbnRzW2ldID0gcGFnZV9hcnJheVtjdXJfcGFnZXMrKGk8PFNVUEVSUEFHRV8yTUJfU0hJRlQp XTsKLSAgICAgICAgICAgICAgICBkb25lID0geGNfbWVtb3J5X29wKHhjaCwgWEVOTUVNX3BvcHVs YXRlX3BoeXNtYXAsICZzcF9yZXEpOwotICAgICAgICAgICAgICAgIGlmICggZG9uZSA+IDAgKQot ICAgICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAgICAgc3RhdF8ybWJfcGFnZXMgKz0g ZG9uZTsKLSAgICAgICAgICAgICAgICAgICAgZG9uZSA8PD0gU1VQRVJQQUdFXzJNQl9TSElGVDsK LSAgICAgICAgICAgICAgICAgICAgaWYgKCBwb2RfbW9kZSAmJiB0YXJnZXRfcGFnZXMgPiBjdXJf cGFnZXMgKQotICAgICAgICAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBp bnQgZCA9IHRhcmdldF9wYWdlcyAtIGN1cl9wYWdlczsKLSAgICAgICAgICAgICAgICAgICAgICAg IHBvZF9wYWdlcyArPSAoIGRvbmUgPCBkICkgPyBkb25lIDogZDsKLSAgICAgICAgICAgICAgICAg ICAgfQotICAgICAgICAgICAgICAgICAgICBjdXJfcGFnZXMgKz0gZG9uZTsKLSAgICAgICAgICAg ICAgICAgICAgY291bnQgLT0gZG9uZTsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB9 Ci0gICAgICAgIH0KLQogICAgICAgICAvKiBGYWxsIGJhY2sgdG8gNGtCIGV4dGVudHMuICovCiAg ICAgICAgIGlmICggY291bnQgIT0gMCApCiAgICAgICAgIHsKLSAgICAgICAgICAgIHJjID0geGNf ZG9tYWluX21lbW9yeV9wb3B1bGF0ZV9waHlzbWFwKAotICAgICAgICAgICAgICAgIHhjaCwgZG9t LCBjb3VudCwgMCwgMCwgJnBhZ2VfYXJyYXlbY3VyX3BhZ2VzXSk7CisgICAgICAgICAgICBkb25l ID0gcG9wdWxhdGVfcGh5c21hcCh4Y2gsIGRvbSwgY291bnQsIDAsIDAsIAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBhZ2VfYXJyYXksIGN1cl9w YWdlcyk7CisgICAgICAgICAgICBpZiAoIGRvbmUgIT0gY291bnQgKQorICAgICAgICAgICAgewor ICAgICAgICAgICAgICAgIFBFUlJPUigiQ291bGQgbm90IGFsbG9jYXRlIG1lbW9yeSBmb3IgSFZN IGd1ZXN0LiIpOworICAgICAgICAgICAgICAgIGdvdG8gZXJyb3Jfb3V0OworICAgICAgICAgICAg fQorICAgICAgICAgICAgc3RhdF9ub3JtYWxfcGFnZXMgKz0gY291bnQ7CiAgICAgICAgICAgICBj dXJfcGFnZXMgKz0gY291bnQ7Ci0gICAgICAgICAgICBzdGF0X25vcm1hbF9wYWdlcyArPSBjb3Vu dDsKICAgICAgICAgICAgIGlmICggcG9kX21vZGUgKQogICAgICAgICAgICAgICAgIHBvZF9wYWdl cyAtPSBjb3VudDsKICAgICAgICAgfQogICAgIH0KKyN1bmRlZiBBTElHTl9DT1VOVF9UT19NQVhf UEFHRVMKIAogICAgIGlmICggcG9kX21vZGUgKQotICAgICAgICByYyA9IHhjX2RvbWFpbl9tZW1v cnlfc2V0X3BvZF90YXJnZXQoeGNoLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgZG9tLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgcG9kX3BhZ2VzLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgTlVMTCwgTlVMTCwgTlVMTCk7Ci0KLSAgICBpZiAoIHJjICE9IDAgKQogICAgIHsKLSAg ICAgICAgUEVSUk9SKCJDb3VsZCBub3QgYWxsb2NhdGUgbWVtb3J5IGZvciBIVk0gZ3Vlc3QuIik7 Ci0gICAgICAgIGdvdG8gZXJyb3Jfb3V0OworICAgICAgICBpZiAoIHhjX2RvbWFpbl9tZW1vcnlf c2V0X3BvZF90YXJnZXQoeGNoLCBkb20sIHBvZF9wYWdlcywKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBOVUxMLCBOVUxMLCBOVUxMKSApCisgICAg ICAgIHsKKyAgICAgICAgICAgIFBFUlJPUigiQ291bGQgbm90IHNldCBQT0QgdGFyZ2V0IGZvciBI Vk0gZ3Vlc3QuIik7CisgICAgICAgICAgICBnb3RvIGVycm9yX291dDsKKyAgICAgICAgfQogICAg IH0KIAogICAgIElQUklOVEYoIlBIWVNJQ0FMIE1FTU9SWSBBTExPQ0FUSU9OOlxuIgpAQCAtMzIz LDIzICsyODQsMzcgQEAgc3RhdGljIGludCBzZXR1cF9ndWVzdCh4Y19pbnRlcmZhY2UgKnhjaAog ICAgICAgICAgICAgIiAgMk1CIFBBR0VTOiAweCUwMTZseFxuIgogICAgICAgICAgICAgIiAgMUdC IFBBR0VTOiAweCUwMTZseFxuIiwKICAgICAgICAgICAgIHN0YXRfbm9ybWFsX3BhZ2VzLCBzdGF0 XzJtYl9wYWdlcywgc3RhdF8xZ2JfcGFnZXMpOwotICAgIAotICAgIGlmICggbG9hZGVsZmltYWdl KHhjaCwgJmVsZiwgZG9tLCBwYWdlX2FycmF5KSAhPSAwICkKKyAgCisgICAgaWYgKCBsb2FkZWxm aW1hZ2UoeGNoLCBlbGYsIGRvbSwgcGFnZV9hcnJheSkgKQogICAgICAgICBnb3RvIGVycm9yX291 dDsKKyAgICBmcmVlKHBhZ2VfYXJyYXkpOworICAgIHJldHVybiAwOworCitlcnJvcl9vdXQ6Cisg ICAgaWYgKCBwYWdlX2FycmF5ICkKKyAgICAgICAgZnJlZShwYWdlX2FycmF5KTsKKyAgICByZXR1 cm4gLTE7Cit9CisKK3N0YXRpYyBpbnQKK3NldHVwX2d1ZXN0X3NwZWNpYWxfcGFnZXMoeGNfaW50 ZXJmYWNlICp4Y2gsIHVpbnQzMl90IGRvbSwgdWludDY0X3QgbWVtc2l6ZSkKK3sKKyAgICB2b2lk ICpodm1faW5mb19wYWdlOworICAgIHVpbnQzMl90ICppZGVudF9wdDsKKyAgICB1bnNpZ25lZCBs b25nIGk7CiAKICAgICBpZiAoIChodm1faW5mb19wYWdlID0geGNfbWFwX2ZvcmVpZ25fcmFuZ2Uo CiAgICAgICAgICAgICAgIHhjaCwgZG9tLCBQQUdFX1NJWkUsIFBST1RfUkVBRCB8IFBST1RfV1JJ VEUsCiAgICAgICAgICAgICAgIEhWTV9JTkZPX1BGTikpID09IE5VTEwgKQogICAgICAgICBnb3Rv IGVycm9yX291dDsKLSAgICBidWlsZF9odm1faW5mbyhodm1faW5mb19wYWdlLCB2X2VuZCk7Cisg ICAgYnVpbGRfaHZtX2luZm8oaHZtX2luZm9fcGFnZSwgbWVtc2l6ZSk7CiAgICAgbXVubWFwKGh2 bV9pbmZvX3BhZ2UsIFBBR0VfU0laRSk7CiAKICAgICAvKiBBbGxvY2F0ZSBhbmQgY2xlYXIgc3Bl Y2lhbCBwYWdlcy4gKi8KICAgICBmb3IgKCBpID0gMDsgaSA8IE5SX1NQRUNJQUxfUEFHRVM7IGkr KyApCiAgICAgewogICAgICAgICB4ZW5fcGZuX3QgcGZuID0gc3BlY2lhbF9wZm4oaSk7Ci0gICAg ICAgIHJjID0geGNfZG9tYWluX21lbW9yeV9wb3B1bGF0ZV9waHlzbWFwKHhjaCwgZG9tLCAxLCAw LCAwLCAmcGZuKTsKLSAgICAgICAgaWYgKCByYyAhPSAwICkKKyAgICAgICAgaWYgKCB4Y19kb21h aW5fbWVtb3J5X3BvcHVsYXRlX3BoeXNtYXAoeGNoLCBkb20sIDEsIDAsIDAsICZwZm4pICkKICAg ICAgICAgewogICAgICAgICAgICAgUEVSUk9SKCJDb3VsZCBub3QgYWxsb2NhdGUgJWQndGggc3Bl Y2lhbCBwYWdlLiIsIGkpOwogICAgICAgICAgICAgZ290byBlcnJvcl9vdXQ7CkBAIC0zNzAsNiAr MzQ1LDYxIEBAIHN0YXRpYyBpbnQgc2V0dXBfZ3Vlc3QoeGNfaW50ZXJmYWNlICp4Y2gKICAgICB4 Y19zZXRfaHZtX3BhcmFtKHhjaCwgZG9tLCBIVk1fUEFSQU1fSURFTlRfUFQsCiAgICAgICAgICAg ICAgICAgICAgICBzcGVjaWFsX3BmbihTUEVDSUFMUEFHRV9JREVOVF9QVCkgPDwgUEFHRV9TSElG VCk7CiAKKyAgICByZXR1cm4gMDsKK2Vycm9yX291dDoKKyAgICByZXR1cm4gLTE7Cit9CisKK3N0 YXRpYyBpbnQgc2V0dXBfZ3Vlc3QoeGNfaW50ZXJmYWNlICp4Y2gsCisgICAgICAgICAgICAgICAg ICAgICAgIHVpbnQzMl90IGRvbSwgaW50IG1lbXNpemUsIGludCB0YXJnZXQsCisgICAgICAgICAg ICAgICAgICAgICAgIGNoYXIgKmltYWdlLCB1bnNpZ25lZCBsb25nIGltYWdlX3NpemUpCit7Cisg ICAgdW5zaWduZWQgbG9uZyBlbnRyeV9laXA7CisgICAgc3RydWN0IGVsZl9iaW5hcnkgZWxmOwor ICAgIHVpbnQ2NF90IHZfc3RhcnQsIHZfZW5kOworICAgIGludCByYzsKKyAgICB4ZW5fY2FwYWJp bGl0aWVzX2luZm9fdCBjYXBzOworCisgICAgLyogQW4gSFZNIGd1ZXN0IG11c3QgYmUgaW5pdGlh bGlzZWQgd2l0aCBhdCBsZWFzdCAyTUIgbWVtb3J5LiAqLworICAgIGlmICggbWVtc2l6ZSA8IDIg fHwgdGFyZ2V0IDwgMiApCisgICAgICAgIGdvdG8gZXJyb3Jfb3V0OworCisgICAgaWYgKCBlbGZf aW5pdCgmZWxmLCBpbWFnZSwgaW1hZ2Vfc2l6ZSkgIT0gMCApCisgICAgICAgIGdvdG8gZXJyb3Jf b3V0OworICAgIGVsZl9wYXJzZV9iaW5hcnkoJmVsZik7CisgICAgdl9zdGFydCA9IDA7CisgICAg dl9lbmQgPSAodW5zaWduZWQgbG9uZyBsb25nKW1lbXNpemUgPDwgMjA7CisKKyAgICBpZiAoIHhj X3ZlcnNpb24oeGNoLCBYRU5WRVJfY2FwYWJpbGl0aWVzLCAmY2FwcykgIT0gMCApCisgICAgewor ICAgICAgICBQRVJST1IoIkNvdWxkIG5vdCBnZXQgWGVuIGNhcGFiaWxpdGllcyIpOworICAgICAg ICBnb3RvIGVycm9yX291dDsKKyAgICB9CisKKyAgICBpZiAoIChlbGYucHN0YXJ0ICYgKFBBR0Vf U0laRSAtIDEpKSAhPSAwICkKKyAgICB7CisgICAgICAgIFBFUlJPUigiR3Vlc3QgT1MgbXVzdCBs b2FkIHRvIGEgcGFnZSBib3VuZGFyeS4iKTsKKyAgICAgICAgZ290byBlcnJvcl9vdXQ7CisgICAg fQorCisgICAgSVBSSU5URigiVklSVFVBTCBNRU1PUlkgQVJSQU5HRU1FTlQ6XG4iCisgICAgICAg ICAgICAiICBMb2FkZXI6ICAgICAgICAlMDE2IlBSSXg2NCItPiUwMTYiUFJJeDY0IlxuIgorICAg ICAgICAgICAgIiAgVE9UQUw6ICAgICAgICAgJTAxNiJQUkl4NjQiLT4lMDE2IlBSSXg2NCJcbiIK KyAgICAgICAgICAgICIgIEVOVFJZIEFERFJFU1M6ICUwMTYiUFJJeDY0IlxuIiwKKyAgICAgICAg ICAgIGVsZi5wc3RhcnQsIGVsZi5wZW5kLAorICAgICAgICAgICAgdl9zdGFydCwgdl9lbmQsCisg ICAgICAgICAgICBlbGZfdXZhbCgmZWxmLCBlbGYuZWhkciwgZV9lbnRyeSkpOworCisgICAgcmMg PSBzZXR1cF9ndWVzdF9tZW1vcnkoeGNoLCBkb20sIAorICAgICAgICAgICAgICAgICAgICAodW5z aWduZWQgbG9uZyltZW1zaXplIDw8ICgyMCAtIFBBR0VfU0hJRlQpLAorICAgICAgICAgICAgICAg ICAgICAodW5zaWduZWQgbG9uZyl0YXJnZXQgPDwgKDIwIC0gUEFHRV9TSElGVCksICZlbGYpOwor ICAgIGlmICggcmMgPCAwICkKKyAgICAgICAgZ290byBlcnJvcl9vdXQ7CisKKyAgICByYyA9IHNl dHVwX2d1ZXN0X3NwZWNpYWxfcGFnZXMoeGNoLCBkb20sIHZfZW5kKTsKKyAgICBpZiAoIHJjIDwg MCApCisgICAgICAgIGdvdG8gZXJyb3Jfb3V0OworCiAgICAgLyogSW5zZXJ0IEpNUCA8cmVsMzI+ IGluc3RydWN0aW9uIGF0IGFkZHJlc3MgMHgwIHRvIHJlYWNoIGVudHJ5IHBvaW50LiAqLwogICAg IGVudHJ5X2VpcCA9IGVsZl91dmFsKCZlbGYsIGVsZi5laGRyLCBlX2VudHJ5KTsKICAgICBpZiAo IGVudHJ5X2VpcCAhPSAwICkKQEAgLTM4MywxMSArNDEzLDkgQEAgc3RhdGljIGludCBzZXR1cF9n dWVzdCh4Y19pbnRlcmZhY2UgKnhjaAogICAgICAgICBtdW5tYXAocGFnZTAsIFBBR0VfU0laRSk7 CiAgICAgfQogCi0gICAgZnJlZShwYWdlX2FycmF5KTsKICAgICByZXR1cm4gMDsKIAogIGVycm9y X291dDoKLSAgICBmcmVlKHBhZ2VfYXJyYXkpOwogICAgIHJldHVybiAtMTsKIH0KIAo= --0016368332d606ad98048cca4376 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --0016368332d606ad98048cca4376--