1.1 --- a/tools/examples/xeninfo.pl	Wed Jun 24 11:16:42 2009 +0100
     1.2 +++ b/tools/examples/xeninfo.pl	Wed Jun 24 11:17:11 2009 +0100
     1.3 @@ -210,7 +210,7 @@ sub get_vm_type
     1.4  		# which is something like:
     1.5  		# 'PV_kernel': '/boot/vmlinuz-2.6.18-xen',
     1.6  		# or
     1.7 -		# 'PV_kernel': '/usr/lib/xen/boot/hvmloader',
     1.8 +		# 'PV_kernel': 'hvmloader',
     1.9  		if ("$vm_pv_kernel_results->{'Value'}" =~ m/hvm/i)
    1.10  		{
    1.11  			$host_info{$host_name}{'vms'}{$vm_name_label}{'type'} = "HVM";

     2.1 --- a/tools/examples/xmexample.hvm	Wed Jun 24 11:16:42 2009 +0100
     2.2 +++ b/tools/examples/xmexample.hvm	Wed Jun 24 11:17:11 2009 +0100
     2.3 @@ -6,16 +6,9 @@
     2.4  # you can set the parameters for the domain on the xm command line.
     2.5  #============================================================================
     2.6  
     2.7 -import os, re
     2.8 -
     2.9 -arch_libdir = 'lib'
    2.10 -arch = os.uname()[4]
    2.11 -if os.uname()[0] == 'Linux' and re.search('64', arch):
    2.12 -    arch_libdir = 'lib64'
    2.13 -
    2.14  #----------------------------------------------------------------------------
    2.15  # Kernel image file.
    2.16 -kernel = "/usr/lib/xen/boot/hvmloader"
    2.17 +kernel = "hvmloader"
    2.18  
    2.19  # The domain build function. HVM domain uses 'hvm'.
    2.20  builder='hvm'
    2.21 @@ -128,7 +121,7 @@ disk = [ 'file:/var/images/min-el3-i386.
    2.22  #============================================================================
    2.23  
    2.24  # Device Model to be used
    2.25 -device_model = '/usr/' + arch_libdir + '/xen/bin/qemu-dm'
    2.26 +device_model = 'qemu-dm'
    2.27  
    2.28  #-----------------------------------------------------------------------------
    2.29  # boot on floppy (a), hard disk (c), Network (n) or CD-ROM (d) 
    2.30 @@ -154,7 +147,8 @@ vnc=1
    2.31  
    2.32  #----------------------------------------------------------------------------
    2.33  # address that should be listened on for the VNC server if vnc is set.
    2.34 -# default is to use 'vnc-listen' setting from /etc/xen/xend-config.sxp
    2.35 +# default is to use 'vnc-listen' setting from
    2.36 +# auxbin.xen_configdir() + /xend-config.sxp
    2.37  #vnclisten="127.0.0.1"
    2.38  
    2.39  #----------------------------------------------------------------------------

     3.1 --- a/tools/examples/xmexample.hvm-stubdom	Wed Jun 24 11:16:42 2009 +0100
     3.2 +++ b/tools/examples/xmexample.hvm-stubdom	Wed Jun 24 11:17:11 2009 +0100
     3.3 @@ -11,7 +11,7 @@
     3.4  
     3.5  #----------------------------------------------------------------------------
     3.6  # Kernel image file.
     3.7 -kernel = "/usr/lib/xen/boot/hvmloader"
     3.8 +kernel = "hvmloader"
     3.9  
    3.10  # The domain build function. HVM domain uses 'hvm'.
    3.11  builder='hvm'
    3.12 @@ -118,7 +118,7 @@ disk = [ 'file:/var/images/min-el3-i386.
    3.13  #
    3.14  # STUBDOM: this is a script that creates the stub domain running the device
    3.15  # model
    3.16 -device_model = '/usr/lib/xen/bin/stubdom-dm'
    3.17 +device_model = 'stubdom-dm'
    3.18  
    3.19  #-----------------------------------------------------------------------------
    3.20  # boot on floppy (a), hard disk (c), Network (n) or CD-ROM (d) 
    3.21 @@ -146,7 +146,8 @@ vnc=1
    3.22  
    3.23  #----------------------------------------------------------------------------
    3.24  # address that should be listened on for the VNC server if vnc is set.
    3.25 -# default is to use 'vnc-listen' setting from /etc/xen/xend-config.sxp
    3.26 +# default is to use 'vnc-listen' setting from
    3.27 +# auxbin.xen_configdir() + /xend-config.sxp
    3.28  #vnclisten="127.0.0.1"
    3.29  
    3.30  #----------------------------------------------------------------------------

     4.1 --- a/tools/examples/xmexample.pv-grub	Wed Jun 24 11:16:42 2009 +0100
     4.2 +++ b/tools/examples/xmexample.pv-grub	Wed Jun 24 11:17:11 2009 +0100
     4.3 @@ -8,7 +8,7 @@
     4.4  
     4.5  #----------------------------------------------------------------------------
     4.6  # PV GRUB image file.
     4.7 -kernel = "/usr/lib/xen/boot/pv-grub.gz"
     4.8 +kernel = "pv-grub.gz"
     4.9  
    4.10  # Optional provided menu.lst.
    4.11  #ramdisk = "/boot/guests/menu.lst"

     5.1 --- a/tools/examples/xmexample.vti	Wed Jun 24 11:16:42 2009 +0100
     5.2 +++ b/tools/examples/xmexample.vti	Wed Jun 24 11:17:11 2009 +0100
     5.3 @@ -12,7 +12,7 @@ arch = os.uname()[4]
     5.4  
     5.5  #----------------------------------------------------------------------------
     5.6  # Kernel image file.
     5.7 -kernel = "/usr/lib/xen/boot/guest_firmware.bin"
     5.8 +kernel = "guest_firmware.bin"
     5.9  
    5.10  # The domain build function. VTI domain uses 'hvm'.
    5.11  builder='hvm'

     6.1 --- a/tools/python/xen/xm/tests/test_create.py	Wed Jun 24 11:16:42 2009 +0100
     6.2 +++ b/tools/python/xen/xm/tests/test_create.py	Wed Jun 24 11:17:11 2009 +0100
     6.3 @@ -153,14 +153,14 @@ cpu_weight = 0.75
     6.4          try:
     6.5              os.write(fd,
     6.6                       '''
     6.7 -kernel = "/usr/lib/xen/boot/hvmloader"
     6.8 +kernel = "hvmloader"
     6.9  builder='hvm'
    6.10  memory = 128
    6.11  name = "ExampleHVMDomain"
    6.12  vcpus=1
    6.13  vif = [ 'type=ioemu, bridge=xenbr0' ]
    6.14  disk = [ 'file:/var/images/min-el3-i386.img,ioemu:hda,w' ]
    6.15 -device_model = '/usr/lib/xen/bin/qemu-dm'
    6.16 +device_model = 'qemu-dm'
    6.17  sdl=0
    6.18  vnc=1
    6.19  vncviewer=1
    6.20 @@ -170,7 +170,7 @@ ne2000=0
    6.21              os.close(fd)
    6.22  
    6.23          self.t('-f %s display=fakedisplay' % fname,
    6.24 -               { 'kernel'      : '/usr/lib/xen/boot/hvmloader',
    6.25 +               { 'kernel'      : 'hvmloader',
    6.26                   'builder'     : 'hvm',
    6.27                   'memory'      : 128,
    6.28                   'name'        : 'ExampleHVMDomain',
    6.29 @@ -179,7 +179,7 @@ ne2000=0
    6.30                   'vif'         : ['type=ioemu, bridge=xenbr0'],
    6.31                   'disk'        : [['file:/var/images/min-el3-i386.img',
    6.32                                     'ioemu:hda', 'w', None]],
    6.33 -                 'device_model': '/usr/lib/xen/bin/qemu-dm',
    6.34 +                 'device_model': 'qemu-dm',
    6.35  
    6.36                   'extra'       : ('VNC_VIEWER=%s:%d ' %
    6.37                                    (xen.xm.create.get_host_addr(),

     7.1 --- a/tools/xm-test/lib/XmTestLib/arch.py	Wed Jun 24 11:16:42 2009 +0100
     7.2 +++ b/tools/xm-test/lib/XmTestLib/arch.py	Wed Jun 24 11:17:11 2009 +0100
     7.3 @@ -77,7 +77,7 @@ ia_HVMDefaults =      {"memory"       : 
     7.4                         "acpi"         : 0,
     7.5                         "disk"         : ["file:%s/disk.img,ioemu:%s,w!" %
     7.6                                           (getRdPath(), BLOCK_ROOT_DEV)],
     7.7 -                       "kernel"       : "/usr/lib/xen/boot/hvmloader",
     7.8 +                       "kernel"       : "hvmloader",
     7.9                         "builder"      : "hvm",
    7.10                         "sdl"          : 0,
    7.11                         "vnc"          : 0,