From: Peter Dinda Date: Thu, 28 Jan 2010 00:37:27 +0000 (-0600) Subject: Updated Kconfigs to a reasonable default, appropriate to default guestos image X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=5369ce5538c09af0966abc91bc7cf142e8b29b8a Updated Kconfigs to a reasonable default, appropriate to default guestos image Added support in Makefile to immediately build guestos image and build_vm on make Included simple guest iso and guest xml config The result of this is that Palacios, compiled out of box and linked with Kitten compiled OOB (+virtualization turned on) will correctly work and boot a simple guest iso. So now, it basically boils down to: - download palacios - download kitten - make config palacios to get defaults - make in palacios (libv3vee.a, guest_os.img, build_vm get created) - make config kitten to get defaults, turn on virtualization - make isoimage Now you have a ready to go kitten+palacios+linux guest --- diff --git a/Kconfig b/Kconfig index 79e6cc1..29926b0 100644 --- a/Kconfig +++ b/Kconfig @@ -40,7 +40,7 @@ config MAX_CPUS config SOCKET bool "Include Network Socket Support" - default y + default n help Enable networking support in Palacios @@ -49,7 +49,7 @@ config SOCKET config TELEMETRY bool "Enable VMM telemetry support" - default n + default y help Enable the telemetry framework in Palacios ----- @@ -76,10 +76,10 @@ config SYMBIOTIC_SWAP_TELEMETRY config PASSTHROUGH_VIDEO bool "Enable Passthrough Video" - default y + default n help Configures Palacios to map a guest's framebuffer directly - to the hardware framebuffer + to the hardware framebuffer (no longer needed) config INSTRUMENT_VMM bool "Enable VMM instrumentation" @@ -117,7 +117,7 @@ config DEBUG_VNET config BUILT_IN_STDLIB bool "Enable Built in versions of stdlib functions" - default n + default y help Not all host OSes provide link targets for stdlib functions Palacios provides internal implementations of these functions, that you can select from this list @@ -176,7 +176,7 @@ config BUILT_IN_STRCMP config BUILT_IN_STRCASECMP bool "strcasecmp()" - default n + default y depends on BUILT_IN_STDLIB help This enables Palacios' internal implementation of strcasecmp @@ -241,7 +241,7 @@ config BUILT_IN_STRSTR config BUILT_IN_ATOI bool "atoi()" - default n + default y depends on BUILT_IN_STDLIB help This enables Palacios' internal implementation of atoi diff --git a/Makefile b/Makefile index e21caf4..fe05444 100644 --- a/Makefile +++ b/Makefile @@ -578,6 +578,8 @@ define rule_palacios__ endef +#all +all: libv3vee.a build_vm guest_os.img # palacios image - including updated kernel symbols libv3vee.a: $(palacios) @@ -588,6 +590,15 @@ palacios: libv3vee.a palacios.asm: palacios $(OBJDUMP) --disassemble $< > $@ +# guest builder +build_vm : utils/guest_creator/*.c utils/guest_creator/*.h + (cd utils/guest_creator; make) + cp utils/guest_creator/build_vm . + +guest_os.img: guest_os.iso guest_os.xml build_vm + ./build_vm guest_os.xml -o guest_os.img + + # The actual objects are generated when descending, # make sure no implicit rule kicks in $(sort $(palacios)) : $(palacios-dirs) ; diff --git a/guest_os.iso b/guest_os.iso new file mode 100644 index 0000000..6664506 Binary files /dev/null and b/guest_os.iso differ diff --git a/guest_os.xml b/guest_os.xml new file mode 100644 index 0000000..9ce93eb --- /dev/null +++ b/guest_os.xml @@ -0,0 +1,184 @@ + + + + + + 1024 + + + enable + nested + 100 + + + + + + + + 0xa0000 + 0xc0000 + 0xa0000 + + + + + + + + + + + + + + + + + + + + + + + + + + apic + + + + + + pci0 + + + + pci0 + + + + pci0 + southbridge + + + + + + + + boot-cd + + V3Vee CDROM + CDROM + 0 + 0 + + + + + ide + + + + + 0x00 + 0x07 + PRINT_AND_IGNORE + + + 0xc0 + 0xc7 + PRINT_AND_IGNORE + + + + 0x81 + 0x87 + PRINT_AND_IGNORE + + + + 0x88 + 0x8f + PRINT_AND_IGNORE + + + + 0x08 + 0x0f + PRINT_AND_IGNORE + + + + 0xd0 + 0xde + PRINT_AND_IGNORE + + + + 0x3f8 + 0x3ff + PRINT_AND_IGNORE + + + + 0x2f8 + 0x2ff + PRINT_AND_IGNORE + + + + 0x3e8 + 0x3ef + PRINT_AND_IGNORE + + + + 0x2e8 + 0x2ef + PRINT_AND_IGNORE + + + + 0x378 + 0x37f + PRINT_AND_IGNORE + + + + 0x3b0 + 0x3bb + PRINT_AND_PASSTHROUGH + + + + 0x3c0 + 0x3df + PRINT_AND_PASSTHROUGH + + + + 0x274 + 0x277 + PRINT_AND_IGNORE + + + + 0x279 + 0x279 + PRINT_AND_IGNORE + + + + 0xa79 + 0xa79 + PRINT_AND_IGNORE + + + + + + + + diff --git a/manual/manual.tex b/manual/manual.tex index 91591ae..7737601 100755 --- a/manual/manual.tex +++ b/manual/manual.tex @@ -30,22 +30,29 @@ \includegraphics[height=1.5in]{v3vee.pdf} \includegraphics[height=1.5in]{logo6.png} \\ \vspace{0.5in} -Palacios Internal Developer Manual +Palacios Internal and External Developer Manual } \maketitle -This manual is written for internal Palacios developers. It contains -information on how to obtain the Palacios code base, how to go about -the development process, and how to commit those changes to the -mainline source tree. This assumes that the reader has read {\em An -Introduction to the Palacios Virtual Machine Monitor -- Release 1.0} -and also has a slight working knowledge of {\em git}. You will also -want to read the document {\em Building a bootable guest image for -Palacios and Kitten} in order to understand how to build an extremely -lightweight guest environment, suitable for testing. +This manual is written for internal and external Palacios +developers. It contains information on how to obtain the Palacios code +base, how to go about the development process, and how to commit those +changes to the mainline source tree. This assumes that the reader has +read the technical report {\em An Introduction to the Palacios Virtual +Machine Monitor -- Release 1.0}\footnote{It's important to note that +there have been substantial changes in the build process from 1.0 to +1.2 and beyond. Hence, the technical report is primarily useful as an +explanation of the theory of operation of Palacios. This document is +the one to consult for the build process.} and also has a slight +working knowledge of {\em git}. You will also want to read the +document {\em Building a bootable guest image for Palacios and Kitten} +in order to understand how to build an extremely lightweight guest +environment, suitable for testing. If you want to configure network +booting for testing on real hardware, you'll want to read the document +{\em Booting Palacios/Kitten Over the Network Using PXE}. Please note that Palacios and Kitten are under rapid development, hence this manual may very well be out of date! @@ -114,7 +121,6 @@ On the machine {\em newbehemoth.cs.northwestern.edu} you will want to use the following command instead. The {\em newskysaw} home directories are NFS-mounted on /home-remote. - \begin{verbatim} git clone /home-remote/palacios/palacios \end{verbatim} @@ -132,9 +138,14 @@ public repository tracks the release and main development branch (e.g., devel) of the internal repository with a 30 minute delay. The access information is available on the web site (http://v3vee.org). The web site also includes a publically accessible gitweb interface to -allow browsing of the public repository. +allow browsing of the public repository. The clone command looks like + +\begin{verbatim} +git clone http://v3vee.org/palacios/palacios.web/palacios.git +\end{verbatim} -This creates a local copy of the repository at {\em ./palacios/}. +No matter how you clone, the clone command creates a local copy of the +repository at {\em ./palacios/}. Note that both {\em newskysaw} and {\em newbehemoth} have all the tools installed that are needed to build and test Palacios and Kitten. @@ -171,13 +182,14 @@ Kitten is available from Sandia National Labs, and is the main host OS we are targeting with Palacios. Loosely speaking, core Palacios developers are internal Kitten developers, and internal Palacios developers are external Kitten developers. The public repository for -Kitten is at {\em http://code.google.com/p/kitten}. To simplify things, -we are maintaining a local mirror copy in {\em /home/palacios/kitten} -that tracks the public repository. +Kitten is at {\em http://code.google.com/p/kitten}. To simplify +things, we are maintaining a local mirror copy on newskysaw in {\em +/home/palacios/kitten} that tracks the public repository. -Kitten uses Mercurial for their source management, so you will have to -make sure the local mercurial version is configured correctly. -Specifically you should add the following Python path to your shell environment. +Kitten uses Mercurial for source management, so you will have to make +sure the local Mercurial version is configured correctly. +Specifically you will probably need to add something like the +following Python path to your shell environment. \begin{verbatim} export PYTHONPATH=/usr/local/lib64/python2.4/site-packages/ @@ -196,7 +208,10 @@ On other machines, run \begin{verbatim} hg clone ssh://you@newskysaw.cs.northwestern.edu//home/palacios/kitten \end{verbatim} - +External developers, run +\begin{verbatim} +hg clone https://kitten.googlecode.com/hg/ kitten +\end{verbatim} Both the Kitten and Palacios clone commands should be run from the same directory. This means that both repositories should be located at diff --git a/palacios/src/devices/Kconfig b/palacios/src/devices/Kconfig index 3017cd4..8fc349c 100644 --- a/palacios/src/devices/Kconfig +++ b/palacios/src/devices/Kconfig @@ -93,7 +93,7 @@ config DEBUG_KEYBOARD config LINUX_VIRTIO_BALLOON bool "Linux Virtio Balloon Device" - default y + default n depends on PCI help Includes the Linux virtio balloon device @@ -108,7 +108,7 @@ config DEBUG_VIRTIO_BALLOON config LINUX_VIRTIO_BLOCK bool "Linux Virtio Block Device" - default y + default n depends on PCI help Includes the Linux virtio block device @@ -122,7 +122,7 @@ config DEBUG_VIRTIO_BLOCK config LINUX_VIRTIO_SYM bool "Linux Virtio Symbiotic Device" - default y + default n depends on PCI && SYMBIOTIC help Includes the Linux virtio symbiotic device @@ -252,21 +252,21 @@ config TMPDISK config SYM_SWAP bool "Symbiotic Swap disk" - default y + default n depends on SYMBIOTIC_SWAP && (LINUX_VIRTIO_BLOCK || IDE) help Includes the symbiotic ram based swap disk config SYM_SWAP2 bool "Symbiotic Swap disk v2" - default y + default n depends on SYMBIOTIC_SWAP && (LINUX_VIRTIO_BLOCK || IDE) help Includes the symbiotic ram based swap disk config DISK_MODEL bool "Disk Performance Model" - default y + default n depends on LINUX_VIRTIO_BLOCK || IDE help Includes Performance model filter for disk operations