From: "Woller, Thomas" Subject: [PATCH][SVM][2/4] svm guest timer migration fix Date: Mon, 27 Feb 2006 17:32:28 -0600 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="----_=_NextPart_001_01C63BF6.12E4A5C9" Return-path: Content-class: urn:content-classes:message 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 This is a multi-part message in MIME format. ------_=_NextPart_001_01C63BF6.12E4A5C9 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Svm patch to fix guest pin timer migration logic. Applies cleanly to 8990. Please apply. Signed-off-by: Tom Woller ------_=_NextPart_001_01C63BF6.12E4A5C9 Content-Type: application/octet-stream; name=svm_guest_pin_8990.patch Content-Transfer-Encoding: base64 Content-Description: svm_guest_pin_8990.patch Content-Disposition: attachment; filename=svm_guest_pin_8990.patch IyBIRyBjaGFuZ2VzZXQgcGF0Y2gKIyBVc2VyIHR3b2xsZXJAeGVuLXRydzEuYW1kLmNvbQojIE5v ZGUgSUQgNjQyZjE5ZjIzNTMwMmYxZTdlNWNkOGE0OGFhNTJhNWNjZTM5NDA5ZQojIFBhcmVudCAg NWI3NDNkZDliMjMxMzNlODQ5NjVlMTQ4ZTI2ZjQ5NDZmZTNkZDU2Mwpwb3J0IGd1ZXN0IHBpbiB0 aW1lciBtaWdyYXRpb24gdG8gU1ZNLgoKZGlmZiAtciA1Yjc0M2RkOWIyMzEgLXIgNjQyZjE5ZjIz NTMwIHhlbi9hcmNoL3g4Ni9odm0vc3ZtL3N2bS5jCi0tLSBhL3hlbi9hcmNoL3g4Ni9odm0vc3Zt L3N2bS5jCU1vbiBGZWIgMjcgMjE6MjA6NTAgMjAwNgorKysgYi94ZW4vYXJjaC94ODYvaHZtL3N2 bS9zdm0uYwlNb24gRmViIDI3IDIyOjE4OjUzIDIwMDYKQEAgLTgyMCw4ICs4MjAsMjkgQEAKIAog dm9pZCBhcmNoX3N2bV9kb19yZXN1bWUoc3RydWN0IHZjcHUgKnYpIAogewotICAgIHN2bV9kb19y ZXN1bWUodik7Ci0gICAgcmVzZXRfc3RhY2tfYW5kX2p1bXAoc3ZtX2FzbV9kb19yZXN1bWUpOwor ICAgIC8qIHBpbm5pbmcgVkNQVSB0byBhIGRpZmZlcmVudCBjb3JlPyAqLworICAgIGlmICggdi0+ YXJjaC5odm1fc3ZtLmxhdW5jaF9jb3JlID09IHNtcF9wcm9jZXNzb3JfaWQoKSkgeworICAgICAg ICBzdm1fZG9fcmVzdW1lKCB2ICk7CisgICAgICAgIHJlc2V0X3N0YWNrX2FuZF9qdW1wKCBzdm1f YXNtX2RvX3Jlc3VtZSApOworICAgIH0KKyAgICBlbHNlIHsKKyAgICAgICAgcHJpbnRrKCJWQ1BV IGNvcmUgcGlubmVkOiAlZCB0byAlZFxuIiwgdi0+YXJjaC5odm1fc3ZtLmxhdW5jaF9jb3JlLCBz bXBfcHJvY2Vzc29yX2lkKCkgKTsKKyAgICAgICAgdi0+YXJjaC5odm1fc3ZtLmxhdW5jaF9jb3Jl ID0gc21wX3Byb2Nlc3Nvcl9pZCgpOworICAgICAgICBzdm1fbWlncmF0ZV90aW1lcnMoIHYgKTsK KyAgICAgICAgc3ZtX2RvX3Jlc3VtZSggdiApOworICAgICAgICByZXNldF9zdGFja19hbmRfanVt cCggc3ZtX2FzbV9kb19yZXN1bWUgKTsKKyAgICB9Cit9CisKKwordm9pZCBzdm1fbWlncmF0ZV90 aW1lcnMoc3RydWN0IHZjcHUgKnYpCit7CisgICAgc3RydWN0IGh2bV92aXJwaXQgKnZwaXQgPSAm KHYtPmRvbWFpbi0+YXJjaC5odm1fZG9tYWluLnZwaXQpOworCisgICAgbWlncmF0ZV90aW1lcigg JnZwaXQtPnBpdF90aW1lciwgdi0+cHJvY2Vzc29yICk7CisgICAgbWlncmF0ZV90aW1lciggJnYt PmFyY2guaHZtX3N2bS5obHRfdGltZXIsIHYtPnByb2Nlc3NvciApOworICAgIGlmICggaHZtX2Fw aWNfc3VwcG9ydCh2LT5kb21haW4pICYmIFZMQVBJQyggdiApKQorICAgICAgICBtaWdyYXRlX3Rp bWVyKCAmKFZMQVBJQyh2KS0+dmxhcGljX3RpbWVyICksIHYtPnByb2Nlc3NvciApOwogfQogCiAK QEAgLTI2NjYsMjYgKzI2ODcsMjMgQEAKIHsKICAgICBzdHJ1Y3QgdmNwdSAqdiA9IGN1cnJlbnQ7 CiAgICAgc3RydWN0IHZtY2Jfc3RydWN0ICp2bWNiID0gdi0+YXJjaC5odm1fc3ZtLnZtY2I7Ci0g ICAgaW50IGNvcmUgPSBzbXBfcHJvY2Vzc29yX2lkKCk7Ci0gICAgaW50IG9sZGNvcmUgPSB2LT5h cmNoLmh2bV9zdm0uY29yZTsgCi0gICAgLyogCi0gICAgICogaWYgbmVlZCB0byBhc3NpZ24gbmV3 IGFzaWQgb3IgaWYgc3dpdGNoaW5nIGNvcmVzLCAKLSAgICAgKiB0aGVuIHJldGlyZSBhc2lkIGZv ciBvbGQgY29yZSwgYW5kIGFzc2lnbiBuZXcgZm9yIG5ldyBjb3JlLgotICAgICAqLwotICAgIGlm KCB2LT5hcmNoLmh2bV9zdm0uY29yZSAhPSBjb3JlICkgewotICAgICAgICBpZiAoc3ZtX2RiZ19v bikKLSAgICAgICAgICAgIHByaW50aygib2xkIGNvcmUgJWQgbmV3IGNvcmUgJWRcbiIsKGludCl2 LT5hcmNoLmh2bV9zdm0uY29yZSwoaW50KWNvcmUpOwotICAgICAgICB2LT5hcmNoLmh2bV9zdm0u Y29yZSA9IGNvcmU7Ci0gICAgfQotICAgIGlmKCB0ZXN0X2JpdChBUkNIX1NWTV9WTUNCX0FTU0lH Tl9BU0lELCAmdi0+YXJjaC5odm1fc3ZtLmZsYWdzKSB8fAotICAgICAgICAgIChvbGRjb3JlICE9 IGNvcmUpKSB7Ci0gICAgICAgIGlmKCFhc2lkcG9vbF9hc3NpZ25fbmV4dCh2bWNiLCAxLCAKLQkg ICAgICAgICAgICBvbGRjb3JlLCBjb3JlKSkgeworCisgICAvKgorICAgICogaWYgbmVlZCB0byBh c3NpZ24gbmV3IGFzaWQsIG9yIGlmIHN3aXRjaGluZyBjb3JlcywKKyAgICAqIHJldGlyZSBhc2lk IGZvciB0aGUgb2xkIGNvcmUsIGFuZCBhc3NpZ24gYSBuZXcgYXNpZCB0byB0aGUgY3VycmVudCBj b3JlLgorICAgICovCisgICAgaWYgKCB0ZXN0X2JpdCggQVJDSF9TVk1fVk1DQl9BU1NJR05fQVNJ RCwgJnYtPmFyY2guaHZtX3N2bS5mbGFncyApIHx8CisgICAgICAgKCB2LT5hcmNoLmh2bV9zdm0u YXNpZF9jb3JlICE9IHYtPmFyY2guaHZtX3N2bS5sYXVuY2hfY29yZSApKSB7CisgICAgICAgIC8q IHJlY3ljbGUgYXNpZCAqLworICAgICAgICBpZiAoICFhc2lkcG9vbF9hc3NpZ25fbmV4dCggdm1j YiwgMSwKKwkgICAgIHYtPmFyY2guaHZtX3N2bS5hc2lkX2NvcmUsIHYtPmFyY2guaHZtX3N2bS5s YXVuY2hfY29yZSApKSB7CiAgICAgICAgICAgICAvKiBJZiB3ZSBnZXQgaGVyZSwgd2UgaGF2ZSBh IG1ham9yIHByb2JsZW0gKi8KICAgICAgICAgICAgIGRvbWFpbl9jcmFzaF9zeW5jaHJvbm91cygp OwogICAgICAgICB9Ci0gICAgfQotICAgIGNsZWFyX2JpdChBUkNIX1NWTV9WTUNCX0FTU0lHTl9B U0lELCAmdi0+YXJjaC5odm1fc3ZtLmZsYWdzKTsKKworICAgICAgICB2LT5hcmNoLmh2bV9zdm0u YXNpZF9jb3JlID0gdi0+YXJjaC5odm1fc3ZtLmxhdW5jaF9jb3JlOworICAgICAgICBjbGVhcl9i aXQoIEFSQ0hfU1ZNX1ZNQ0JfQVNTSUdOX0FTSUQsICZ2LT5hcmNoLmh2bV9zdm0uZmxhZ3MgKTsK KyAgICB9CiB9CiAKIC8qCmRpZmYgLXIgNWI3NDNkZDliMjMxIC1yIDY0MmYxOWYyMzUzMCB4ZW4v YXJjaC94ODYvaHZtL3N2bS92bWNiLmMKLS0tIGEveGVuL2FyY2gveDg2L2h2bS9zdm0vdm1jYi5j CU1vbiBGZWIgMjcgMjE6MjA6NTAgMjAwNgorKysgYi94ZW4vYXJjaC94ODYvaHZtL3N2bS92bWNi LmMJTW9uIEZlYiAyNyAyMjoxODo1MyAyMDA2CkBAIC0zMDYsNyArMzA2LDcgQEAKIHsKICAgICBp ZihhcmNoX3N2bS0+dm1jYiAhPSBOVUxMKQogICAgIHsKLSAgICAgICAgYXNpZHBvb2xfcmV0aXJl KGFyY2hfc3ZtLT52bWNiLCBhcmNoX3N2bS0+Y29yZSk7CisgICAgICAgIGFzaWRwb29sX3JldGly ZShhcmNoX3N2bS0+dm1jYiwgYXJjaF9zdm0tPmFzaWRfY29yZSk7CiAgICAgICAgICBmcmVlX3Zt Y2IoYXJjaF9zdm0tPnZtY2IpOwogICAgIH0KICAgICBpZihhcmNoX3N2bS0+aW9wbSAhPSBOVUxM KSB7CkBAIC00MDQsMTggKzQwNCwxNyBAQAogCiB2b2lkIHN2bV9kb19sYXVuY2goc3RydWN0IHZj cHUgKnYpCiB7CisgICAgc3RydWN0IHZtY2Jfc3RydWN0ICp2bWNiID0gdi0+YXJjaC5odm1fc3Zt LnZtY2I7CisgICAgaW50IGNvcmUgPSBzbXBfcHJvY2Vzc29yX2lkKCk7CisgICAgQVNTRVJUKHZt Y2IpOworCiAgICAgLyogVXBkYXRlIENSMywgR0RULCBMRFQsIFRSICovCi0gICAgc3RydWN0IHZt Y2Jfc3RydWN0ICp2bWNiOwotICAgIGludCBjb3JlID0gc21wX3Byb2Nlc3Nvcl9pZCgpOwotICAg IHZtY2IgPSB2LT5hcmNoLmh2bV9zdm0udm1jYjsKLSAgICBBU1NFUlQodm1jYik7Ci0KICAgICBz dm1fc3R0cyh2KTsKIAotICAgIC8qIGN1cnJlbnQgY29yZSBpcyB0aGUgb25lIHdlIHdpbGwgcGVy Zm9ybSB0aGUgdm1ydW4gb24gKi8KLSAgICB2LT5hcmNoLmh2bV9zdm0uY29yZSA9IGNvcmU7Cisg ICAgLyogY3VycmVudCBjb3JlIGlzIHRoZSBvbmUgd2UgaW50ZW5kIHRvIHBlcmZvcm0gdGhlIFZN UlVOIG9uICovCisgICAgdi0+YXJjaC5odm1fc3ZtLmxhdW5jaF9jb3JlID0gdi0+YXJjaC5odm1f c3ZtLmFzaWRfY29yZSA9IGNvcmU7CiAgICAgY2xlYXJfYml0KEFSQ0hfU1ZNX1ZNQ0JfQVNTSUdO X0FTSUQsICZ2LT5hcmNoLmh2bV9zdm0uZmxhZ3MpOwotICAgIGlmICggIWFzaWRwb29sX2Fzc2ln bl9uZXh0KHZtY2IsIDAsIGNvcmUsIGNvcmUpICkKKyAgICBpZiAoICFhc2lkcG9vbF9hc3NpZ25f bmV4dCggdm1jYiwgMCwgY29yZSwgY29yZSApKQogICAgICAgICBCVUcoKTsKIAogICAgIGlmICh2 LT52Y3B1X2lkID09IDApCmRpZmYgLXIgNWI3NDNkZDliMjMxIC1yIDY0MmYxOWYyMzUzMCB4ZW4v aW5jbHVkZS9hc20teDg2L2h2bS9zdm0vc3ZtLmgKLS0tIGEveGVuL2luY2x1ZGUvYXNtLXg4Ni9o dm0vc3ZtL3N2bS5oCU1vbiBGZWIgMjcgMjE6MjA6NTAgMjAwNgorKysgYi94ZW4vaW5jbHVkZS9h c20teDg2L2h2bS9zdm0vc3ZtLmgJTW9uIEZlYiAyNyAyMjoxODo1MyAyMDA2CkBAIC01NCw2ICs1 NCw4IEBACiAvKiBGb3IgZGVidWdnaW5nLiBSZW1vdmUgd2hlbiBubyBsb25nZXIgbmVlZGVkLiAq LwogZXh0ZXJuIHZvaWQgc3ZtX2R1bXBfaG9zdF9yZWdzKGNvbnN0IGNoYXIgKmZyb20pOwogCitl eHRlcm4gdm9pZCBzdm1fbWlncmF0ZV90aW1lcnMoc3RydWN0IHZjcHUgKnYpOworCiAvKiBBU0lE IEFQSSAqLwogZW51bSB7CiAgICAgQVNJRF9BVkFJTEFCTEUgPSAwLApkaWZmIC1yIDViNzQzZGQ5 YjIzMSAtciA2NDJmMTlmMjM1MzAgeGVuL2luY2x1ZGUvYXNtLXg4Ni9odm0vc3ZtL3ZtY2IuaAot LS0gYS94ZW4vaW5jbHVkZS9hc20teDg2L2h2bS9zdm0vdm1jYi5oCU1vbiBGZWIgMjcgMjE6MjA6 NTAgMjAwNgorKysgYi94ZW4vaW5jbHVkZS9hc20teDg2L2h2bS9zdm0vdm1jYi5oCU1vbiBGZWIg MjcgMjI6MTg6NTMgMjAwNgpAQCAtNDU3LDcgKzQ1Nyw4IEBACiAgICAgdTY0ICAgICAgICAgICAg ICAgICB2bWV4aXRfdHNjOyAvKiB0c2MgcmVhZCBhdCAjVk1FWElULiBmb3IgVFNDX09GRlNFVCAq LwogICAgIGludCAgICAgICAgICAgICAgICAgaW5qZWN0aW5nX2V2ZW50OwogICAgIGludCAgICAg ICAgICAgICAgICAgc2F2ZWRfaXJxX3ZlY3RvcjsKLSAgICB1MzIgICAgICAgICAgICAgICAgIGNv cmU7ICAgICAgICAvKiBjcHUgb2YgbGFzdCB2bWV4aXQgKi8KKyAgICB1MzIgICAgICAgICAgICAg ICAgIGxhdW5jaF9jb3JlOworICAgIHUzMiAgICAgICAgICAgICAgICAgYXNpZF9jb3JlOwogICAg IAogICAgIHVuc2lnbmVkIGxvbmcgICAgICAgZmxhZ3M7ICAgICAgLyogVk1DQiBmbGFncyAqLwog ICAgIHVuc2lnbmVkIGxvbmcgICAgICAgY3B1X3NoYWRvd19jcjA7IC8qIGNvcHkgb2YgZ3Vlc3Qg cmVhZCBzaGFkb3cgQ1IwICovCg== ------_=_NextPart_001_01C63BF6.12E4A5C9 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 ------_=_NextPart_001_01C63BF6.12E4A5C9--