1.1 --- a/.hgignore	Tue Sep 13 10:42:15 2005 +0000
     1.2 +++ b/.hgignore	Tue Sep 13 10:49:04 2005 +0000
     1.3 @@ -60,8 +60,6 @@
     1.4  ^pristine-.*$
     1.5  ^ref-.*$
     1.6  ^tools/.*/build/lib.*/.*\.py$
     1.7 -^tools/Makefile\.smh$
     1.8 -^tools/balloon/balloon$
     1.9  ^tools/blktap/Makefile\.smh$
    1.10  ^tools/blktap/blkcow$
    1.11  ^tools/blktap/blkcowgnbd$
    1.12 @@ -85,8 +83,7 @@
    1.13  ^tools/blktap/ublkback/ublkback$
    1.14  ^tools/blktap/xen/.*$
    1.15  ^tools/check/\..*$
    1.16 -^tools/cmdline/.*$
    1.17 -^tools/cmdline/xen/.*$
    1.18 +^tools/examples/xmexample\.vmx$
    1.19  ^tools/console/xenconsoled$
    1.20  ^tools/console/xenconsole$
    1.21  ^tools/debugger/pdb/pdb$
    1.22 @@ -109,8 +106,6 @@
    1.23  ^tools/firmware/vmxassist/roms\.h$
    1.24  ^tools/firmware/vmxassist/vmxassist$
    1.25  ^tools/firmware/vmxassist/vmxloader$
    1.26 -^tools/gdb/gdb-6\.2\.1-linux-i386-xen/.*$
    1.27 -^tools/gdb/gdb-6\.2\.1/.*$
    1.28  ^tools/ioemu/config-host\..*$
    1.29  ^tools/ioemu/keysym_adapter_sdl\.h$
    1.30  ^tools/ioemu/keysym_adapter_vnc\.h$
    1.31 @@ -141,12 +136,9 @@
    1.32  ^tools/vnet/vnet-module/\..*\.cmd$
    1.33  ^tools/vnet/vnet-module/\.tmp_versions/.*$
    1.34  ^tools/vnet/vnet-module/vnet_module\.mod\..*$
    1.35 -^tools/vnetd/vnetd$
    1.36  ^tools/vtpm/vtpm*
    1.37  ^tools/vtpm/tpm_emulator-*
    1.38  ^tools/vtpm_manager/manager/vtpm_managerd
    1.39 -^tools/web-shutdown\.tap$
    1.40 -^tools/x2d2/minixend$
    1.41  ^tools/xcutils/xc_restore$
    1.42  ^tools/xcutils/xc_save$
    1.43  ^tools/xenstat/xentop/xentop$

     2.1 --- a/tools/examples/Makefile	Tue Sep 13 10:42:15 2005 +0000
     2.2 +++ b/tools/examples/Makefile	Tue Sep 13 10:49:04 2005 +0000
     2.3 @@ -25,7 +25,7 @@ XEN_SCRIPTS += block-phy
     2.4  XEN_SCRIPTS += block-file
     2.5  XEN_SCRIPTS += block-enbd
     2.6  
     2.7 -XEN_BOOT_DIR = /usr/lib/xen/boot
     2.8 +XEN_BOOT_DIR = /usr/$(LIBDIR)/xen/boot
     2.9  XEN_BOOT = mem-map.sxp
    2.10  
    2.11  XEN_HOTPLUG_DIR = /etc/hotplug
    2.12 @@ -37,12 +37,15 @@ build:
    2.13  install: all install-initd install-configs install-scripts install-boot \
    2.14  	 install-hotplug
    2.15  
    2.16 +xmexample.vmx: xmexample.vmx.in
    2.17 +	sed -e 's/@@LIBDIR@@/$(LIBDIR)/' < $< > $@
    2.18 +
    2.19  install-initd:
    2.20  	[ -d $(DESTDIR)/etc/init.d ] || $(INSTALL_DIR) $(DESTDIR)/etc/init.d
    2.21  	$(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)/etc/init.d
    2.22  	$(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)/etc/init.d
    2.23  
    2.24 -install-configs:
    2.25 +install-configs: $(XEN_CONFIGS)
    2.26  	[ -d $(DESTDIR)$(XEN_CONFIG_DIR) ] || \
    2.27  		$(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR)
    2.28  	[ -d $(DESTDIR)$(XEN_CONFIG_DIR)/auto ] || \
    2.29 @@ -77,3 +80,4 @@ install-hotplug:
    2.30  	done
    2.31  
    2.32  clean:
    2.33 +	$(RM) xmexample.vmx

     3.1 --- a/tools/examples/xmexample.vmx	Tue Sep 13 10:42:15 2005 +0000
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,96 +0,0 @@
     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 -#----------------------------------------------------------------------------
    3.13 -# Kernel image file.
    3.14 -kernel = "/usr/lib/xen/boot/vmxloader"
    3.15 -
    3.16 -# The domain build function. VMX domain uses 'vmx'.
    3.17 -builder='vmx'
    3.18 -
    3.19 -# Initial memory allocation (in megabytes) for the new domain.
    3.20 -memory = 128
    3.21 -
    3.22 -# A name for your domain. All domains must have different names.
    3.23 -name = "ExampleVMXDomain"
    3.24 -
    3.25 -# Which CPU to start domain on? 
    3.26 -#cpu = -1   # leave to Xen to pick
    3.27 -
    3.28 -# Optionally define mac and/or bridge for the network interfaces.
    3.29 -# Random MACs are assigned if not given.
    3.30 -#vif = [ 'mac=aa:00:00:00:00:11, bridge=xen-br0' ]
    3.31 -
    3.32 -#----------------------------------------------------------------------------
    3.33 -# Define the disk devices you want the domain to have access to, and
    3.34 -# what you want them accessible as.
    3.35 -# Each disk entry is of the form phy:UNAME,DEV,MODE
    3.36 -# where UNAME is the device, DEV is the device name the domain will see,
    3.37 -# and MODE is r for read-only, w for read-write.
    3.38 -
    3.39 -#disk = [ 'phy:hda1,hda1,r' ]
    3.40 -disk = [ 'file:/var/images/min-el3-i386.img,ioemu:hda,w' ]
    3.41 -
    3.42 -#----------------------------------------------------------------------------
    3.43 -# Set according to whether you want the domain restarted when it exits.
    3.44 -# The default is 'onreboot', which restarts the domain when it shuts down
    3.45 -# with exit code reboot.
    3.46 -# Other values are 'always', and 'never'.
    3.47 -
    3.48 -#restart = 'onreboot'
    3.49 -
    3.50 -#============================================================================
    3.51 -
    3.52 -
    3.53 -# New stuff
    3.54 -device_model = '/usr/lib/xen/bin/qemu-dm'
    3.55 -
    3.56 -# Advanced users only. Don't touch if you don't know what you're doing
    3.57 -memmap = '/usr/lib/xen/boot/mem-map.sxp'
    3.58 -
    3.59 -#-----------------------------------------------------------------------------
    3.60 -# Disk image for 
    3.61 -#cdrom=
    3.62 -
    3.63 -#-----------------------------------------------------------------------------
    3.64 -# boot on floppy (a), hard disk (c) or CD-ROM (d) 
    3.65 -#boot=[a|c|d]
    3.66 -#-----------------------------------------------------------------------------
    3.67 -#  write to temporary files instead of disk image files
    3.68 -#snapshot=1
    3.69 -
    3.70 -#----------------------------------------------------------------------------
    3.71 -# enable SDL library for graphics, default = 0
    3.72 -sdl=0
    3.73 -
    3.74 -#----------------------------------------------------------------------------
    3.75 -# enable VNC library for graphics, default = 1
    3.76 -vnc=1
    3.77 -
    3.78 -#----------------------------------------------------------------------------
    3.79 -# enable spawning vncviewer(only valid when vnc=1), default = 1
    3.80 -vncviewer=1
    3.81 -
    3.82 -#----------------------------------------------------------------------------
    3.83 -# no graphics, use serial port
    3.84 -#nographic=0
    3.85 -
    3.86 -
    3.87 -#-----------------------------------------------------------------------------
    3.88 -#   enable audio support
    3.89 -#enable-audio=1
    3.90 -
    3.91 -
    3.92 -#-----------------------------------------------------------------------------
    3.93 -#    set the real time clock to local time [default=0 i.e. set to utc]
    3.94 -#localtime=1
    3.95 -
    3.96 -
    3.97 -#-----------------------------------------------------------------------------
    3.98 -#    start in full screen
    3.99 -#full-screen=1   

     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/tools/examples/xmexample.vmx.in	Tue Sep 13 10:49:04 2005 +0000
     4.3 @@ -0,0 +1,96 @@
     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/ioemu/target-i386-dm/Makefile	Tue Sep 13 10:42:15 2005 +0000
     5.2 +++ b/tools/ioemu/target-i386-dm/Makefile	Tue Sep 13 10:49:04 2005 +0000
     5.3 @@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk
     5.4  include config.mak
     5.5  override TARGET_ARCH=i386
     5.6  
     5.7 -INSTALL_DIR := $(DESTDIR)/usr/lib/xen/bin
     5.8 +INSTALL_DIR := $(DESTDIR)/usr/$(LIBDIR)/xen/bin
     5.9  TARGET_PATH=$(SRC_PATH)/target-$(TARGET_ARCH)
    5.10  VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw:$(SRC_PATH)/audio
    5.11  DEFINES=-I. -I$(TARGET_PATH) -I$(SRC_PATH) -I$(XEN_ROOT)/xen/include/public