This patch is needed to get the tree to build for QEMU based I/O emulation. - Run configure before doing make in tools/ioemu - We now have a single config file for VMX domains (earlier we had a bochsrc and xmexample.vmx) Signed-off-by: Xiaofeng Ling <xiaofeng.ling@intel.com> Signed-off-by: Arun Sharma <arun.sharma@intel.com> --- a/tools/Makefile 2005-05-19 11:42:49 -07:00 +++ b/tools/Makefile 2005-05-19 11:42:49 -07:00 @@ -19,6 +19,9 @@ all: check @set -e; for subdir in $(SUBDIRS); do \ + if [ -f $$subdir/configure ]; then \ + (cd $$subdir; ./configure --prefix=$(DESTDIR)/usr) \ + fi; \ $(MAKE) -C $$subdir $@; \ done diff -Nru a/tools/examples/xmexample.vmx b/tools/examples/xmexample.vmx --- a/tools/examples/xmexample.vmx 2005-05-19 11:42:49 -07:00 +++ b/tools/examples/xmexample.vmx 2005-05-19 11:42:49 -07:00 @@ -75,7 +75,7 @@ #nfs_root = ''/full/path/to/root/directory'' # Sets runlevel 4. -extra = "acpi=off 1" +extra = "acpi=off console=ttyS0 console=tty0 1" #---------------------------------------------------------------------------- # Set according to whether you want the domain restarted when it exits. @@ -89,5 +89,60 @@ # New stuff memmap = ''/etc/xen/mem-map.sxp'' -device_model = ''/usr/sbin/device-model'' -device_config = ''/etc/xen/bochsrc'' +device_model = ''/usr/bin/device-model'' +device_config = ''/etc/xen/xmexample.vmx'' + +#===========================================================================+# +# config item for qemu device model +# Note: no space between +#----------------------------------------------------------------------------- +# Qemu binary path +qemubin=''/usr/bin/qemu-dm'' + +#----------------------------------------------------------------------------- +# Disk image for +hda=''/var/images/min-el3-i386.img'' +#hdb+#hdc+#hdd+#cdrom+ +#----------------------------------------------------------------------------- +# boot on floppy (a), hard disk (c) or CD-ROM (d) +#boot=[a|c|d] +#----------------------------------------------------------------------------- +# write to temporary files instead of disk image files +#snapshot=1 + +#---------------------------------------------------------------------------- +# enable SDL library for graphics, default = 0 +sdl=0 + +#---------------------------------------------------------------------------- +# enable VNC library for graphics, default = 1 +vnc=1 + +#---------------------------------------------------------------------------- +# no graphics, use serial port +#nographic=0 + + +#----------------------------------------------------------------------------- +# enable audio support +#enable-audio=1 + + +#----------------------------------------------------------------------------- +# set the real time clock to local time [default=utc] +#localtime=''utc'' + + +#----------------------------------------------------------------------------- +# start in full screen +#full-screen=1 + +#----------------------------------------------------------------------------- +# set the mac address of the first interface +#macaddr= + _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel