From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Ls0je-0004pQ-Jr for qemu-devel@nongnu.org; Thu, 09 Apr 2009 16:20:30 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Ls0jZ-0004gs-Di for qemu-devel@nongnu.org; Thu, 09 Apr 2009 16:20:29 -0400 Received: from [199.232.76.173] (port=44605 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ls0jZ-0004gS-0C for qemu-devel@nongnu.org; Thu, 09 Apr 2009 16:20:25 -0400 Received: from mx2.redhat.com ([66.187.237.31]:41852) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Ls0jY-0000nr-Dd for qemu-devel@nongnu.org; Thu, 09 Apr 2009 16:20:24 -0400 From: Glauber Costa Date: Thu, 9 Apr 2009 16:20:20 -0400 Message-Id: <1239308420-10521-3-git-send-email-glommer@redhat.com> In-Reply-To: <1239308420-10521-2-git-send-email-glommer@redhat.com> References: <1239308420-10521-1-git-send-email-glommer@redhat.com> <1239308420-10521-2-git-send-email-glommer@redhat.com> Subject: [Qemu-devel] [PATCH 2/2] get rid of phys_ram_base dependency for load_linux 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 Cc: jan.kiszka@siemens.com, aliguori@us.ibm.com use cpu_physical_memory_write_rom instead of memcpy Signed-off-by: Glauber Costa --- hw/pc.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index 166d378..4858c5d 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -446,7 +446,7 @@ static void bochs_bios_init(void) /* 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 @@ static void generate_bootsect(uint8_t *option_rom, 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 @@ static long get_file_size(FILE *f) 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) @@ -901,7 +901,7 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size, if (linux_boot) { oprom_area_size = (oprom_area_size + 2047) & ~2047; - 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 += TARGET_PAGE_SIZE; } -- 1.5.6.6