From: Jack Lange Date: Wed, 19 Jan 2011 19:09:40 +0000 (-0600) Subject: removed outdated build environment X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=9c9370627c5a95e3abaa1b4a6b78f6f5846f53cc;p=palacios.git removed outdated build environment --- diff --git a/SETUP_DEV_ENV.pl b/SETUP_DEV_ENV.pl deleted file mode 100755 index 2c74c0c..0000000 --- a/SETUP_DEV_ENV.pl +++ /dev/null @@ -1,141 +0,0 @@ -#!/usr/bin/perl - - - -$dev_root = `pwd`; -# -# On cygwin, do something like the following -# pwd behaves trangely on cygwin -# -#$dev_root='/home/pdinda/Codes/vmm-dev'; -chomp $dev_root; -$location = $dev_root . "/devtools"; - - -print "\n"; -print "Installing and configuring the v3vee development environment...\n"; -print "Location: " . $location . "\n\n"; - -mkdir $location; - - - -#install_binutils_2_16_91_i386(); -install_gcc_3_4_6_i386(); -install_nasm(); -# -# This part is not quite working yet -# on cygwin, do through it by hand -# -#install_dev86_0_16_17(); - - -sub install_nasm { - ### Setup vmx capable nasm - print "Installing VMX capable NASM...\n"; - chdir "./utils"; - print "Unpacking..."; - `tar -xzf nasm-0.98.39.tar.gz`; - print "done\n"; - chdir "./nasm-0.98.39"; - print "Patching in VMX support\n"; - `patch < ../vmx.patch`; - print "Patch to fix the stupid installer...\n"; - `patch < ../nasm-install.patch`; - print "Configuring...\n"; - `./configure --prefix=$location`; - print "Compiling...\n"; - `make`; - print "Installing..."; - `make install`; - print "Done!!\n\n"; - chdir $dev_root; -} - - - -sub install_binutils_2_16_91_i386 { - print "Installing binutils v2.16.91\n"; - chdir "./utils"; - print "Unpacking..."; - `tar -xzf binutils-2.16.91.0.7.tar.gz`; - print "done\n"; - chdir "binutils-2.16.91.0.7"; - print "Configuring..."; - `./configure --prefix=$location/i386 --target=i386-elf --disable-nls`; - print "done\n"; - print "Compiling..."; - `make -j 4 all`; - print "done\n"; - print "Installing..."; - `make install`; - print "done!!\n"; - chdir $dev_root; -} - - -sub install_gcc_3_4_6_i386 { - install_binutils_2_16_91_i386(); - $ENV{'PATH'} = "$location/i386/bin:" . $ENV{'PATH'}; - - print "Installing gcc v3.4.6\n"; - chdir "./utils"; - print "Unpacking..."; - `tar -xzf gcc-3.4.6.tar.gz`; - print "done\n"; - chdir "gcc-3.4.6"; - print "Configuring..."; - `./configure --prefix=$location/i386 --target=i386-elf --disable-nls --enable-languages=c,c++ --without-headers`; - print "done\n"; - print "Compiling..."; - `make -j 4 all-gcc`; - print "done\n"; - print "Installing..."; - `make install-gcc`; - print "done!!\n"; - chdir $dev_root; -} - - -sub install_binutils_2_16_91_x86_64 { - -} - - -sub install_gcc_3_4_6_x86_64 { - - print "Installing gcc v3.4.6\n"; - chdir "./utils"; - print "Unpacking..."; - `tar -xzf gcc-3.4.6.tar.gz`; - print "done\n"; - chdir "gcc-3.4.6"; - print "Configuring..."; - `./configure --target=x86_64 --prefix=$location/gcc_3.4.6-x86_64 --disable-nls --enable-languages=c,c++ --without-headers`; - print "done\n"; - print "Compiling...\n"; - `make all-gcc`; - print "done\n"; - print "Installing...\n"; - `make install-gcc`; - print "done!!\n"; - chdir $dev_root; -} - -sub install_dev86_0_16_17 { - - print "Installing bcc, ld86, as86, and bcc-cpp from Dev86src-0.16.17.tar.gz\n"; - chdir "./utils"; - print "Unpacking..."; - `tar -xzf Dev86src-0.16.17.tar.gz`; - print "done\n"; - chdir "./dev86-0.16.17"; - print "Compiling...\n"; - `make as86 ld86 bcc86`; - `make -C cpp`; - print "done\n"; - print "Installing...\n"; - `cp as/as86.exe bcc/bcc.exe bcc/bcc-cc1.exe cpp/bcc-cpp.exe ld/ld86.exe $location/bin`; - print "done!!\n"; - chdir $dev_root; -} diff --git a/build/CreateIso.sh b/build/CreateIso.sh deleted file mode 100755 index 538faa3..0000000 --- a/build/CreateIso.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -make DEBUG_ALL=1 world -cp vmm.img iso -mkisofs -R -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o test.iso iso - diff --git a/build/Makefile b/build/Makefile deleted file mode 100644 index 77aba0f..0000000 --- a/build/Makefile +++ /dev/null @@ -1,76 +0,0 @@ -# Top level Makefile for V3Vee -# -# Northwestern University -# (c) 2008, Jack Lange -# (c) 2008, Peter Dinda -# (c) 2008, Lei Xia -# (c) 2008, The V3VEE Project -# -# Required software to build V3Vee: -# - GNU Make (http://www.gnu.org/software/make) -# - nasm (http://nasm.sourceforge.net) -# - Perl5, AWK (any version), egrep -# - - -PROJECT_ROOT := .. -GEEKOS_BUILD_DIR := $(PROJECT_ROOT)/geekos/build -GUEST_ISO_DIR := /opt/vmm-tools/isos - -# List of targets to build by default. -# These targets encompass everything needed to boot -# and run GeekOS. -ALL_TARGETS := geekos-full - -QEMU := /usr/local/qemu/bin/qemu-system-x86_64 - - -ifeq ($(PROFILE_VMM),1) - GEEKOS_FLAGS:= $(GEEKOS_FLAGS) PROFILE_VMM=1 -endif - -ifeq ($(INSTRUMENT_VMM),1) - GEEKOS_FLAGS:= $(GEEKOS_FLAGS) INSTRUMENT_VMM=1 -endif - - - -# ---------------------------------------------------------------------- -# Targets - -# Specifies files to be built -# ---------------------------------------------------------------------- - -# Default target - see definition of ALL_TARGETS in Configuration section -all : $(ALL_TARGETS) - - -geekos: - cp $(PROJECT_ROOT)/libv3vee.a $(GEEKOS_BUILD_DIR)/palacios/ - (cd $(GEEKOS_BUILD_DIR) && make $(GEEKOS_FLAGS)) - - -# make ready to boot over PXE -geekos-pxe: - cp $(GEEKOS_BUILD_DIR)/vmm.img /tftpboot/vmm.img - -geekos-run: - $(QEMU) -m 1024 -serial file:serial.out -cdrom $(GUEST_ISO_DIR)/puppy.iso -fda $(GEEKOS_BUILD_DIR)/vmm.img - -geekos-iso: - cp $(GEEKOS_BUILD_DIR)/vmm.img iso/vmm.img - mkisofs -R -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o test.iso iso - - - -force: - - - - -# Clean build directories of generated files -clean : - for d in $(GEEKOS_BUILD_DIR) do \ - (cd $$d && make clean); \ - done - - diff --git a/build/NOTES-QEMU.TXT b/build/NOTES-QEMU.TXT deleted file mode 100644 index fbd3d60..0000000 --- a/build/NOTES-QEMU.TXT +++ /dev/null @@ -1,39 +0,0 @@ - - -/usr/local/qemu/bin/qemu -m 512 -fda ./vmm.img c.img - --m 512 = 512 MB RAM - --M = machine type - --cpu = CPU type - --monitor `tty` gives access to a qemu console that lets you dump -memory, registers, disassemble, etc. It's not a complete debugger, -thoough - --S waits for a gdb connection. This seems to only work for kgdb and linux kernels - - --serial stdio redirects COM1 to stdio --serial file: writes COM1 to the given file - - - -MAKING an ISO image from a floppy image -mkisofs -pad -b -R -o - - -/usr/local/qemu/bin/qemu-system-x86_64 -serial file:serial.out -m 1024 -fda vmm.img -cdrom guest_no_timer.iso - - - -Creating a grub based bootable cd ISO image: - -mkidr iso -mkdir -p iso/boot/grub - -get "menu.lst" and "stage2_eltorito" from the grub files located in vmm-tools/others -copy menu.lst and stage2_eltorito into iso/boot/grub - -mkisofs -R -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o test.iso iso diff --git a/build/RunIso.sh b/build/RunIso.sh deleted file mode 100755 index 64fcf72..0000000 --- a/build/RunIso.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -/usr/local/qemu/bin/qemu-system-x86_64 -serial file:serial.out -m 1024 -cdrom test.iso diff --git a/build/RunPuppy.sh b/build/RunPuppy.sh deleted file mode 100755 index 315707e..0000000 --- a/build/RunPuppy.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -cp ../geekos/build/vmm.img ./ -/usr/local/qemu/bin/qemu-system-x86_64 -serial file:serial.out -m 1024 -fda vmm.img -cdrom /opt/vmm-tools/isos/puppy.iso diff --git a/build/RunXP.sh b/build/RunXP.sh deleted file mode 100755 index b78ed47..0000000 --- a/build/RunXP.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -/usr/local/qemu/bin/qemu-system-x86_64 -serial file:serial.out -m 1024 -fda vmm.img -cdrom /opt/vmm-tools/isos/winxp.iso diff --git a/build/iso/boot/grub/menu.lst b/build/iso/boot/grub/menu.lst deleted file mode 100644 index f3ed635..0000000 --- a/build/iso/boot/grub/menu.lst +++ /dev/null @@ -1,9 +0,0 @@ -default=0 -timeout=0 -title V3VEE -color light-green/brown blink-red/blue -foreground bbbbbb -background 000000 -root (cd) -kernel /vmm.img -initrd /puppy.iso diff --git a/build/iso/boot/grub/stage2_eltorito b/build/iso/boot/grub/stage2_eltorito deleted file mode 100644 index 9e1617c..0000000 Binary files a/build/iso/boot/grub/stage2_eltorito and /dev/null differ diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h index d2873c8..cb1bf4c 100644 --- a/palacios/include/palacios/vmm.h +++ b/palacios/include/palacios/vmm.h @@ -320,6 +320,7 @@ struct v3_interrupt { void Init_V3(struct v3_os_hooks * hooks, int num_cpus); +void Deinit_V3(); struct v3_vm_info * v3_create_vm(void * cfg, void * priv_data, char * name); diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c index a82fb42..0e1b905 100644 --- a/palacios/src/palacios/vmm.c +++ b/palacios/src/palacios/vmm.c @@ -63,7 +63,7 @@ static void init_cpu(void * arg) { } else #endif { - PrintError("CPU has no virtualizationExtensions\n"); + PrintError("CPU has no virtualization Extensions\n"); } } @@ -118,6 +118,12 @@ void Init_V3(struct v3_os_hooks * hooks, int num_cpus) { } +void Deinit_V3() { + + +} + + v3_cpu_arch_t v3_get_cpu_type(int cpu_id) { return v3_cpu_types[cpu_id]; }