From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Lo1NZ-0007B4-Dx for qemu-devel@nongnu.org; Sun, 29 Mar 2009 16:13:13 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Lo1NS-00078l-UD for qemu-devel@nongnu.org; Sun, 29 Mar 2009 16:13:12 -0400 Received: from [199.232.76.173] (port=60468 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Lo1NS-00078i-RS for qemu-devel@nongnu.org; Sun, 29 Mar 2009 16:13:06 -0400 Received: from mail-bw0-f172.google.com ([209.85.218.172]:57235) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Lo1NS-0007xe-AC for qemu-devel@nongnu.org; Sun, 29 Mar 2009 16:13:06 -0400 Received: by bwz20 with SMTP id 20so1538086bwz.34 for ; Sun, 29 Mar 2009 13:13:04 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: References: <20090325224714.853788328@amt.cnet> <20090325225438.910911510@amt.cnet> Date: Sun, 29 Mar 2009 23:13:04 +0300 Message-ID: Subject: Re: [Qemu-devel] [patch 03/10] qemu: per-arch cpu_has_work From: Blue Swirl Content-Type: multipart/mixed; boundary=001636c5ab40ebbac60466479773 Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Marcelo Tosatti --001636c5ab40ebbac60466479773 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 3/28/09, Blue Swirl wrote: > On 3/26/09, Marcelo Tosatti wrote: > > Signed-off-by: Marcelo Tosatti > > > While the patch looks safe, it breaks Sparc32. I think you have mixed > env1, s and env (which is defined as a fixed host register). This version works. --001636c5ab40ebbac60466479773 Content-Type: plain/text; name="patch_03_10_qemu__per-arch_cpu_has_work.diff" Content-Disposition: attachment; filename="patch_03_10_qemu__per-arch_cpu_has_work.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_fsw63ne0 W3BhdGNoIDAzLzEwXSBxZW11OiBwZXItYXJjaCBjcHVfaGFzX3dvcmsKClNpZ25lZC1vZmYtYnk6 IE1hcmNlbG8gVG9zYXR0aSA8bXRvc2F0dGlAcmVkaGF0LmNvbT4KCkluZGV4OiBxZW11L3Rhcmdl dC1hbHBoYS9leGVjLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gcWVtdS5vcmlnL3RhcmdldC1hbHBoYS9leGVj LmgJMjAwOS0wMy0yOSAxNTo1NTozOS4wMDAwMDAwMDAgKzAwMDAKKysrIHFlbXUvdGFyZ2V0LWFs cGhhL2V4ZWMuaAkyMDA5LTAzLTI5IDE1OjU1OjQ1LjAwMDAwMDAwMCArMDAwMApAQCAtNDgsMTAg KzQ4LDE1IEBACiB7CiB9CiAKK3N0YXRpYyBhbHdheXNfaW5saW5lIGludCBjcHVfaGFzX3dvcmso Q1BVU3RhdGUgKmVudikKK3sKKyAgICByZXR1cm4gKGVudi0+aW50ZXJydXB0X3JlcXVlc3QgJiBD UFVfSU5URVJSVVBUX0hBUkQpOworfQorCiBzdGF0aWMgYWx3YXlzX2lubGluZSBpbnQgY3B1X2hh bHRlZChDUFVTdGF0ZSAqZW52KSB7CiAgICAgaWYgKCFlbnYtPmhhbHRlZCkKICAgICAgICAgcmV0 dXJuIDA7Ci0gICAgaWYgKGVudi0+aW50ZXJydXB0X3JlcXVlc3QgJiBDUFVfSU5URVJSVVBUX0hB UkQpIHsKKyAgICBpZiAoY3B1X2hhc193b3JrKGVudikpIHsKICAgICAgICAgZW52LT5oYWx0ZWQg PSAwOwogICAgICAgICByZXR1cm4gMDsKICAgICB9CkluZGV4OiBxZW11L3RhcmdldC1pMzg2L2V4 ZWMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBxZW11Lm9yaWcvdGFyZ2V0LWkzODYvZXhlYy5oCTIwMDktMDMt MjkgMTU6NTU6MzkuMDAwMDAwMDAwICswMDAwCisrKyBxZW11L3RhcmdldC1pMzg2L2V4ZWMuaAky MDA5LTAzLTI5IDE1OjU1OjQ1LjAwMDAwMDAwMCArMDAwMApAQCAtMzM4LDE0ICszMzgsMjMgQEAK ICNlbmRpZgogfQogCitzdGF0aWMgaW5saW5lIGludCBjcHVfaGFzX3dvcmsoQ1BVU3RhdGUgKmVu dikKK3sKKyAgICBpbnQgd29yazsKKworICAgIHdvcmsgPSAoZW52LT5pbnRlcnJ1cHRfcmVxdWVz dCAmIENQVV9JTlRFUlJVUFRfSEFSRCkgJiYKKyAgICAgICAgICAgKGVudi0+ZWZsYWdzICYgSUZf TUFTSyk7CisgICAgd29yayB8PSBlbnYtPmludGVycnVwdF9yZXF1ZXN0ICYgQ1BVX0lOVEVSUlVQ VF9OTUk7CisKKyAgICByZXR1cm4gd29yazsKK30KKwogc3RhdGljIGlubGluZSBpbnQgY3B1X2hh bHRlZChDUFVTdGF0ZSAqZW52KSB7CiAgICAgLyogaGFuZGxlIGV4aXQgb2YgSEFMVEVEIHN0YXRl ICovCiAgICAgaWYgKCFlbnYtPmhhbHRlZCkKICAgICAgICAgcmV0dXJuIDA7CiAgICAgLyogZGlz YWJsZSBoYWx0IGNvbmRpdGlvbiAqLwotICAgIGlmICgoKGVudi0+aW50ZXJydXB0X3JlcXVlc3Qg JiBDUFVfSU5URVJSVVBUX0hBUkQpICYmCi0gICAgICAgICAoZW52LT5lZmxhZ3MgJiBJRl9NQVNL KSkgfHwKLSAgICAgICAgKGVudi0+aW50ZXJydXB0X3JlcXVlc3QgJiBDUFVfSU5URVJSVVBUX05N SSkpIHsKKyAgICBpZiAoY3B1X2hhc193b3JrKGVudikpIHsKICAgICAgICAgZW52LT5oYWx0ZWQg PSAwOwogICAgICAgICByZXR1cm4gMDsKICAgICB9CkluZGV4OiBxZW11L2NwdS1hbGwuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBxZW11Lm9yaWcvY3B1LWFsbC5oCTIwMDktMDMtMjkgMTU6NTU6MzkuMDAwMDAw MDAwICswMDAwCisrKyBxZW11L2NwdS1hbGwuaAkyMDA5LTAzLTI5IDE1OjU1OjQ1LjAwMDAwMDAw MCArMDAwMApAQCAtNzc1LDYgKzc3NSw4IEBACiAKIHZvaWQgY3B1X2V4aXQoQ1BVU3RhdGUgKnMp OwogCitpbnQgcWVtdV9jcHVfaGFzX3dvcmsoQ1BVU3RhdGUgKmVudik7CisKIC8qIEJyZWFrcG9p bnQvd2F0Y2hwb2ludCBmbGFncyAqLwogI2RlZmluZSBCUF9NRU1fUkVBRCAgICAgICAgICAgMHgw MQogI2RlZmluZSBCUF9NRU1fV1JJVEUgICAgICAgICAgMHgwMgpJbmRleDogcWVtdS9jcHUtZXhl Yy5jCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIHFlbXUub3JpZy9jcHUtZXhlYy5jCTIwMDktMDMtMjkgMTU6NTU6 MzkuMDAwMDAwMDAwICswMDAwCisrKyBxZW11L2NwdS1leGVjLmMJMjAwOS0wMy0yOSAxNTo1NTo0 NS4wMDAwMDAwMDAgKzAwMDAKQEAgLTUwLDYgKzUwLDExIEBACiAvLyNkZWZpbmUgREVCVUdfRVhF QwogLy8jZGVmaW5lIERFQlVHX1NJR05BTAogCitpbnQgcWVtdV9jcHVfaGFzX3dvcmsoQ1BVU3Rh dGUgKmVudikKK3sKKyAgICByZXR1cm4gY3B1X2hhc193b3JrKGVudik7Cit9CisKIHZvaWQgY3B1 X2xvb3BfZXhpdCh2b2lkKQogewogICAgIC8qIE5PVEU6IHRoZSByZWdpc3RlciBhdCB0aGlzIHBv aW50IG11c3QgYmUgc2F2ZWQgYnkgaGFuZCBiZWNhdXNlCkluZGV4OiBxZW11L3RhcmdldC1hcm0v ZXhlYy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIHFlbXUub3JpZy90YXJnZXQtYXJtL2V4ZWMuaAkyMDA5LTAz LTI5IDE1OjU1OjM5LjAwMDAwMDAwMCArMDAwMAorKysgcWVtdS90YXJnZXQtYXJtL2V4ZWMuaAky MDA5LTAzLTI5IDE1OjU1OjQ1LjAwMDAwMDAwMCArMDAwMApAQCAtMzcsMTQgKzM3LDE5IEBACiB7 CiB9CiAKK3N0YXRpYyBpbmxpbmUgaW50IGNwdV9oYXNfd29yayhDUFVTdGF0ZSAqZW52KQorewor ICAgIHJldHVybiAoZW52LT5pbnRlcnJ1cHRfcmVxdWVzdCAmCisgICAgICAgICAgICAoQ1BVX0lO VEVSUlVQVF9GSVEgfCBDUFVfSU5URVJSVVBUX0hBUkQgfCBDUFVfSU5URVJSVVBUX0VYSVRUQikp OworfQorCiBzdGF0aWMgaW5saW5lIGludCBjcHVfaGFsdGVkKENQVVN0YXRlICplbnYpIHsKICAg ICBpZiAoIWVudi0+aGFsdGVkKQogICAgICAgICByZXR1cm4gMDsKICAgICAvKiBBbiBpbnRlcnJ1 cHQgd2FrZXMgdGhlIENQVSBldmVuIGlmIHRoZSBJIGFuZCBGIENQU1IgYml0cyBhcmUKICAgICAg ICBzZXQuICBXZSB1c2UgRVhJVFRCIHRvIHNpbGVudGx5IHdha2UgQ1BVIHdpdGhvdXQgY2F1c2lu ZyBhbgogICAgICAgIGFjdHVhbCBpbnRlcnJ1cHQuICAqLwotICAgIGlmIChlbnYtPmludGVycnVw dF9yZXF1ZXN0ICYKLSAgICAgICAgKENQVV9JTlRFUlJVUFRfRklRIHwgQ1BVX0lOVEVSUlVQVF9I QVJEIHwgQ1BVX0lOVEVSUlVQVF9FWElUVEIpKSB7CisgICAgaWYgKGNwdV9oYXNfd29yayhlbnYp KSB7CiAgICAgICAgIGVudi0+aGFsdGVkID0gMDsKICAgICAgICAgcmV0dXJuIDA7CiAgICAgfQpJ bmRleDogcWVtdS90YXJnZXQtY3Jpcy9leGVjLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gcWVtdS5vcmlnL3Rh cmdldC1jcmlzL2V4ZWMuaAkyMDA5LTAzLTI5IDE1OjU1OjM5LjAwMDAwMDAwMCArMDAwMAorKysg cWVtdS90YXJnZXQtY3Jpcy9leGVjLmgJMjAwOS0wMy0yOSAxNTo1NTo0NS4wMDAwMDAwMDAgKzAw MDAKQEAgLTQwLDYgKzQwLDExIEBACiB2b2lkIGNwdV9jcmlzX2ZsdXNoX2ZsYWdzKENQVUNSSVNT dGF0ZSAqZW52LCBpbnQgY2Nfb3ApOwogdm9pZCBoZWxwZXJfbW92ZWMoQ1BVQ1JJU1N0YXRlICpl bnYsIGludCByZWcsIHVpbnQzMl90IHZhbCk7CiAKK3N0YXRpYyBpbmxpbmUgaW50IGNwdV9oYXNf d29yayhDUFVTdGF0ZSAqZW52KQoreworICAgIHJldHVybiAoZW52LT5pbnRlcnJ1cHRfcmVxdWVz dCAmIChDUFVfSU5URVJSVVBUX0hBUkQgfCBDUFVfSU5URVJSVVBUX05NSSkpOworfQorCiBzdGF0 aWMgaW5saW5lIGludCBjcHVfaGFsdGVkKENQVVN0YXRlICplbnYpIHsKIAlpZiAoIWVudi0+aGFs dGVkKQogCQlyZXR1cm4gMDsKSW5kZXg6IHFlbXUvdGFyZ2V0LW02OGsvZXhlYy5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIHFlbXUub3JpZy90YXJnZXQtbTY4ay9leGVjLmgJMjAwOS0wMy0yOSAxNTo1NTozOS4w MDAwMDAwMDAgKzAwMDAKKysrIHFlbXUvdGFyZ2V0LW02OGsvZXhlYy5oCTIwMDktMDMtMjkgMTU6 NTU6NDUuMDAwMDAwMDAwICswMDAwCkBAIC00MSwxMCArNDEsMTUgQEAKICNpbmNsdWRlICJzb2Z0 bW11X2V4ZWMuaCIKICNlbmRpZgogCitzdGF0aWMgaW5saW5lIGludCBjcHVfaGFzX3dvcmsoQ1BV U3RhdGUgKmVudikKK3sKKyAgICByZXR1cm4gKGVudi0+aW50ZXJydXB0X3JlcXVlc3QgJiAoQ1BV X0lOVEVSUlVQVF9IQVJEKSk7Cit9CisKIHN0YXRpYyBpbmxpbmUgaW50IGNwdV9oYWx0ZWQoQ1BV U3RhdGUgKmVudikgewogICAgIGlmICghZW52LT5oYWx0ZWQpCiAgICAgICAgIHJldHVybiAwOwot ICAgIGlmIChlbnYtPmludGVycnVwdF9yZXF1ZXN0ICYgQ1BVX0lOVEVSUlVQVF9IQVJEKSB7Cisg ICAgaWYgKGNwdV9oYXNfd29yayhlbnYpKSB7CiAgICAgICAgIGVudi0+aGFsdGVkID0gMDsKICAg ICAgICAgcmV0dXJuIDA7CiAgICAgfQpJbmRleDogcWVtdS90YXJnZXQtbWlwcy9leGVjLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gcWVtdS5vcmlnL3RhcmdldC1taXBzL2V4ZWMuaAkyMDA5LTAzLTI5IDE1OjU1 OjM5LjAwMDAwMDAwMCArMDAwMAorKysgcWVtdS90YXJnZXQtbWlwcy9leGVjLmgJMjAwOS0wMy0y OSAxNTo1NTo0NS4wMDAwMDAwMDAgKzAwMDAKQEAgLTMzLDEyICszMywxOCBAQAogewogfQogCitz dGF0aWMgaW5saW5lIGludCBjcHVfaGFzX3dvcmsoQ1BVU3RhdGUgKmVudikKK3sKKyAgICByZXR1 cm4gKGVudi0+aW50ZXJydXB0X3JlcXVlc3QgJgorICAgICAgICAgICAgKENQVV9JTlRFUlJVUFRf SEFSRCB8IENQVV9JTlRFUlJVUFRfVElNRVIpKTsKK30KKworCiBzdGF0aWMgaW5saW5lIGludCBj cHVfaGFsdGVkKENQVVN0YXRlICplbnYpCiB7CiAgICAgaWYgKCFlbnYtPmhhbHRlZCkKICAgICAg ICAgcmV0dXJuIDA7Ci0gICAgaWYgKGVudi0+aW50ZXJydXB0X3JlcXVlc3QgJgotICAgICAgICAo Q1BVX0lOVEVSUlVQVF9IQVJEIHwgQ1BVX0lOVEVSUlVQVF9USU1FUikpIHsKKyAgICBpZiAoY3B1 X2hhc193b3JrKGVudikpIHsKICAgICAgICAgZW52LT5oYWx0ZWQgPSAwOwogICAgICAgICByZXR1 cm4gMDsKICAgICB9CkluZGV4OiBxZW11L3RhcmdldC1wcGMvZXhlYy5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IHFlbXUub3JpZy90YXJnZXQtcHBjL2V4ZWMuaAkyMDA5LTAzLTI5IDE1OjU1OjM5LjAwMDAwMDAw MCArMDAwMAorKysgcWVtdS90YXJnZXQtcHBjL2V4ZWMuaAkyMDA5LTAzLTI5IDE1OjU1OjQ1LjAw MDAwMDAwMCArMDAwMApAQCAtNDQsMTEgKzQ0LDE3IEBACiB7CiB9CiAKK3N0YXRpYyBhbHdheXNf aW5saW5lIGludCBjcHVfaGFzX3dvcmsoQ1BVU3RhdGUgKmVudikKK3sKKyAgICByZXR1cm4gKG1z cl9lZSAmJiAoZW52LT5pbnRlcnJ1cHRfcmVxdWVzdCAmIENQVV9JTlRFUlJVUFRfSEFSRCkpOwor fQorCisKIHN0YXRpYyBhbHdheXNfaW5saW5lIGludCBjcHVfaGFsdGVkIChDUFVTdGF0ZSAqZW52 KQogewogICAgIGlmICghZW52LT5oYWx0ZWQpCiAgICAgICAgIHJldHVybiAwOwotICAgIGlmICht c3JfZWUgJiYgKGVudi0+aW50ZXJydXB0X3JlcXVlc3QgJiBDUFVfSU5URVJSVVBUX0hBUkQpKSB7 CisgICAgaWYgKGNwdV9oYXNfd29yayhlbnYpKSB7CiAgICAgICAgIGVudi0+aGFsdGVkID0gMDsK ICAgICAgICAgcmV0dXJuIDA7CiAgICAgfQpJbmRleDogcWVtdS90YXJnZXQtc2g0L2V4ZWMuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBxZW11Lm9yaWcvdGFyZ2V0LXNoNC9leGVjLmgJMjAwOS0wMy0yOSAxNTo1 NTozOS4wMDAwMDAwMDAgKzAwMDAKKysrIHFlbXUvdGFyZ2V0LXNoNC9leGVjLmgJMjAwOS0wMy0y OSAxNTo1NTo0NS4wMDAwMDAwMDAgKzAwMDAKQEAgLTI4LDEwICsyOCwxNSBAQAogI2luY2x1ZGUg ImNwdS5oIgogI2luY2x1ZGUgImV4ZWMtYWxsLmgiCiAKK3N0YXRpYyBpbmxpbmUgaW50IGNwdV9o YXNfd29yayhDUFVTdGF0ZSAqZW52KQoreworICAgIHJldHVybiAoZW52LT5pbnRlcnJ1cHRfcmVx dWVzdCAmIENQVV9JTlRFUlJVUFRfSEFSRCk7Cit9CisKIHN0YXRpYyBpbmxpbmUgaW50IGNwdV9o YWx0ZWQoQ1BVU3RhdGUgKmVudikgewogICAgIGlmICghZW52LT5oYWx0ZWQpCiAgICAgICAgIHJl dHVybiAwOwotICAgIGlmIChlbnYtPmludGVycnVwdF9yZXF1ZXN0ICYgQ1BVX0lOVEVSUlVQVF9I QVJEKSB7CisgICAgaWYgKGNwdV9oYXNfd29yayhlbnYpKSB7CiAgICAgICAgIGVudi0+aGFsdGVk ID0gMDsKICAgICAgICAgZW52LT5pbnRyX2F0X2hhbHQgPSAxOwogICAgICAgICByZXR1cm4gMDsK SW5kZXg6IHFlbXUvdGFyZ2V0LXNwYXJjL2V4ZWMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBxZW11Lm9yaWcv dGFyZ2V0LXNwYXJjL2V4ZWMuaAkyMDA5LTAzLTI5IDE1OjU1OjM5LjAwMDAwMDAwMCArMDAwMAor KysgcWVtdS90YXJnZXQtc3BhcmMvZXhlYy5oCTIwMDktMDMtMjkgMTU6NTU6NDUuMDAwMDAwMDAw ICswMDAwCkBAIC0yNCwxMCArMjQsMTcgQEAKIC8qIG9wX2hlbHBlci5jICovCiB2b2lkIGRvX2lu dGVycnVwdChDUFVTdGF0ZSAqZW52KTsKIAorc3RhdGljIGlubGluZSBpbnQgY3B1X2hhc193b3Jr KENQVVN0YXRlICplbnYxKQoreworICAgIHJldHVybiAoZW52MS0+aW50ZXJydXB0X3JlcXVlc3Qg JiBDUFVfSU5URVJSVVBUX0hBUkQpICYmCisgICAgICAgICAgIChlbnYxLT5wc3JldCAhPSAwKTsK K30KKworCiBzdGF0aWMgaW5saW5lIGludCBjcHVfaGFsdGVkKENQVVN0YXRlICplbnYxKSB7CiAg ICAgaWYgKCFlbnYxLT5oYWx0ZWQpCiAgICAgICAgIHJldHVybiAwOwotICAgIGlmICgoZW52MS0+ aW50ZXJydXB0X3JlcXVlc3QgJiBDUFVfSU5URVJSVVBUX0hBUkQpICYmIChlbnYxLT5wc3JldCAh PSAwKSkgeworICAgIGlmIChjcHVfaGFzX3dvcmsoZW52MSkpIHsKICAgICAgICAgZW52MS0+aGFs dGVkID0gMDsKICAgICAgICAgcmV0dXJuIDA7CiAgICAgfQo= --001636c5ab40ebbac60466479773--