ia64/xen-unstable

changeset 6824:0a7194ec36a4

mem-map.sxp and vmxloader are unaffected by a 64-bit build,
and belong in /usr/lib always (never /usr/lib64). qemu-dm
continues to live under /usr/lib64 on 64-bit systems.
Modify the vmx config script to auto-detect correct path
to qemu-dm, rather than staically configuring at compile
time.

Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Wed Sep 14 09:14:32 2005 +0000 (2005-09-14)
parents c63529f3367d
children 1936ccaccf5e
files .hgignore tools/examples/Makefile tools/examples/xmexample.vmx tools/firmware/Makefile
line diff
     1.1 --- a/.hgignore	Wed Sep 14 08:41:49 2005 +0000
     1.2 +++ b/.hgignore	Wed Sep 14 09:14:32 2005 +0000
     1.3 @@ -84,7 +84,6 @@
     1.4  ^tools/blktap/ublkback/ublkback$
     1.5  ^tools/blktap/xen/.*$
     1.6  ^tools/check/\..*$
     1.7 -^tools/examples/xmexample\.vmx$
     1.8  ^tools/console/xenconsoled$
     1.9  ^tools/console/xenconsole$
    1.10  ^tools/debugger/pdb/pdb$
     2.1 --- a/tools/examples/Makefile	Wed Sep 14 08:41:49 2005 +0000
     2.2 +++ b/tools/examples/Makefile	Wed Sep 14 09:14:32 2005 +0000
     2.3 @@ -25,21 +25,20 @@ XEN_SCRIPTS += block-phy
     2.4  XEN_SCRIPTS += block-file
     2.5  XEN_SCRIPTS += block-enbd
     2.6  
     2.7 -XEN_BOOT_DIR = /usr/$(LIBDIR)/xen/boot
     2.8 +# no 64-bit specifics in mem-map.sxp
     2.9 +# so place in /usr/lib, not /usr/lib64
    2.10 +XEN_BOOT_DIR = /usr/lib/xen/boot
    2.11  XEN_BOOT = mem-map.sxp
    2.12  
    2.13  XEN_HOTPLUG_DIR = /etc/hotplug
    2.14  XEN_HOTPLUG_SCRIPTS = xen-backend.agent
    2.15  
    2.16 -all: 
    2.17 +all:
    2.18  build:
    2.19  
    2.20  install: all install-initd install-configs install-scripts install-boot \
    2.21  	 install-hotplug
    2.22  
    2.23 -xmexample.vmx: xmexample.vmx.in
    2.24 -	sed -e 's/@@LIBDIR@@/$(LIBDIR)/' < $< > $@
    2.25 -
    2.26  install-initd:
    2.27  	[ -d $(DESTDIR)/etc/init.d ] || $(INSTALL_DIR) $(DESTDIR)/etc/init.d
    2.28  	$(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)/etc/init.d
    2.29 @@ -80,4 +79,3 @@ install-hotplug:
    2.30  	done
    2.31  
    2.32  clean:
    2.33 -	$(RM) xmexample.vmx
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/tools/examples/xmexample.vmx	Wed Sep 14 09:14:32 2005 +0000
     3.3 @@ -0,0 +1,102 @@
     3.4 +#  -*- mode: python; -*-
     3.5 +#============================================================================
     3.6 +# Python configuration setup for 'xm create'.
     3.7 +# This script sets the parameters used when a domain is created using 'xm create'.
     3.8 +# You use a separate script for each domain you want to create, or 
     3.9 +# you can set the parameters for the domain on the xm command line.
    3.10 +#============================================================================
    3.11 +
    3.12 +import os, re
    3.13 +arch = os.uname()[4]
    3.14 +if re.search('64', arch):
    3.15 +    arch_libdir = 'lib64'
    3.16 +else:
    3.17 +    arch_libdir = 'lib'
    3.18 +
    3.19 +#----------------------------------------------------------------------------
    3.20 +# Kernel image file.
    3.21 +kernel = "/usr/lib/xen/boot/vmxloader"
    3.22 +
    3.23 +# The domain build function. VMX domain uses 'vmx'.
    3.24 +builder='vmx'
    3.25 +
    3.26 +# Initial memory allocation (in megabytes) for the new domain.
    3.27 +memory = 128
    3.28 +
    3.29 +# A name for your domain. All domains must have different names.
    3.30 +name = "ExampleVMXDomain"
    3.31 +
    3.32 +# Which CPU to start domain on? 
    3.33 +#cpu = -1   # leave to Xen to pick
    3.34 +
    3.35 +# Optionally define mac and/or bridge for the network interfaces.
    3.36 +# Random MACs are assigned if not given.
    3.37 +#vif = [ 'mac=aa:00:00:00:00:11, bridge=xen-br0' ]
    3.38 +
    3.39 +#----------------------------------------------------------------------------
    3.40 +# Define the disk devices you want the domain to have access to, and
    3.41 +# what you want them accessible as.
    3.42 +# Each disk entry is of the form phy:UNAME,DEV,MODE
    3.43 +# where UNAME is the device, DEV is the device name the domain will see,
    3.44 +# and MODE is r for read-only, w for read-write.
    3.45 +
    3.46 +#disk = [ 'phy:hda1,hda1,r' ]
    3.47 +disk = [ 'file:/var/images/min-el3-i386.img,ioemu:hda,w' ]
    3.48 +
    3.49 +#----------------------------------------------------------------------------
    3.50 +# Set according to whether you want the domain restarted when it exits.
    3.51 +# The default is 'onreboot', which restarts the domain when it shuts down
    3.52 +# with exit code reboot.
    3.53 +# Other values are 'always', and 'never'.
    3.54 +
    3.55 +#restart = 'onreboot'
    3.56 +
    3.57 +#============================================================================
    3.58 +
    3.59 +# New stuff
    3.60 +device_model = '/usr/' + arch_libdir + '/xen/bin/qemu-dm'
    3.61 +
    3.62 +# Advanced users only. Don't touch if you don't know what you're doing
    3.63 +memmap = '/usr/lib/xen/boot/mem-map.sxp'
    3.64 +
    3.65 +#-----------------------------------------------------------------------------
    3.66 +# Disk image for 
    3.67 +#cdrom=
    3.68 +
    3.69 +#-----------------------------------------------------------------------------
    3.70 +# boot on floppy (a), hard disk (c) or CD-ROM (d) 
    3.71 +#boot=[a|c|d]
    3.72 +#-----------------------------------------------------------------------------
    3.73 +#  write to temporary files instead of disk image files
    3.74 +#snapshot=1
    3.75 +
    3.76 +#----------------------------------------------------------------------------
    3.77 +# enable SDL library for graphics, default = 0
    3.78 +sdl=0
    3.79 +
    3.80 +#----------------------------------------------------------------------------
    3.81 +# enable VNC library for graphics, default = 1
    3.82 +vnc=1
    3.83 +
    3.84 +#----------------------------------------------------------------------------
    3.85 +# enable spawning vncviewer(only valid when vnc=1), default = 1
    3.86 +vncviewer=1
    3.87 +
    3.88 +#----------------------------------------------------------------------------
    3.89 +# no graphics, use serial port
    3.90 +#nographic=0
    3.91 +
    3.92 +
    3.93 +#-----------------------------------------------------------------------------
    3.94 +#   enable audio support
    3.95 +#enable-audio=1
    3.96 +
    3.97 +
    3.98 +#-----------------------------------------------------------------------------
    3.99 +#    set the real time clock to local time [default=0 i.e. set to utc]
   3.100 +#localtime=1
   3.101 +
   3.102 +
   3.103 +#-----------------------------------------------------------------------------
   3.104 +#    start in full screen
   3.105 +#full-screen=1   
     4.1 --- a/tools/examples/xmexample.vmx.in	Wed Sep 14 08:41:49 2005 +0000
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,96 +0,0 @@
     4.4 -#  -*- mode: python; -*-
     4.5 -#============================================================================
     4.6 -# Python configuration setup for 'xm create'.
     4.7 -# This script sets the parameters used when a domain is created using 'xm create'.
     4.8 -# You use a separate script for each domain you want to create, or 
     4.9 -# you can set the parameters for the domain on the xm command line.
    4.10 -#============================================================================
    4.11 -
    4.12 -#----------------------------------------------------------------------------
    4.13 -# Kernel image file.
    4.14 -kernel = "/usr/@@LIBDIR@@/xen/boot/vmxloader"
    4.15 -
    4.16 -# The domain build function. VMX domain uses 'vmx'.
    4.17 -builder='vmx'
    4.18 -
    4.19 -# Initial memory allocation (in megabytes) for the new domain.
    4.20 -memory = 128
    4.21 -
    4.22 -# A name for your domain. All domains must have different names.
    4.23 -name = "ExampleVMXDomain"
    4.24 -
    4.25 -# Which CPU to start domain on? 
    4.26 -#cpu = -1   # leave to Xen to pick
    4.27 -
    4.28 -# Optionally define mac and/or bridge for the network interfaces.
    4.29 -# Random MACs are assigned if not given.
    4.30 -#vif = [ 'mac=aa:00:00:00:00:11, bridge=xen-br0' ]
    4.31 -
    4.32 -#----------------------------------------------------------------------------
    4.33 -# Define the disk devices you want the domain to have access to, and
    4.34 -# what you want them accessible as.
    4.35 -# Each disk entry is of the form phy:UNAME,DEV,MODE
    4.36 -# where UNAME is the device, DEV is the device name the domain will see,
    4.37 -# and MODE is r for read-only, w for read-write.
    4.38 -
    4.39 -#disk = [ 'phy:hda1,hda1,r' ]
    4.40 -disk = [ 'file:/var/images/min-el3-i386.img,ioemu:hda,w' ]
    4.41 -
    4.42 -#----------------------------------------------------------------------------
    4.43 -# Set according to whether you want the domain restarted when it exits.
    4.44 -# The default is 'onreboot', which restarts the domain when it shuts down
    4.45 -# with exit code reboot.
    4.46 -# Other values are 'always', and 'never'.
    4.47 -
    4.48 -#restart = 'onreboot'
    4.49 -
    4.50 -#============================================================================
    4.51 -
    4.52 -
    4.53 -# New stuff
    4.54 -device_model = '/usr/@@LIBDIR@@/xen/bin/qemu-dm'
    4.55 -
    4.56 -# Advanced users only. Don't touch if you don't know what you're doing
    4.57 -memmap = '/usr/@@LIBDIR@@/xen/boot/mem-map.sxp'
    4.58 -
    4.59 -#-----------------------------------------------------------------------------
    4.60 -# Disk image for 
    4.61 -#cdrom=
    4.62 -
    4.63 -#-----------------------------------------------------------------------------
    4.64 -# boot on floppy (a), hard disk (c) or CD-ROM (d) 
    4.65 -#boot=[a|c|d]
    4.66 -#-----------------------------------------------------------------------------
    4.67 -#  write to temporary files instead of disk image files
    4.68 -#snapshot=1
    4.69 -
    4.70 -#----------------------------------------------------------------------------
    4.71 -# enable SDL library for graphics, default = 0
    4.72 -sdl=0
    4.73 -
    4.74 -#----------------------------------------------------------------------------
    4.75 -# enable VNC library for graphics, default = 1
    4.76 -vnc=1
    4.77 -
    4.78 -#----------------------------------------------------------------------------
    4.79 -# enable spawning vncviewer(only valid when vnc=1), default = 1
    4.80 -vncviewer=1
    4.81 -
    4.82 -#----------------------------------------------------------------------------
    4.83 -# no graphics, use serial port
    4.84 -#nographic=0
    4.85 -
    4.86 -
    4.87 -#-----------------------------------------------------------------------------
    4.88 -#   enable audio support
    4.89 -#enable-audio=1
    4.90 -
    4.91 -
    4.92 -#-----------------------------------------------------------------------------
    4.93 -#    set the real time clock to local time [default=0 i.e. set to utc]
    4.94 -#localtime=1
    4.95 -
    4.96 -
    4.97 -#-----------------------------------------------------------------------------
    4.98 -#    start in full screen
    4.99 -#full-screen=1   
     5.1 --- a/tools/firmware/Makefile	Wed Sep 14 08:41:49 2005 +0000
     5.2 +++ b/tools/firmware/Makefile	Wed Sep 14 09:14:32 2005 +0000
     5.3 @@ -1,6 +1,8 @@
     5.4  XEN_ROOT = ../..
     5.5  include $(XEN_ROOT)/tools/Rules.mk
     5.6  
     5.7 +# vmxloader is a 32-bit protected mode binary.
     5.8 +# It belongs in /usr/lib, not /usr/lib64.
     5.9  TARGET      := vmxassist/vmxloader
    5.10  INSTALL_DIR := $(DESTDIR)/usr/lib/xen/boot
    5.11