From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IHJLO-0004dU-5g for qemu-devel@nongnu.org; Sat, 04 Aug 2007 09:06:58 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IHJLJ-0004dI-0E for qemu-devel@nongnu.org; Sat, 04 Aug 2007 09:06:56 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IHJLI-0004dF-Rj for qemu-devel@nongnu.org; Sat, 04 Aug 2007 09:06:52 -0400 Received: from mx20.gnu.org ([199.232.41.8]) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1IHJLG-0000Fq-Mi for qemu-devel@nongnu.org; Sat, 04 Aug 2007 09:06:51 -0400 Received: from user-387go2v.cable.mindspring.com ([208.120.96.95] helo=chrom.inf.tu-dresden.de) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1IHJKz-00005q-Cw for qemu-devel@nongnu.org; Sat, 04 Aug 2007 09:06:33 -0400 Received: from kauer by chrom.inf.tu-dresden.de with local (Exim 4.67) (envelope-from ) id 1IHJKG-0005d2-06 for qemu-devel@nongnu.org; Sat, 04 Aug 2007 15:05:48 +0200 Date: Sat, 4 Aug 2007 15:05:47 +0200 From: Bernhard Kauer Subject: Re: [Qemu-devel] Patch: let qemu work with latest bochsbios Message-ID: <20070804130547.GB20760@chrom.inf.tu-dresden.de> References: <20070801154217.GC5570@chrom.inf.tu-dresden.de> <46B0AEB2.9040709@codemonkey.ws> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="VbJkn9YxBvnuCH5J" Content-Disposition: inline In-Reply-To: <46B0AEB2.9040709@codemonkey.ws> 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 --VbJkn9YxBvnuCH5J Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Wed, Aug 01, 2007 at 11:02:58AM -0500, Anthony Liguori wrote: > Bernhard Kauer wrote: >> - boot_device = 'c'; /* to prevent confusion by the BIOS */ >> + //boot_device = 'c'; /* to prevent confusion by the BIOS */ >> } >> > > Please don't comment out code. Just delete it. You are right. At the time i changed it I just wondered what the comment means... Bernhard --VbJkn9YxBvnuCH5J Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="qemu_boot_device.diff" Index: vl.c =================================================================== RCS file: /sources/qemu/qemu/vl.c,v retrieving revision 1.323 diff -u -r1.323 vl.c --- vl.c 29 Jul 2007 17:57:25 -0000 1.323 +++ vl.c 4 Aug 2007 13:05:28 -0000 @@ -7828,7 +7828,6 @@ fprintf(stderr, "No valid PXE rom found for network device\n"); exit(1); } - boot_device = 'c'; /* to prevent confusion by the BIOS */ } #endif Index: hw/pc.c =================================================================== RCS file: /sources/qemu/qemu/hw/pc.c,v retrieving revision 1.81 diff -u -r1.81 pc.c --- hw/pc.c 6 Jun 2007 16:26:13 -0000 1.81 +++ hw/pc.c 4 Aug 2007 13:05:29 -0000 @@ -197,6 +197,9 @@ case 'd': rtc_set_memory(s, 0x3d, 0x03); /* CD-ROM boot */ break; + case 'n': + rtc_set_memory(s, 0x3d, 0x04); /* Network boot */ + break; } /* floppy type */ --VbJkn9YxBvnuCH5J--