From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ls1Nv-00070a-AG
	for qemu-devel@nongnu.org; Thu, 09 Apr 2009 17:02:07 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Ls1Nt-00070O-VN
	for qemu-devel@nongnu.org; Thu, 09 Apr 2009 17:02:06 -0400
Received: from [199.232.76.173] (port=44315 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ls1Nt-00070L-Py
	for qemu-devel@nongnu.org; Thu, 09 Apr 2009 17:02:05 -0400
Received: from savannah.gnu.org ([199.232.41.3]:46947 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 <paul@nowt.org>) id 1Ls1Nt-0005GS-BG
	for qemu-devel@nongnu.org; Thu, 09 Apr 2009 17:02:05 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69) (envelope-from <paul@nowt.org>)
	id 1Ls1Ns-0003zH-UF
	for qemu-devel@nongnu.org; Thu, 09 Apr 2009 21:02:05 +0000
Received: from pbrook by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <pbrook@savannah.gnu.org>) id 1Ls1Ns-0003zD-Mv
	for qemu-devel@nongnu.org; Thu, 09 Apr 2009 21:02:04 +0000
MIME-Version: 1.0
Errors-To: pbrook
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Paul Brook <paul@nowt.org>
Message-Id: <E1Ls1Ns-0003zD-Mv@cvs.savannah.gnu.org>
Date: Thu, 09 Apr 2009 21:02:04 +0000
Subject: [Qemu-devel] [7058] Use cpu_physical_memory_write_rom instead of
	memcpy.
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: 7058
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=7058
Author:   pbrook
Date:     2009-04-09 21:02:04 +0000 (Thu, 09 Apr 2009)
Log Message:
-----------
Use cpu_physical_memory_write_rom instead of memcpy.

Signed-off-by: Glauber Costa <glommer@redhat.com>

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

Modified: trunk/hw/pc.c
===================================================================
--- trunk/hw/pc.c	2009-04-09 20:59:05 UTC (rev 7057)
+++ trunk/hw/pc.c	2009-04-09 21:02:04 UTC (rev 7058)
@@ -446,7 +446,7 @@
 
 /* Generate an initial boot sector which sets state and jump to
    a specified vector */
-static void generate_bootsect(uint8_t *option_rom,
+static void generate_bootsect(target_phys_addr_t option_rom,
                               uint32_t gpr[8], uint16_t segs[6], uint16_t ip)
 {
     uint8_t rom[512], *p, *reloc;
@@ -520,7 +520,7 @@
         sum += rom[i];
     rom[sizeof(rom) - 1] = -sum;
 
-    memcpy(option_rom, rom, sizeof(rom));
+    cpu_physical_memory_write_rom(option_rom, rom, sizeof(rom));
 }
 
 static long get_file_size(FILE *f)
@@ -537,7 +537,7 @@
     return size;
 }
 
-static void load_linux(uint8_t *option_rom,
+static void load_linux(target_phys_addr_t option_rom,
                        const char *kernel_filename,
 		       const char *initrd_filename,
 		       const char *kernel_cmdline)
@@ -909,7 +909,7 @@
         oprom_area_size = 0x8000;
 
     if (linux_boot) {
-        load_linux(phys_ram_base + option_rom_offset + oprom_area_size,
+        load_linux(0xc0000 + oprom_area_size,
                    kernel_filename, initrd_filename, kernel_cmdline);
         oprom_area_size += 2048;
     }