From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JoCK5-0002s2-CR
	for qemu-devel@nongnu.org; Tue, 22 Apr 2008 02:49:49 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JoCK4-0002ro-Mz
	for qemu-devel@nongnu.org; Tue, 22 Apr 2008 02:49:49 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JoCK4-0002rl-HC
	for qemu-devel@nongnu.org; Tue, 22 Apr 2008 02:49:48 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <aurelien@aurel32.net>)
	id 1JoCK3-0005VS-TQ
	for qemu-devel@nongnu.org; Tue, 22 Apr 2008 02:49:48 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <aurelien@aurel32.net>) id 1JoCK0-0004mD-9t
	for qemu-devel@nongnu.org; Tue, 22 Apr 2008 06:49:44 +0000
Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <aurel32@savannah.gnu.org>) id 1JoCJz-0004m8-Su
	for qemu-devel@nongnu.org; Tue, 22 Apr 2008 06:49:44 +0000
MIME-Version: 1.0
Errors-To: aurel32
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Aurelien Jarno <aurelien@aurel32.net>
Message-Id: <E1JoCJz-0004m8-Su@cvs.savannah.gnu.org>
Date: Tue, 22 Apr 2008 06:49:43 +0000
Subject: [Qemu-devel] [4233] x86: remove load_kernel()
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 4233
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4233
Author:   aurel32
Date:     2008-04-22 06:49:43 +0000 (Tue, 22 Apr 2008)

Log Message:
-----------
x86: remove load_kernel()

(Jan Kiszka)

Modified Paths:
--------------
    trunk/hw/pc.c

Modified: trunk/hw/pc.c
===================================================================
--- trunk/hw/pc.c	2008-04-22 03:15:10 UTC (rev 4232)
+++ trunk/hw/pc.c	2008-04-22 06:49:43 UTC (rev 4233)
@@ -445,37 +445,6 @@
     bdrv_set_boot_sector(drives_table[hda].bdrv, bootsect, sizeof(bootsect));
 }
 
-static int load_kernel(const char *filename, uint8_t *addr,
-                       uint8_t *real_addr)
-{
-    int fd, size;
-    int setup_sects;
-
-    fd = open(filename, O_RDONLY | O_BINARY);
-    if (fd < 0)
-        return -1;
-
-    /* load 16 bit code */
-    if (read(fd, real_addr, 512) != 512)
-        goto fail;
-    setup_sects = real_addr[0x1F1];
-    if (!setup_sects)
-        setup_sects = 4;
-    if (read(fd, real_addr + 512, setup_sects * 512) !=
-        setup_sects * 512)
-        goto fail;
-
-    /* load 32 bit code */
-    size = read(fd, addr, 16 * 1024 * 1024);
-    if (size < 0)
-        goto fail;
-    close(fd);
-    return size;
- fail:
-    close(fd);
-    return -1;
-}
-
 static long get_file_size(FILE *f)
 {
     long where, size;