From: Peter Dinda Date: Wed, 19 Dec 2007 00:44:21 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: working-vmxassist-dinda X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=23882ef53edbe4dfd5029b54c5ecfe7256bfec23;hp=a74d47844b74d7f20540037ec949a23461559e53 *** empty log message *** --- diff --git a/palacios/build/Makefile b/palacios/build/Makefile index bc0b800..2d329d2 100644 --- a/palacios/build/Makefile +++ b/palacios/build/Makefile @@ -1,6 +1,6 @@ # Makefile for GeekOS kernel, userspace, and tools # Copyright (c) 2004,2005 David H. Hovemeyer -# $Revision: 1.2 $ +# $Revision: 1.3 $ # This is free software. You are permitted to use, # redistribute, and modify it as specified in the file "COPYING". @@ -260,8 +260,8 @@ fd.img : geekos/fd_boot.bin geekos/setup.bin geekos/kernel.bin rombios vgabios v # make ready to boot over PXE pxe: fd.img - cp fd.img /tftpboot/geekos.img - $(PAD) /tftpboot/geekos.img 1474560 + cp fd.img /tftpboot/vmm.img + $(PAD) /tftpboot/vmm.img 1474560 pxe-discovery-pdinda: fd.img diff --git a/palacios/include/geekos/vmm_sizes.h b/palacios/include/geekos/vmm_sizes.h index 7d8d0bc..563267e 100644 --- a/palacios/include/geekos/vmm_sizes.h +++ b/palacios/include/geekos/vmm_sizes.h @@ -2,12 +2,12 @@ #define __vmm_sizes #define KERNEL_LOAD_ADDRESS 0x3ff9d000 #define KERNEL_SETUP_LENGTH ( 1 *512) -#define KERNEL_CORE_LENGTH ( 189 *512) +#define KERNEL_CORE_LENGTH ( 203 *512) #define KERNEL_START (KERNEL_LOAD_ADDRESS) #define KERNEL_END (KERNEL_LOAD_ADDRESS+KERNEL_CORE_LENGTH-1) #define BIOS_LENGTH ( 128 *512) #define VGA_BIOS_LENGTH ( 55 *512) -#define VMXASSIST_LENGTH ( 38 *512) +#define VMXASSIST_LENGTH ( 41 *512) #define BIOS_START (KERNEL_LOAD_ADDRESS+KERNEL_CORE_LENGTH) #define VGA_BIOS_START (BIOS_START+BIOS_LENGTH) #define VMXASSIST_START (VGA_BIOS_START+VGA_BIOS_LENGTH)