From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NxmAL-0006Dc-BC for qemu-devel@nongnu.org; Fri, 02 Apr 2010 15:04:25 -0400 Received: from [140.186.70.92] (port=48793 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NxmAH-0006CP-GA for qemu-devel@nongnu.org; Fri, 02 Apr 2010 15:04:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NxmAE-00059A-JE for qemu-devel@nongnu.org; Fri, 02 Apr 2010 15:04:20 -0400 Received: from mail-pz0-f191.google.com ([209.85.222.191]:48854) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NxmAE-000593-A1 for qemu-devel@nongnu.org; Fri, 02 Apr 2010 15:04:18 -0400 Received: by pzk29 with SMTP id 29so2073478pzk.27 for ; Fri, 02 Apr 2010 12:04:17 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <4BB63869.9090301@redhat.com> References: <1270227919-31031-1-git-send-email-pbonzini@redhat.com> <4BB62A74.6090109@redhat.com> <4BB63869.9090301@redhat.com> Date: Fri, 2 Apr 2010 22:04:17 +0300 Message-ID: From: Blue Swirl Content-Type: multipart/mixed; boundary=001636b2ac505c1493048345a52d Subject: [Qemu-devel] Re: [PATCH] provide a stub version of kvm-all.c if !CONFIG_KVM List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: qemu-devel@nongnu.org --001636b2ac505c1493048345a52d Content-Type: text/plain; charset=UTF-8 On 4/2/10, Paolo Bonzini wrote: > On 04/02/2010 08:17 PM, Blue Swirl wrote: > > > I merged your patch and mine. Does it still look reasonable? > > > > Yes, of course. I'd rather see them committed separately though. This version is designed to be applied after your patch. I made my patch a bit simpler. --001636b2ac505c1493048345a52d Content-Type: text/x-diff; charset=US-ASCII; name="0001-Compile-vl.c-once.patch" Content-Disposition: attachment; filename="0001-Compile-vl.c-once.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_g7jd3k3p RnJvbSAxY2UzNWNjMWFkYzBlYjU0NDIwZDY2NDdjM2RmYzQ2NDQ1Nzg4OTA2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBCbHVlIFN3aXJsIDxibGF1d2lyYmVsQGdtYWlsLmNvbT4KRGF0 ZTogRnJpLCAyIEFwciAyMDEwIDE5OjAwOjM1ICswMDAwClN1YmplY3Q6IFtQQVRDSF0gQ29tcGls ZSB2bC5jIG9uY2UKClJlbW92ZSBkZXBlbmRlbmN5IG9mIHZsLmMgdG8gS1ZNLCB0aGVuIHdlIGNh biBwYXJ0aWFsbHkgcmV2ZXJ0CmIzMzYxMmQwMzU0MGZkYTdmYTY3NDg1ZjFjMjAzOTViZWI3YTJi ZjAuCgpTaWduZWQtb2ZmLWJ5OiBCbHVlIFN3aXJsIDxibGF1d2lyYmVsQGdtYWlsLmNvbT4KLS0t CiBNYWtlZmlsZS5vYmpzICAgfCAgICAyICstCiBNYWtlZmlsZS50YXJnZXQgfCAgICAyICstCiBr dm0tYWxsLmMgICAgICAgfCAgICAzICsrKwoga3ZtLmggICAgICAgICAgIHwgICAgNCArLS0tCiBz eXNlbXUuaCAgICAgICAgfCAgICAxICsKIHZsLmMgICAgICAgICAgICB8ICAgIDcgKysrLS0tLQog NiBmaWxlcyBjaGFuZ2VkLCAxMCBpbnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL01ha2VmaWxlLm9ianMgYi9NYWtlZmlsZS5vYmpzCmluZGV4IDExZTQ0YTAuLmNiMmVj MmMgMTAwNjQ0Ci0tLSBhL01ha2VmaWxlLm9ianMKKysrIGIvTWFrZWZpbGUub2JqcwpAQCAtMTI4 LDcgKzEyOCw3IEBAIHVzZXItb2JqLXkgKz0gY3V0aWxzLm8gY2FjaGUtdXRpbHMubwogIyBsaWJo dwogCiBody1vYmoteSA9Ci1ody1vYmoteSArPSBsb2FkZXIubworaHctb2JqLXkgKz0gdmwubyBs b2FkZXIubwogaHctb2JqLXkgKz0gdmlydGlvLm8gdmlydGlvLWNvbnNvbGUubwogaHctb2JqLXkg Kz0gZndfY2ZnLm8gcGNpLm8gcGNpX2hvc3QubyBwY2llX2hvc3QubwogaHctb2JqLXkgKz0gd2F0 Y2hkb2cubwpkaWZmIC0tZ2l0IGEvTWFrZWZpbGUudGFyZ2V0IGIvTWFrZWZpbGUudGFyZ2V0Cmlu ZGV4IGM1MDQ2MTcuLmMxYmZjNDEgMTAwNjQ0Ci0tLSBhL01ha2VmaWxlLnRhcmdldAorKysgYi9N YWtlZmlsZS50YXJnZXQKQEAgLTE2Miw3ICsxNjIsNyBAQCBlbmRpZiAjQ09ORklHX0JTRF9VU0VS CiAjIFN5c3RlbSBlbXVsYXRvciB0YXJnZXQKIGlmZGVmIENPTkZJR19TT0ZUTU1VCiAKLW9iai15 ID0gYXJjaF9pbml0Lm8gY3B1cy5vIG1vbml0b3IubyBtYWNoaW5lLm8gZ2Ric3R1Yi5vIHZsLm8K K29iai15ID0gYXJjaF9pbml0Lm8gY3B1cy5vIG1vbml0b3IubyBtYWNoaW5lLm8gZ2Ric3R1Yi5v CiAjIHZpcnRpbyBoYXMgdG8gYmUgaGVyZSBkdWUgdG8gd2VpcmQgZGVwZW5kZW5jeSBiZXR3ZWVu IFBDSSBhbmQgdmlydGlvLW5ldC4KICMgbmVlZCB0byBmaXggdGhpcyBwcm9wZXJseQogb2JqLXkg Kz0gdmlydGlvLWJsay5vIHZpcnRpby1iYWxsb29uLm8gdmlydGlvLW5ldC5vIHZpcnRpby1wY2ku byB2aXJ0aW8tc2VyaWFsLWJ1cy5vCmRpZmYgLS1naXQgYS9rdm0tYWxsLmMgYi9rdm0tYWxsLmMK aW5kZXggMzczZmQzNC4uZjYzMTdlZSAxMDA2NDQKLS0tIGEva3ZtLWFsbC5jCisrKyBiL2t2bS1h bGwuYwpAQCAtNTEsNiArNTEsOCBAQCB0eXBlZGVmIHN0cnVjdCBLVk1TbG90CiAKIHR5cGVkZWYg c3RydWN0IGt2bV9kaXJ0eV9sb2cgS1ZNRGlydHlMb2c7CiAKK2ludCBrdm1fYWxsb3dlZCA9IDA7 CisKIHN0cnVjdCBLVk1TdGF0ZQogewogICAgIEtWTVNsb3Qgc2xvdHNbMzJdOwpAQCAtNjcwLDYg KzY3Miw3IEBAIGludCBrdm1faW5pdChpbnQgc21wX2NwdXMpCiAKICAgICBrdm1fc3RhdGUgPSBz OwogICAgIGNwdV9yZWdpc3Rlcl9waHlzX21lbW9yeV9jbGllbnQoJmt2bV9jcHVfcGh5c19tZW1v cnlfY2xpZW50KTsKKyAgICBrdm1fYWxsb3dlZCA9IDE7CiAKICAgICByZXR1cm4gMDsKIApkaWZm IC0tZ2l0IGEva3ZtLmggYi9rdm0uaAppbmRleCBlYTNjOTdkLi5lYzY2YjJmIDEwMDY0NAotLS0g YS9rdm0uaAorKysgYi9rdm0uaApAQCAtMjMsOSArMjMsOSBAQAogI2luY2x1ZGUgPGxpbnV4L2t2 bS5oPgogI2VuZGlmCiAKKyNpZiBkZWZpbmVkIENPTkZJR19LVk0gfHwgIWRlZmluZWQgTkVFRF9D UFVfSAogZXh0ZXJuIGludCBrdm1fYWxsb3dlZDsKIAotI2lmIGRlZmluZWQgQ09ORklHX0tWTSB8 fCAhZGVmaW5lZCBORUVEX0NQVV9ICiAjZGVmaW5lIGt2bV9lbmFibGVkKCkgKGt2bV9hbGxvd2Vk KQogI2Vsc2UKICNkZWZpbmUga3ZtX2VuYWJsZWQoKSAoMCkKQEAgLTM1LDggKzM1LDYgQEAgc3Ry dWN0IGt2bV9ydW47CiAKIC8qIGV4dGVybmFsIEFQSSAqLwogCi1pbnQga3ZtX2luaXQoaW50IHNt cF9jcHVzKTsKLQogI2lmZGVmIE5FRURfQ1BVX0gKIGludCBrdm1faW5pdF92Y3B1KENQVVN0YXRl ICplbnYpOwogCmRpZmYgLS1naXQgYS9zeXNlbXUuaCBiL3N5c2VtdS5oCmluZGV4IGQwZWZmYTAu LjBiNDIzZGIgMTAwNjQ0Ci0tLSBhL3N5c2VtdS5oCisrKyBiL3N5c2VtdS5oCkBAIC0yNDMsNCAr MjQzLDUgQEAgdm9pZCBydGNfY2hhbmdlX21vbl9ldmVudChzdHJ1Y3QgdG0gKnRtKTsKIAogdm9p ZCByZWdpc3Rlcl9kZXZpY2VzKHZvaWQpOwogCitpbnQga3ZtX2luaXQoaW50IHNtcF9jcHVzKTsK ICNlbmRpZgpkaWZmIC0tZ2l0IGEvdmwuYyBiL3ZsLmMKaW5kZXggOWZlNDY4Mi4uMTAwNTE2MyAx MDA2NDQKLS0tIGEvdmwuYworKysgYi92bC5jCkBAIC0xNDUsNyArMTQ1LDYgQEAgaW50IG1haW4o aW50IGFyZ2MsIGNoYXIgKiphcmd2KQogI2luY2x1ZGUgImRtYS5oIgogI2luY2x1ZGUgImF1ZGlv L2F1ZGlvLmgiCiAjaW5jbHVkZSAibWlncmF0aW9uLmgiCi0jaW5jbHVkZSAia3ZtLmgiCiAjaW5j bHVkZSAiYmFsbG9vbi5oIgogI2luY2x1ZGUgInFlbXUtb3B0aW9uLmgiCiAjaW5jbHVkZSAicWVt dS1jb25maWcuaCIKQEAgLTI0MSw3ICsyNDAsNiBAQCB1aW50OF90IHFlbXVfdXVpZFsxNl07CiBz dGF0aWMgUUVNVUJvb3RTZXRIYW5kbGVyICpib290X3NldF9oYW5kbGVyOwogc3RhdGljIHZvaWQg KmJvb3Rfc2V0X29wYXF1ZTsKIAotaW50IGt2bV9hbGxvd2VkID0gMDsKIHVpbnQzMl90IHhlbl9k b21pZDsKIGVudW0geGVuX21vZGUgeGVuX21vZGUgPSBYRU5fRU1VTEFURTsKIApAQCAtMjY0OSw2 ICsyNjQ3LDcgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIgKiphcmd2LCBjaGFyICoqZW52cCkK ICNlbmRpZgogICAgIGludCBzaG93X3ZuY19wb3J0ID0gMDsKICAgICBpbnQgZGVmY29uZmlnID0g MTsKKyAgICBpbnQgZW5hYmxlX2t2bSA9IDA7CiAKICAgICBlcnJvcl9zZXRfcHJvZ25hbWUoYXJn dlswXSk7CiAKQEAgLTMyMzUsNyArMzIzNCw3IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyICoq YXJndiwgY2hhciAqKmVudnApCiAgICAgICAgICAgICAgICAgZG9fc21iaW9zX29wdGlvbihvcHRh cmcpOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgY2FzZSBRRU1VX09QVElP Tl9lbmFibGVfa3ZtOgotICAgICAgICAgICAgICAgIGt2bV9hbGxvd2VkID0gMTsKKyAgICAgICAg ICAgICAgICBlbmFibGVfa3ZtID0gMTsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAg ICAgIGNhc2UgUUVNVV9PUFRJT05fdXNiOgogICAgICAgICAgICAgICAgIHVzYl9lbmFibGVkID0g MTsKQEAgLTM1ODEsNyArMzU4MCw3IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyICoqYXJndiwg Y2hhciAqKmVudnApCiAgICAgICAgIGV4aXQoMSk7CiAgICAgfQogCi0gICAgaWYgKGt2bV9hbGxv d2VkKSB7CisgICAgaWYgKGVuYWJsZV9rdm0pIHsKICAgICAgICAgaW50IHJldCA9IGt2bV9pbml0 KHNtcF9jcHVzKTsKICAgICAgICAgaWYgKHJldCA8IDApIHsKICAgICAgICAgICAgIGlmICgha3Zt X2F2YWlsYWJsZSgpKSB7Ci0tIAoxLjUuNi41Cgo= --001636b2ac505c1493048345a52d--