From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JNNIS-00018p-QX for qemu-devel@nongnu.org; Fri, 08 Feb 2008 02:05:16 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JNNIR-00018d-8r for qemu-devel@nongnu.org; Fri, 08 Feb 2008 02:05:16 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JNNIR-00018a-5c for qemu-devel@nongnu.org; Fri, 08 Feb 2008 02:05:15 -0500 Received: from py-out-1112.google.com ([64.233.166.180]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JNNIQ-0005Vn-T4 for qemu-devel@nongnu.org; Fri, 08 Feb 2008 02:05:15 -0500 Received: by py-out-1112.google.com with SMTP id u52so5343087pyb.10 for ; Thu, 07 Feb 2008 23:05:13 -0800 (PST) Message-ID: <5d6222a80802072305t2d536595q97d169df9dc00a48@mail.gmail.com> Date: Fri, 8 Feb 2008 05:05:13 -0200 From: "Glauber de Oliveira Costa" MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_20632_22433449.1202454313253" Subject: [Qemu-devel] [PATCH] boot a linux kernel from non-ide device 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 ------=_Part_20632_22433449.1202454313253 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline Since it's now possible to use the -drive option, the test for something in the index 0 of the IDE bus is too restrictive. A better idea, IMHO, is to check if the user specified any bootable device, and only if not, fallback to the default, compatible behaviour of checking hda regardless of the presence of a boot=on arg. -- Glauber de Oliveira Costa. "Free as in Freedom" http://glommer.net "The less confident you are, the more serious you have to act." ------=_Part_20632_22433449.1202454313253 Content-Type: text/x-patch; name=qemu.patch Content-Transfer-Encoding: base64 X-Attachment-Id: f_fcee6gbz0 Content-Disposition: attachment; filename=qemu.patch Y29tbWl0IDY1YjhmY2YzYmM1Yjc1NGI3MjBhMDRmYTdlZmVkNmZkY2Q0NzJhNmEKQXV0aG9yOiBH bGF1YmVyIGRlIE9saXZlaXJhIENvc3RhIDxnY29zdGFAcmVkaGF0LmNvbT4KRGF0ZTogICBGcmkg RmViIDggMDU6MDI6NDcgMjAwOCAtMDIwMAoKICAgIFtQQVRDSF0gYm9vdCBhIGxpbnV4IGtlcm5l bCBmcm9tIG5vbi1pZGUgZGV2aWNlCiAgICAKICAgIFNpbmNlIGl0J3Mgbm93IHBvc3NpYmxlIHRv IHVzZSB0aGUgLWRyaXZlIG9wdGlvbiwgdGhlIHRlc3QgZm9yIHNvbWV0aGluZwogICAgaW4gdGhl IGluZGV4IDAgb2YgdGhlIElERSBidXMgaXMgdG9vIHJlc3RyaWN0aXZlLgogICAgCiAgICBBIGJl dHRlciBpZGVhLCBJTUhPLCBpcyB0byBjaGVjayBpZiB0aGUgdXNlciBzcGVjaWZpZWQgYW55IGJv b3RhYmxlIGRldmljZSwKICAgIGFuZCBvbmx5IGlmIG5vdCwgZmFsbGJhY2sgdG8gdGhlIGRlZmF1 bHQsIGNvbXBhdGlibGUgYmVoYXZpb3VyIG9mIGNoZWNraW5nCiAgICBoZGEgcmVnYXJkbGVzcyBv ZiB0aGUgcHJlc2VuY2Ugb2YgYSBib290PW9uIGFyZy4KCmRpZmYgLS1naXQgYS9xZW11L2h3L3Bj LmMgYi9xZW11L2h3L3BjLmMKaW5kZXggNWNlMjhhYi4uYTliMGY3MSAxMDA2NDQKLS0tIGEvcWVt dS9ody9wYy5jCisrKyBiL3FlbXUvaHcvcGMuYwpAQCAtMzk4LDExICszOTgsMTQgQEAgc3RhdGlj IHZvaWQgZ2VuZXJhdGVfYm9vdHNlY3QodWludDMyX3QgZ3ByWzhdLCB1aW50MTZfdCBzZWdzWzZd LCB1aW50MTZfdCBpcCkKIHsKICAgICB1aW50OF90IGJvb3RzZWN0WzUxMl0sICpwOwogICAgIGlu dCBpOwotICAgIGludCBoZGE7Ci0KLSAgICBoZGEgPSBkcml2ZV9nZXRfaW5kZXgoSUZfSURFLCAw LCAwKTsKLSAgICBpZiAoaGRhID09IC0xKSB7Ci0JZnByaW50ZihzdGRlcnIsICJBIGRpc2sgaW1h Z2UgbXVzdCBiZSBnaXZlbiBmb3IgJ2hkYScgd2hlbiBib290aW5nICIKKyAgICBpbnQgaGRhID0g LTEsIGJvb3RfZGV2aWNlOworCisgICAgaWYgKGV4dGJvb3RfZHJpdmUgIT0gLTEpCisgICAgICAg IGJvb3RfZGV2aWNlID0gZXh0Ym9vdF9kcml2ZTsKKyAgICBlbHNlIGlmICgoaGRhID0gZHJpdmVf Z2V0X2luZGV4KElGX0lERSwgMCwgMCkpICE9IC0xKSAKKwlib290X2RldmljZSA9IGhkYTsKKyAg ICBlbHNlIHsKKwlmcHJpbnRmKHN0ZGVyciwgIkEgYm9vdGFibGUgZGlzayBpbWFnZSBtdXN0IGJl IGdpdmVuIHdoZW4gYm9vdGluZyAiCiAJCSJhIExpbnV4IGtlcm5lbFxuIik7CiAJZXhpdCgxKTsK ICAgICB9CkBAIC00MTAsNyArNDEzLDcgQEAgc3RhdGljIHZvaWQgZ2VuZXJhdGVfYm9vdHNlY3Qo dWludDMyX3QgZ3ByWzhdLCB1aW50MTZfdCBzZWdzWzZdLCB1aW50MTZfdCBpcCkKICAgICBtZW1z ZXQoYm9vdHNlY3QsIDAsIHNpemVvZihib290c2VjdCkpOwogCiAgICAgLyogQ29weSB0aGUgTVNE T1MgcGFydGl0aW9uIHRhYmxlIGlmIHBvc3NpYmxlICovCi0gICAgYmRydl9yZWFkKGRyaXZlc190 YWJsZVtoZGFdLmJkcnYsIDAsIGJvb3RzZWN0LCAxKTsKKyAgICBiZHJ2X3JlYWQoZHJpdmVzX3Rh YmxlW2Jvb3RfZGV2aWNlXS5iZHJ2LCAwLCBib290c2VjdCwgMSk7CiAKICAgICAvKiBNYWtlIHN1 cmUgd2UgaGF2ZSBhIHBhcnRpdGlvbiBzaWduYXR1cmUgKi8KICAgICBib290c2VjdFs1MTBdID0g MHg1NTsKQEAgLTQ0Nyw3ICs0NTAsNyBAQCBzdGF0aWMgdm9pZCBnZW5lcmF0ZV9ib290c2VjdCh1 aW50MzJfdCBncHJbOF0sIHVpbnQxNl90IHNlZ3NbNl0sIHVpbnQxNl90IGlwKQogICAgICpwKysg PSBzZWdzWzFdOwkJLyogQ1MgKi8KICAgICAqcCsrID0gc2Vnc1sxXSA+PiA4OwogCi0gICAgYmRy dl9zZXRfYm9vdF9zZWN0b3IoZHJpdmVzX3RhYmxlW2hkYV0uYmRydiwgYm9vdHNlY3QsIHNpemVv Zihib290c2VjdCkpOworICAgIGJkcnZfc2V0X2Jvb3Rfc2VjdG9yKGRyaXZlc190YWJsZVtib290 X2RldmljZV0uYmRydiwgYm9vdHNlY3QsIHNpemVvZihib290c2VjdCkpOwogfQogCiBzdGF0aWMg aW50IGxvYWRfa2VybmVsKGNvbnN0IGNoYXIgKmZpbGVuYW1lLCB1aW50OF90ICphZGRyLAo= ------=_Part_20632_22433449.1202454313253--