git clone http://v3vee.org/palacios/palacios.web/palacios.git

  cd palacios
  git checkout --track -b devel origin/devel

added guest-iso directive to test vm makefile

fixed toc_length initialization bug

Conflicts:

palacios/src/devices/cdrom.c
palacios/src/devices/ramdisk.c

Merging for release RC2
Merge branch 'devel'

Conflicts:
palacios/include/devices/generic.h
palacios/include/devices/ide.h
palacios/include/geekos/debug.h
palacios/include/geekos/net.h
palacios/include/geekos/pci.h
palacios/include/geekos/queue.h
palacios/include/geekos/reboot.h
palacios/include/geekos/ring_buffer.h
palacios/include/geekos/serial.h
palacios/include/geekos/socket.h
palacios/include/geekos/timer.h
palacios/include/geekos/vm.h
palacios/include/palacios/vmcs.h
palacios/include/palacios/vmcs_gen.h
palacios/src/devices/cdrom.c
palacios/src/devices/generic.c
palacios/src/devices/ramdisk.c
palacios/src/geekos/debug.c
palacios/src/geekos/net.c
palacios/src/geekos/queue.c
palacios/src/geekos/testvm.s
palacios/src/palacios/vmm_config.c

reworked the interrupt injection to be guest specific

minor fixes

work around git issues

fixing the error in geekos' memcmp implementation

fixing the error in geekos' memcmp implementation

fixed ceil linking issue and net.c compile problems
we now compile v3vee with machine local compiler while geekos is dependent on old version

Merge branch '64bit' into 64bit-right

Conflicts:
geekos/build/Makefile
geekos/src/geekos/net.c

updated to 64 bits based on the wrong f#@$%ing trunk

minor fixes

added a configuration structure for the binary inputs to the vmm (ramdisk, bios)
cleaned up some of the geekos networking issues
added dynamic registration of virtual cdroms
moved memory based cdrom over to the new registration method
changed vmm_config to reflect new ramdisk and configuration setup

Merge branch 'lwip_dev' of ssh://palacios@localhost/home/palacios/palacios into lwip_dev

Conflicts:
build/RunPuppy.sh

build fix

test

Support for lwIP switch on/off in Makefile

disabled network initialization

lwip build fix

build fixes

Merge branch 'lwip_dev' into devel

Conflicts:
palacios/build/Makefile
palacios/include/geekos/socket.h
palacios/src/geekos/net.c

added compatibility file for xed

stable compliation version with some running problems in kernel thread

build reorganization

fixed missing #endif

added new copyright and license

Conflicts:

palacios/include/devices/cdrom.h
palacios/include/devices/generic.h
palacios/include/devices/ide.h
palacios/include/devices/ramdisk.h
palacios/include/palacios/vmcs_gen.h
palacios/src/devices/cdrom.c
palacios/src/devices/generic.c
palacios/src/devices/ramdisk.c
palacios/src/palacios/vmm_config.c

added new copyright and license

minor bug fixes, and copyright additions

fixed compile bug

Merge branch 'ramdisk' into devel

Conflicts:
palacios/include/devices/generic.h
palacios/include/geekos/timer.h
palacios/include/palacios/vmcs.h
palacios/include/palacios/vmcs_gen.h
palacios/src/devices/generic.c
palacios/src/palacios/vmm_config.c

added functioning ramdisk, makefile support

trying to deal with nvram bug, disabled for now

added header files

reworked ramdisk now compiles, not tested

bug fixes to generic

reworked the generic device to handle run time configurability

bug fix in deinit

added more types

bug fix in deinit

added more types

removed v3 reference from uip header

removed v3 reference from uip header

removed references to GeekOS and added some namespace changes,
waiting to move debug functions from geekos to a virtual device

Conflicts:

palacios/src/devices/generic.c

Merge branch 'lwip_dev' of /home/palacios/palacios into lwip_dev

Conflicts:
palacios/src/lwip/arch/sys_arch.c

Compilable version with both lwip and uip

formatting change

import of new ramdisk

lwip/uip should not be dependent on any part of the VMM,
bug fix in string.c

Change lwip system interface

Merge branch 'lwip_dev' of ssh://palacios@newskysaw.cs.northwestern.edu/home/palacios/palacios into lwip_dev

No change to file, just keep update

added support for timing out Cond_Wait's
also added support for waking up specific threads by pid

added void * argument to timer callback

added support for timing out Cond_Wait's
also added support for waking up specific threads by pid

added void * argument to timer callback

modify sys_arch.c file

Add lwIP support features

Merge branch 'lwip_dev' of ssh://palacios@newskysaw.cs.northwestern.edu/home/palacios/palacios into lwip_dev

Add archtecture dependent stuffs for lwIP, mainly on lwip/arch/sys_arch.c

added second and millisecond timer support

removed defines for CR3

added second and millisecond timer support

almost done with the namespace protection via -D__V3VEE__ header wrappers

removed references to GeekOS and added some namespace changes,
waiting to move debug functions from geekos to a virtual device

one of these days I'll commit without breaking the build...

one of these days I'll commit without breaking the build...

one of these days I'll commit without breaking the build...

modified copyright tags

modified copyright tags

modified copyright tags

added copyright tags

added copyright tags

added copyright tags

Add updated lwip files in src/lwip

Deleted old lwip files in src/lwip

Add updated lwip header files in include/lwip

deleted old lwip headfiles

Add lwip files, for test, not compilable version

test,

Added whole packet of updated lwip files -- for test, still not complied

Merge branch 'lwip_dev' of ssh://palacios@localhost/home/palacios/palacios into lwip_dev

Merge branch 'devel'

small test

Merge branch 'devel' of ssh://palacios@newskysaw.cs.northwestern.edu/home/palacios/palacios into devel

Conflicts:
CODING_GUIDELINES

test

test

added license file

fixed documentation

cleanup

fixed makefile and added necessary directories

change lwip

change lwip

house cleaning

minor fix

fixed makefile to automatically generate symlinks for [rom|vga]bios

minor documentation fix

uggh.. added directories, because git doesn't like empty directories

removed vm_kernel

removed vgabios copy

build fixes