ia64/xen-unstable

changeset 5022:fee112d8947a

bitkeeper revision 1.1472.1.1 (428d02affnTKrsebSylXhws68fWW9w)

[PATCH] qemu.patch

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>
author arun.sharma@intel.com[kaf24]
date Thu May 19 21:18:39 2005 +0000 (2005-05-19)
parents c03769252a5e
children 42b69c3dba08
files tools/Makefile tools/examples/xmexample.vmx
line diff
     1.1 --- a/tools/Makefile	Thu May 19 21:12:00 2005 +0000
     1.2 +++ b/tools/Makefile	Thu May 19 21:18:39 2005 +0000
     1.3 @@ -19,6 +19,9 @@ SUBDIRS += pygrub
     1.4  
     1.5  all: check
     1.6  	@set -e; for subdir in $(SUBDIRS); do \
     1.7 +                if [ -f $$subdir/configure ]; then \
     1.8 +                        (cd $$subdir; ./configure --prefix=$(DESTDIR)/usr) \
     1.9 +                fi; \
    1.10  		$(MAKE) -C $$subdir $@; \
    1.11  	done
    1.12  
     2.1 --- a/tools/examples/xmexample.vmx	Thu May 19 21:12:00 2005 +0000
     2.2 +++ b/tools/examples/xmexample.vmx	Thu May 19 21:18:39 2005 +0000
     2.3 @@ -75,7 +75,7 @@ root = "/dev/hda1 ro"
     2.4  #nfs_root   = '/full/path/to/root/directory'
     2.5  
     2.6  # Sets runlevel 4.
     2.7 -extra = "acpi=off 1"
     2.8 +extra = "acpi=off console=ttyS0 console=tty0 1"
     2.9  
    2.10  #----------------------------------------------------------------------------
    2.11  # Set according to whether you want the domain restarted when it exits.
    2.12 @@ -89,5 +89,60 @@ extra = "acpi=off 1"
    2.13  
    2.14  # New stuff
    2.15  memmap = '/etc/xen/mem-map.sxp'
    2.16 -device_model = '/usr/sbin/device-model'
    2.17 -device_config = '/etc/xen/bochsrc'
    2.18 +device_model = '/usr/bin/device-model'
    2.19 +device_config = '/etc/xen/xmexample.vmx'
    2.20 +
    2.21 +#============================================================================
    2.22 +#
    2.23 +# config item for qemu device model
    2.24 +# Note: no space between =
    2.25 +#-----------------------------------------------------------------------------
    2.26 +# Qemu binary path
    2.27 +qemubin='/usr/bin/qemu-dm'
    2.28 +
    2.29 +#-----------------------------------------------------------------------------
    2.30 +# Disk image for 
    2.31 +hda='/var/images/min-el3-i386.img'
    2.32 +#hdb=
    2.33 +#hdc=
    2.34 +#hdd=
    2.35 +#cdrom=
    2.36 +
    2.37 +#-----------------------------------------------------------------------------
    2.38 +# boot on floppy (a), hard disk (c) or CD-ROM (d) 
    2.39 +#boot=[a|c|d]
    2.40 +#-----------------------------------------------------------------------------
    2.41 +#  write to temporary files instead of disk image files
    2.42 +#snapshot=1
    2.43 +
    2.44 +#----------------------------------------------------------------------------
    2.45 +# enable SDL library for graphics, default = 0
    2.46 +sdl=0
    2.47 +
    2.48 +#----------------------------------------------------------------------------
    2.49 +# enable VNC library for graphics, default = 1
    2.50 +vnc=1
    2.51 +
    2.52 +#----------------------------------------------------------------------------
    2.53 +# no graphics, use serial port
    2.54 +#nographic=0
    2.55 +
    2.56 +
    2.57 +#-----------------------------------------------------------------------------
    2.58 +#   enable audio support
    2.59 +#enable-audio=1
    2.60 +
    2.61 +
    2.62 +#-----------------------------------------------------------------------------
    2.63 +#    set the real time clock to local time [default=utc]
    2.64 +#localtime='utc'
    2.65 +
    2.66 +
    2.67 +#-----------------------------------------------------------------------------
    2.68 +#    start in full screen
    2.69 +#full-screen=1   
    2.70 +
    2.71 +#-----------------------------------------------------------------------------
    2.72 +#   set the mac address of the first interface
    2.73 +#macaddr=  
    2.74 +