From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dulloor Subject: [PATCH 06/11] [XEN] Minor cleanup over previous patches Date: Sun, 4 Apr 2010 15:30:29 -0400 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=0016e6d7ee6fc2098e04836e3e0f Return-path: 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 --0016e6d7ee6fc2098e04836e3e0f Content-Type: text/plain; charset=ISO-8859-1 The patch just adds a minor cleanup up over the previous patches. -dulloor Signed-off-by: Dulloor Rao --0016e6d7ee6fc2098e04836e3e0f Content-Type: text/x-patch; charset=US-ASCII; name="xen-06-minor-cleanup-fixes.patch" Content-Disposition: attachment; filename="xen-06-minor-cleanup-fixes.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_g7m8rujc0 ZGlmZiAtciA2ZWJhNjIwOTJjYjQgLXIgMzAwNDA5MmM0NzkyIHRvb2xzL2xpYnhjL01ha2VmaWxl Ci0tLSBhL3Rvb2xzL2xpYnhjL01ha2VmaWxlCVRodSBBcHIgMDEgMTM6MDY6MTQgMjAxMCAtMDQw MAorKysgYi90b29scy9saWJ4Yy9NYWtlZmlsZQlUaHUgQXByIDAxIDE2OjIzOjI3IDIwMTAgLTA0 MDAKQEAgLTI1LDcgKzI1LDcgQEAKIENUUkxfU1JDUy15ICAgICAgICs9IHhjX21lbV9ldmVudC5j CiBDVFJMX1NSQ1MteSAgICAgICArPSB4Y19tZW1fcGFnaW5nLmMKIENUUkxfU1JDUy15ICAgICAg ICs9IHhjX21lbXNoci5jCi1DVFJMX1NSQ1MteSAgICAgICArPSB4Y19kb21fbnVtYS5jCitDVFJM X1NSQ1MteSAgICAgICArPSB4Y19jcHVtYXAuYwogQ1RSTF9TUkNTLSQoQ09ORklHX1g4NikgKz0g eGNfcGFnZXRhYi5jCiBDVFJMX1NSQ1MtJChDT05GSUdfTGludXgpICs9IHhjX2xpbnV4LmMKIENU UkxfU1JDUy0kKENPTkZJR19TdW5PUykgKz0geGNfc29sYXJpcy5jCkBAIC01MSw2ICs1MSw3IEBA CiBHVUVTVF9TUkNTLSQoQ09ORklHX1g4NikgICAgICs9IHhjX2RvbV9iemltYWdlbG9hZGVyLmMK IEdVRVNUX1NSQ1MteSAgICAgICAgICAgICAgICAgKz0geGNfZG9tX2JpbmxvYWRlci5jCiBHVUVT VF9TUkNTLXkgICAgICAgICAgICAgICAgICs9IHhjX2RvbV9jb21wYXRfbGludXguYworR1VFU1Rf U1JDUy15CQkJCSArPSB4Y19kb21fbnVtYS5jCiAKIEdVRVNUX1NSQ1MtJChDT05GSUdfWDg2KSAg ICAgKz0geGNfZG9tX3g4Ni5jCiBHVUVTVF9TUkNTLSQoQ09ORklHX1g4NikgICAgICs9IHhjX2Nw dWlkX3g4Ni5jCmRpZmYgLXIgNmViYTYyMDkyY2I0IC1yIDMwMDQwOTJjNDc5MiB0b29scy9saWJ4 Yy94Y19kb21fbnVtYS5jCi0tLSBhL3Rvb2xzL2xpYnhjL3hjX2RvbV9udW1hLmMJVGh1IEFwciAw MSAxMzowNjoxNCAyMDEwIC0wNDAwCisrKyBiL3Rvb2xzL2xpYnhjL3hjX2RvbV9udW1hLmMJVGh1 IEFwciAwMSAxNjoyMzoyNyAyMDEwIC0wNDAwCkBAIC01LDEyICs1LDIxIEBACiAjaW5jbHVkZSAi eGdfcHJpdmF0ZS5oIgogI2luY2x1ZGUgInhjX2RvbS5oIgogI2luY2x1ZGUgInhjX2RvbV9udW1h LmgiCisjaW5jbHVkZSAieGNfY3B1bWFwLmgiCiAKICNkZWZpbmUgS0IgKDEwMjQpCiAjZGVmaW5l IE1CIChLQiAqIEtCKQogCiAjZGVmaW5lIHBmbl90b19wYWRkcihwZm4pICgoeGVuX3BhZGRyX3Qp KHBmbikgPDwgUEFHRV9TSElGVF9YODYpCiAKKy8qIENvbnN0cnVjdCBhIHhlbmN0bF9jcHVtYXAg c3RydWN0dXJlIHVzaW5nIGJ1ZmZlciBmcm9tIHRoZSB4ZW5jdGxfY3B1bWFzaworICogc3RydWN0 dXJlICovCisjZGVmaW5lIHhjX2NwdW1hcF9mcm9tX2NwdW1hc2sobWFwLCBtYXNrKSAgICAgICAg ICAgICAgIFwKK2RvIHsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgXAorICAgIChtYXApLT5ucl9jcHVzID0gWEVOQ1RMX05SX0NQVVM7ICAgICAgICAg ICAgICAgICAgICBcCisgICAgc2V0X3hlbl9ndWVzdF9oYW5kbGUoKG1hcCktPmJpdG1hcCwgKG1h c2spLT5iaXRzKTsgIFwKK313aGlsZSgwKQorCiAvKiBudW1hIGxheW91dCBzdHJ1Y3R1cmVzICov CiB4Y19tYWNoaW5lX251bWFfbGF5b3V0X3QgcGh5c19udW1hX2xheW91dDsKIHhjX2RvbWFpbl9u dW1hX2xheW91dF90IHB2X251bWFfbGF5b3V0OwpAQCAtMTksNyArMjgsNyBAQAogICAgICAgICAg ICAgICAgICAgICAgICAgeGNfZG9tYWluX251bWFfbGF5b3V0X3QgKmxheW91dCkKIHsKICAgICB1 bnNpZ25lZCBpbnQgaSwgajsKLSAgICBjaGFyIHZjcHVtYXNrWzEyOF0gPSAiIjsKKyAgICBjaGFy IG1hcHN0clsxMjhdID0gIiI7CiAgICAgeGNfZG9tX3ByaW50ZigiJXMgY2FsbGVkIDpcbiBOVU1B LUxBWU9VVChEb20lZCkgOiB2Y3B1cygldSksIHZub2RlcygldSkiLAogICAgICAgICBfX0ZVTkNU SU9OX18sIGRvbS0+Z3Vlc3RfZG9taWQsIGxheW91dC0+bWF4X3ZjcHVzLCBsYXlvdXQtPm1heF92 bm9kZXMpOwogICAgIHN3aXRjaCAobGF5b3V0LT50eXBlKQpAQCAtMzgsMTQgKzQ3LDEzIEBACiAg ICAgfQogICAgIGZvciAoaSA9IDA7IGkgPCBsYXlvdXQtPm1heF92bm9kZXM7IGkrKykKICAgICB7 CisgICAgICAgIHN0cnVjdCB4ZW5jdGxfY3B1bWFwIGNwdW1hcDsKICAgICAgICAgc3RydWN0IHhl bl92bm9kZV9kYXRhICp2bm9kZV9kYXRhID0gJmxheW91dC0+dm5vZGVfZGF0YVtpXTsKLSNpZiAw Ci0gICAgICAgIHhjX2NwdW1hc2tfc2NucHJpbnRmKHZjcHVtYXNrLCBzaXplb2YodmNwdW1hc2sp LCAKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKigoY3B1bWFza190ICopJnZub2Rl X2RhdGEtPnZjcHVfbWFzaykpOwotI2VuZGlmCisgICAgICAgIHhjX2NwdW1hcF9mcm9tX2NwdW1h c2soJmNwdW1hcCwgJnZub2RlX2RhdGEtPnZjcHVfbWFzayk7CisgICAgICAgIHhjX2NwdW1hcF9z bnByaW50ZihtYXBzdHIsIHNpemVvZihtYXBzdHIpLCBjcHVtYXApOwogICAgICAgICB4Y19kb21f cHJpbnRmKCJ2bm9kZVsldV06bW5vZGUoJXUpLCBub2RlX25yX3BhZ2VzKCVseCksIFwKICAgICAg ICAgICAgICAgICB2Y3B1X21hc2soJXMpXG4iLCB2bm9kZV9kYXRhLT52bm9kZV9pZCwgdm5vZGVf ZGF0YS0+bW5vZGVfaWQsCi0gICAgICAgICAgICAgICAgdm5vZGVfZGF0YS0+bnJfcGFnZXMsIHZj cHVtYXNrKTsKKyAgICAgICAgICAgICAgICB2bm9kZV9kYXRhLT5ucl9wYWdlcywgbWFwc3RyKTsK ICAgICB9CiAKICAgICB4Y19kb21fcHJpbnRmKCJ2bm9kZSBkaXN0YW5jZXMgOlxuIik7CkBAIC0y OTMsMTAgKzMwMSw0NyBAQAogICAgIHJldHVybiAwOwogfQogCisvKiBDb25zdHJ1Y3QgYSB4ZW5j dGxfY3B1bWFwIHN0cnVjdHVyZSB1c2luZyBidWZmZXIgZnJvbSB0aGUgeGVuY3RsX2NwdW1hc2sK KyAqIHN0cnVjdHVyZSAqLworI2RlZmluZSB4Y19jcHVtYXBfZnJvbV9jcHVtYXNrKG1hcCwgbWFz aykgICAgICAgICAgICAgICBcCitkbyB7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIFwKKyAgICAobWFwKS0+bnJfY3B1cyA9IFhFTkNUTF9OUl9DUFVT OyAgICAgICAgICAgICAgICAgICAgXAorICAgIHNldF94ZW5fZ3Vlc3RfaGFuZGxlKChtYXApLT5i aXRtYXAsIChtYXNrKS0+Yml0cyk7ICBcCit9d2hpbGUoMCkKKworc3RhdGljIGludCB4Y19zZXR1 cF92bm9kZV92Y3B1X21hc2tzKHhjX2RvbWFpbl9udW1hX2xheW91dF90ICpwdl9sYXlvdXQpCit7 CisgICAgaW50IG51bWFfc3RyYXRlZ3ksIHZjcHU7CisKKyAgICBudW1hX3N0cmF0ZWd5ID0gcHZf bGF5b3V0LT50eXBlOworCisgICAgLyogSW4gY2FzZSBvZiBzdHJpcGVkIGFsbG9jYXRpb24sIHZu b2RlcyBhcmUgbm90IGV4cG9zZWQuCisgICAgICogT25seSB0aGUgbWFwcGluZyBmcm9tIHZub2Rl IHRvIG1ub2RlIGlzIG9mIGltcG9ydGFuY2UgKi8KKyAgICBpZiAobnVtYV9zdHJhdGVneSA9PSBY RU5fRE9NX05VTUFfU1RSSVBFRCkKKyAgICAgICAgcmV0dXJuIDA7CisKKyAgICBmb3IgKHZjcHU9 MDsgdmNwdTxwdl9sYXlvdXQtPm1heF92Y3B1czsgdmNwdSsrKQorICAgIHsKKyAgICAgICAgc3Ry dWN0IHhlbmN0bF9jcHVtYXAgdmNwdW1hcDsKKyAgICAgICAgc3RydWN0IHhlbmN0bF9jcHVtYXNr ICp2Y3B1bWFzazsKKyAgICAgICAgaW50IHZub2RlID0gdmNwdS8ocHZfbGF5b3V0LT5tYXhfdmNw dXMvcHZfbGF5b3V0LT5tYXhfdm5vZGVzKTsKKworICAgICAgICB2Y3B1bWFzayA9ICZwdl9sYXlv dXQtPnZub2RlX2RhdGFbdm5vZGVdLnZjcHVfbWFzazsKKyAgICAgICAgeGNfY3B1bWFwX2Zyb21f Y3B1bWFzaygmdmNwdW1hcCwgdmNwdW1hc2spOworICAgICAgICB4Y19jcHVtYXBfc2V0X2NwdSh2 Y3B1LCB2Y3B1bWFwKTsKKyAgICB9IAorCisgICAgcmV0dXJuIDA7ICAgIAorfQorCiAvKiBQb2xp Y2llcyBmb3Igbm9kZSBzZWxlY3Rpb24gbmVlZCBtb3JlIHJlc2VhcmNoL2V4cGVyaWVuY2UuCiAg KiBBbHNvLCBsaXZlIG1pZ3JhdGlvbiBvZiB0aGUgVk1zICh0byBvdGhlciBub2RlcykgY291bGQg cHJvdmlkZSAKICAqIHBlcmlvZGljIGxvYWQgYmFsYW5jaW5nIGFjcm9zcyB0aGUgbm9kZXMuICov CisKICNkZWZpbmUgWENfVk5PREVfTUlOX1NJWkUgKDEyOCAqIE1CKQorI2RlZmluZSBYQ19WQ1BV U19QRVJfVk5PREUgKDEpCisjZGVmaW5lIFhDX1BPV0VSX09GXzIoeCkgKCgoeCkgJiAoKHgpIC0g MSkpID09IDApCisKIHN0YXRpYyBpbnQgeGNfc2VsZWN0X2RvbWFpbl92bm9kZXMoc3RydWN0IHhj X2RvbV9pbWFnZSAqZG9tLAogICAgIHhjX21hY2hpbmVfbnVtYV9sYXlvdXRfdCAqcGh5c19sYXlv dXQsIHhjX2RvbWFpbl9udW1hX2xheW91dF90ICpwdl9sYXlvdXQpCiB7CkBAIC0zMTUsMTcgKzM2 MCwzNyBAQAogICAgICAgICByZXR1cm4gLTE7CiAgICAgfQogCi0gICAgLyogQXR0ZW1wdCB0byBj b25maW5lIHRoZSBWTSBvciBzcGxpdCB0aGUgZ3Vlc3QgKGFuZCBtYWtlIGl0IG51bWEgYXdhcmUp ICovCisgICAgaWYgKCEocHZfbGF5b3V0LT5tYXhfdmNwdXMgPQorICAgICAgICAgICAgICAgIHhj X2dldF9tYXhfdmNwdXMoZG9tLT5ndWVzdF94YywgZG9tLT5ndWVzdF9kb21pZCkpKQorICAgIHsK KyAgICAgICAgeGNfZG9tX3ByaW50ZigiJXM6IHhjX2dldF9tYXhfdmNwdXMgZmFpbGVkICFcbiIs IF9fRlVOQ1RJT05fXyk7CisgICAgICAgIHJldHVybiAtMTsgCisgICAgfQorCisgICAgaWYgKHB2 X2xheW91dC0+bWF4X3ZjcHVzID4gWEVOQ1RMX05SX0NQVVMpCisgICAgeworICAgICAgICB4Y19k b21fcHJpbnRmKCIlczogRmFpbGVkIC0gTW9yZSB0aGFuICVkIHZjcHVzIVxuIiwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgX19GVU5DVElPTl9fLCBYRU5DVExf TlJfQ1BVUyk7CisgICAgICAgIHJldHVybiAtMTsgCisgICAgfQorCisgICAgLyogQXR0ZW1wdCB0 byBjb25maW5lIG9yIHNwbGl0IHRoZSBWTSAqLwogICAgIGZvciAoaSA9IDE7IGkgPD0gcGh5c19s YXlvdXQtPm1heF9ub2RlczsgaTw8PTEpCiAgICAgewogICAgICAgICB1aW50NjRfdCB2bm9kZV9z aXplX3BhZ2VzOwogCi0gICAgICAgIG1lbXNldChub2RlX3BhZ2VzX3NlbGVjdGVkLCAwLCBzaXpl b2Yobm9kZV9wYWdlc19zZWxlY3RlZCkpOwotCiAgICAgICAgIHZub2RlX3NpemVfcGFnZXMgPSBw dl9kb21fcGFnZXMvaTsKICAgICAgICAgaWYgKCh2bm9kZV9zaXplX3BhZ2VzIDw8IHBhZ2Vfc2hp ZnQpIDwgWENfVk5PREVfTUlOX1NJWkUpCiAgICAgICAgICAgICBicmVhazsKIAorICAgICAgICAv KiBOb3QgZW5vdWdoIHZjcHVzIHRvIGRpc3RyaWJ1dGUgb3ZlciAqLworICAgICAgICBpZiAocHZf bGF5b3V0LT5tYXhfdmNwdXMgPCAoaSpYQ19WQ1BVU19QRVJfVk5PREUpKQorICAgICAgICAgICAg YnJlYWs7CisKKyAgICAgICAgaWYgKChpID4gMSkgJiYgIVhDX1BPV0VSX09GXzIocHZfbGF5b3V0 LT5tYXhfdmNwdXMpKQorICAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgbWVtc2V0KG5vZGVf cGFnZXNfc2VsZWN0ZWQsIDAsIHNpemVvZihub2RlX3BhZ2VzX3NlbGVjdGVkKSk7CiAgICAgICAg IGlmICgheGNfc2VsZWN0X2Jlc3RfZml0X25vZGVzKHBoeXNfbGF5b3V0LCBpLCB2bm9kZV9zaXpl X3BhZ2VzLCAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbm9k ZV9wYWdlc19zZWxlY3RlZCwgcGFnZV9zaGlmdCkpCiAgICAgICAgIHsKQEAgLTM1NywxMyArNDIy LDYgQEAKICAgICBwdl9sYXlvdXQtPnZlcnNpb24gPSBYRU5fRE9NX05VTUFfSU5URVJGQUNFX1ZF UlNJT047CiAgICAgcHZfbGF5b3V0LT50eXBlID0gbnVtYV9zdHJhdGVneTsKIAotICAgIGlmICgh KHB2X2xheW91dC0+bWF4X3ZjcHVzID0KLSAgICAgICAgICAgICAgICB4Y19nZXRfbWF4X3ZjcHVz KGRvbS0+Z3Vlc3RfeGMsIGRvbS0+Z3Vlc3RfZG9taWQpKSkKLSAgICB7Ci0gICAgICAgIHhjX2Rv bV9wcmludGYoIiVzOiB4Y19nZXRfbWF4X3ZjcHVzIGZhaWxlZCAhXG4iLCBfX0ZVTkNUSU9OX18p OwotICAgICAgICByZXR1cm4gLTE7IAotICAgIH0KLQogICAgIGZvciAoaSA9IDA7IGkgPCBwaHlz X2xheW91dC0+bWF4X25vZGVzOyBpKyspCiAgICAgewogICAgICAgICBzdHJ1Y3QgeGVubWVtX25v ZGVfZGF0YSAqbm9kZV9kYXRhOwpAQCAtMzg1LDYgKzQ0MywxMSBAQAogICAgICAgICAgKiB2Y3B1 cyBvdmVyIHZub2RlcyBhbmQgYXNzaWduaW5nIGFmZmluaXRpZXMgKi8KICAgICB9CiAKKyAgICBp ZiAoeGNfc2V0dXBfdm5vZGVfdmNwdV9tYXNrcyhwdl9sYXlvdXQpKQorICAgIHsKKyAgICAgICAg eGNfZG9tX3ByaW50ZigiJXM6IHhjX3NldHVwX3Zub2RlX3ZjcHVfbWFza3MgZmFpbGVkICFcbiIs IF9fRlVOQ1RJT05fXyk7CisgICAgICAgIHJldHVybiAtMTsKKyAgICB9CiAgICAgZG9tLT5udW1h X2xheW91dCA9IHB2X2xheW91dDsKICAgICByZXR1cm4gMDsKIH0KZGlmZiAtciA2ZWJhNjIwOTJj YjQgLXIgMzAwNDA5MmM0NzkyIHRvb2xzL2xpYnhjL3hjX2RvbWFpbi5jCi0tLSBhL3Rvb2xzL2xp YnhjL3hjX2RvbWFpbi5jCVRodSBBcHIgMDEgMTM6MDY6MTQgMjAxMCAtMDQwMAorKysgYi90b29s cy9saWJ4Yy94Y19kb21haW4uYwlUaHUgQXByIDAxIDE2OjIzOjI3IDIwMTAgLTA0MDAKQEAgLTgs NiArOCw3IEBACiAKICNpbmNsdWRlICJ4Y19wcml2YXRlLmgiCiAjaW5jbHVkZSAieGdfc2F2ZV9y ZXN0b3JlLmgiCisjaW5jbHVkZSAieGNfY3B1bWFwLmgiCiAjaW5jbHVkZSA8eGVuL21lbW9yeS5o PgogI2luY2x1ZGUgPHhlbi9odm0vaHZtX29wLmg+CiAKQEAgLTk4LDI4ICs5OSwxNyBAQAogaW50 IHhjX3ZjcHVfc2V0YWZmaW5pdHkoaW50IHhjX2hhbmRsZSwKICAgICAgICAgICAgICAgICAgICAg ICAgIHVpbnQzMl90IGRvbWlkLAogICAgICAgICAgICAgICAgICAgICAgICAgaW50IHZjcHUsCi0g ICAgICAgICAgICAgICAgICAgICAgICB1aW50NjRfdCAqY3B1bWFwLCBpbnQgY3B1c2l6ZSkKKyAg ICAgICAgICAgICAgICAgICAgICAgIHN0cnVjdCB4ZW5jdGxfY3B1bWFwICpjcHVtYXApCiB7CiAg ICAgREVDTEFSRV9ET01DVEw7CiAgICAgaW50IHJldCA9IC0xOwotICAgIHVpbnQ4X3QgKmxvY2Fs ID0gbWFsbG9jKGNwdXNpemUpOyAKIAotICAgIGlmKGxvY2FsID09IE5VTEwpCi0gICAgewotICAg ICAgICBQRVJST1IoIkNvdWxkIG5vdCBhbGxvYyBtZW1vcnkgZm9yIFhlbiBoeXBlcmNhbGwiKTsK LSAgICAgICAgZ290byBvdXQ7Ci0gICAgfQogICAgIGRvbWN0bC5jbWQgPSBYRU5fRE9NQ1RMX3Nl dHZjcHVhZmZpbml0eTsKICAgICBkb21jdGwuZG9tYWluID0gKGRvbWlkX3QpZG9taWQ7Ci0gICAg ZG9tY3RsLnUudmNwdWFmZmluaXR5LnZjcHUgICAgPSB2Y3B1OworICAgIGRvbWN0bC51LnZjcHVh ZmZpbml0eS52Y3B1ID0gdmNwdTsKKyAgICBkb21jdGwudS52Y3B1YWZmaW5pdHkuY3B1bWFwID0g KmNwdW1hcDsKIAotICAgIGJpdG1hcF82NF90b19ieXRlKGxvY2FsLCBjcHVtYXAsIGNwdXNpemUg KiA4KTsKLQotICAgIHNldF94ZW5fZ3Vlc3RfaGFuZGxlKGRvbWN0bC51LnZjcHVhZmZpbml0eS5j cHVtYXAuYml0bWFwLCBsb2NhbCk7Ci0KLSAgICBkb21jdGwudS52Y3B1YWZmaW5pdHkuY3B1bWFw Lm5yX2NwdXMgPSBjcHVzaXplICogODsKLSAgICAKLSAgICBpZiAoIGxvY2tfcGFnZXMobG9jYWws IGNwdXNpemUpICE9IDAgKQorICAgIGlmICh4Y19jcHVtYXBfbG9ja19wYWdlcyhjcHVtYXApKQog ICAgIHsKICAgICAgICAgUEVSUk9SKCJDb3VsZCBub3QgbG9jayBtZW1vcnkgZm9yIFhlbiBoeXBl cmNhbGwiKTsKICAgICAgICAgZ290byBvdXQ7CkBAIC0xMjcsMTAgKzExNyw4IEBACiAKICAgICBy ZXQgPSBkb19kb21jdGwoeGNfaGFuZGxlLCAmZG9tY3RsKTsKIAotICAgIHVubG9ja19wYWdlcyhs b2NhbCwgY3B1c2l6ZSk7Ci0KKyAgICB4Y19jcHVtYXBfdW5sb2NrX3BhZ2VzKGNwdW1hcCk7CiAg b3V0OgotICAgIGZyZWUobG9jYWwpOwogICAgIHJldHVybiByZXQ7CiB9CiAKQEAgLTEzOCwyNyAr MTI2LDE3IEBACiBpbnQgeGNfdmNwdV9nZXRhZmZpbml0eShpbnQgeGNfaGFuZGxlLAogICAgICAg ICAgICAgICAgICAgICAgICAgdWludDMyX3QgZG9taWQsCiAgICAgICAgICAgICAgICAgICAgICAg ICBpbnQgdmNwdSwKLSAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQ2NF90ICpjcHVtYXAsIGlu dCBjcHVzaXplKQorICAgICAgICAgICAgICAgICAgICAgICAgc3RydWN0IHhlbmN0bF9jcHVtYXAg KmNwdW1hcCkKIHsKICAgICBERUNMQVJFX0RPTUNUTDsKICAgICBpbnQgcmV0ID0gLTE7Ci0gICAg dWludDhfdCAqIGxvY2FsID0gbWFsbG9jKGNwdXNpemUpOwotCi0gICAgaWYobG9jYWwgPT0gTlVM TCkKLSAgICB7Ci0gICAgICAgIFBFUlJPUigiQ291bGQgbm90IGFsbG9jIG1lbW9yeSBmb3IgWGVu IGh5cGVyY2FsbCIpOwotICAgICAgICBnb3RvIG91dDsKLSAgICB9CiAKICAgICBkb21jdGwuY21k ID0gWEVOX0RPTUNUTF9nZXR2Y3B1YWZmaW5pdHk7CiAgICAgZG9tY3RsLmRvbWFpbiA9IChkb21p ZF90KWRvbWlkOwogICAgIGRvbWN0bC51LnZjcHVhZmZpbml0eS52Y3B1ID0gdmNwdTsKKyAgICBk b21jdGwudS52Y3B1YWZmaW5pdHkuY3B1bWFwID0gKmNwdW1hcDsKIAotCi0gICAgc2V0X3hlbl9n dWVzdF9oYW5kbGUoZG9tY3RsLnUudmNwdWFmZmluaXR5LmNwdW1hcC5iaXRtYXAsIGxvY2FsKTsK LSAgICBkb21jdGwudS52Y3B1YWZmaW5pdHkuY3B1bWFwLm5yX2NwdXMgPSBjcHVzaXplICogODsK LSAgICAKLSAgICBpZiAoIGxvY2tfcGFnZXMobG9jYWwsIHNpemVvZihsb2NhbCkpICE9IDAgKQor ICAgIGlmICh4Y19jcHVtYXBfbG9ja19wYWdlcyhjcHVtYXApKQogICAgIHsKICAgICAgICAgUEVS Uk9SKCJDb3VsZCBub3QgbG9jayBtZW1vcnkgZm9yIFhlbiBoeXBlcmNhbGwiKTsKICAgICAgICAg Z290byBvdXQ7CkBAIC0xNjYsMTAgKzE0NCw4IEBACiAKICAgICByZXQgPSBkb19kb21jdGwoeGNf aGFuZGxlLCAmZG9tY3RsKTsKIAotICAgIHVubG9ja19wYWdlcyhsb2NhbCwgc2l6ZW9mIChsb2Nh bCkpOwotICAgIGJpdG1hcF9ieXRlX3RvXzY0KGNwdW1hcCwgbG9jYWwsIGNwdXNpemUgKiA4KTsK KyAgICB4Y19jcHVtYXBfdW5sb2NrX3BhZ2VzKGNwdW1hcCk7CiBvdXQ6Ci0gICAgZnJlZShsb2Nh bCk7CiAgICAgcmV0dXJuIHJldDsKIH0KIAo= --0016e6d7ee6fc2098e04836e3e0f 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 --0016e6d7ee6fc2098e04836e3e0f--