Skip to contentSkip to conversation

tools: remove hard coded paths in example config files

PATCH New Christoph Egger 1 participant 1 message Jun 24, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tools: remove hard coded paths in example config files

Hi!

Attached patch removes hard coded pathes from example guest config files.

Signature · 6 lines
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Karl-Hammerschmidt-Str. 34, 85609 Dornach b. Muenchen
Geschaeftsfuehrer: Thomas M. McCoy, Giuliano Meroni
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632
tools/examples/xeninfo.pl +1 -1
diff -r 442fb5f1e0a2 tools/examples/xeninfo.pl
@@ -210,7 +210,7 @@ sub get_vm_type
 		# which is something like:
 		# 'PV_kernel': '/boot/vmlinuz-2.6.18-xen',
 		# or
-		# 'PV_kernel': '/usr/lib/xen/boot/hvmloader',
+		# 'PV_kernel': 'hvmloader',
 		if ("$vm_pv_kernel_results->{'Value'}" =~ m/hvm/i)
 		{
 			$host_info{$host_name}{'vms'}{$vm_name_label}{'type'} = "HVM";
tools/examples/xmexample.hvm +4 -10
diff -r 442fb5f1e0a2 tools/examples/xmexample.hvm
@@ -6,16 +6,9 @@
 # you can set the parameters for the domain on the xm command line.
 #============================================================================
 
-import os, re
-
-arch_libdir = 'lib'
-arch = os.uname()[4]
-if os.uname()[0] == 'Linux' and re.search('64', arch):
-    arch_libdir = 'lib64'
-
 #----------------------------------------------------------------------------
 # Kernel image file.
-kernel = "/usr/lib/xen/boot/hvmloader"
+kernel = "hvmloader"
 
 # The domain build function. HVM domain uses 'hvm'.
 builder='hvm'
@@ -128,7 +121,7 @@ disk = [ 'file:/var/images/min-el3-i386.
 #============================================================================
 
 # Device Model to be used
-device_model = '/usr/' + arch_libdir + '/xen/bin/qemu-dm'
+device_model = 'qemu-dm'
 
 #-----------------------------------------------------------------------------
 # boot on floppy (a), hard disk (c), Network (n) or CD-ROM (d) 
@@ -154,7 +147,8 @@ vnc=1
 
 #----------------------------------------------------------------------------
 # address that should be listened on for the VNC server if vnc is set.
-# default is to use 'vnc-listen' setting from /etc/xen/xend-config.sxp
+# default is to use 'vnc-listen' setting from
+# auxbin.xen_configdir() + /xend-config.sxp
 #vnclisten="127.0.0.1"
 
 #----------------------------------------------------------------------------
tools/examples/xmexample.hvm-stubdom +4 -3
diff -r 442fb5f1e0a2 tools/examples/xmexample.hvm-stubdom
@@ -11,7 +11,7 @@
 
 #----------------------------------------------------------------------------
 # Kernel image file.
-kernel = "/usr/lib/xen/boot/hvmloader"
+kernel = "hvmloader"
 
 # The domain build function. HVM domain uses 'hvm'.
 builder='hvm'
@@ -118,7 +118,7 @@ disk = [ 'file:/var/images/min-el3-i386.
 #
 # STUBDOM: this is a script that creates the stub domain running the device
 # model
-device_model = '/usr/lib/xen/bin/stubdom-dm'
+device_model = 'stubdom-dm'
 
 #-----------------------------------------------------------------------------
 # boot on floppy (a), hard disk (c), Network (n) or CD-ROM (d) 
@@ -146,7 +146,8 @@ vnc=1
 
 #----------------------------------------------------------------------------
 # address that should be listened on for the VNC server if vnc is set.
-# default is to use 'vnc-listen' setting from /etc/xen/xend-config.sxp
+# default is to use 'vnc-listen' setting from
+# auxbin.xen_configdir() + /xend-config.sxp
 #vnclisten="127.0.0.1"
 
 #----------------------------------------------------------------------------
tools/examples/xmexample.pv-grub +1 -1
diff -r 442fb5f1e0a2 tools/examples/xmexample.pv-grub
@@ -8,7 +8,7 @@
 
 #----------------------------------------------------------------------------
 # PV GRUB image file.
-kernel = "/usr/lib/xen/boot/pv-grub.gz"
+kernel = "pv-grub.gz"
 
 # Optional provided menu.lst.
 #ramdisk = "/boot/guests/menu.lst"
tools/examples/xmexample.vti +1 -1
diff -r 442fb5f1e0a2 tools/examples/xmexample.vti
@@ -12,7 +12,7 @@ arch = os.uname()[4]
 
 #----------------------------------------------------------------------------
 # Kernel image file.
-kernel = "/usr/lib/xen/boot/guest_firmware.bin"
+kernel = "guest_firmware.bin"
 
 # The domain build function. VTI domain uses 'hvm'.
 builder='hvm'
tools/python/xen/xm/tests/test_create.py +4 -4
diff -r 442fb5f1e0a2 tools/python/xen/xm/tests/test_create.py
@@ -153,14 +153,14 @@ cpu_weight = 0.75
         try:
             os.write(fd,
                      '''
-kernel = "/usr/lib/xen/boot/hvmloader"
+kernel = "hvmloader"
 builder='hvm'
 memory = 128
 name = "ExampleHVMDomain"
 vcpus=1
 vif = [ 'type=ioemu, bridge=xenbr0' ]
 disk = [ 'file:/var/images/min-el3-i386.img,ioemu:hda,w' ]
-device_model = '/usr/lib/xen/bin/qemu-dm'
+device_model = 'qemu-dm'
 sdl=0
 vnc=1
 vncviewer=1
@@ -170,7 +170,7 @@ ne2000=0
             os.close(fd)
 
         self.t('-f %s display=fakedisplay' % fname,
-               { 'kernel'      : '/usr/lib/xen/boot/hvmloader',
+               { 'kernel'      : 'hvmloader',
                  'builder'     : 'hvm',
                  'memory'      : 128,
                  'name'        : 'ExampleHVMDomain',
@@ -179,7 +179,7 @@ ne2000=0
                  'vif'         : ['type=ioemu, bridge=xenbr0'],
                  'disk'        : [['file:/var/images/min-el3-i386.img',
                                    'ioemu:hda', 'w', None]],
-                 'device_model': '/usr/lib/xen/bin/qemu-dm',
+                 'device_model': 'qemu-dm',
 
                  'extra'       : ('VNC_VIEWER=%s:%d ' %
                                   (xen.xm.create.get_host_addr(),
tools/xm-test/lib/XmTestLib/arch.py +1 -1
diff -r 442fb5f1e0a2 tools/xm-test/lib/XmTestLib/arch.py
@@ -77,7 +77,7 @@ ia_HVMDefaults =      {"memory"       : 
                        "acpi"         : 0,
                        "disk"         : ["file:%s/disk.img,ioemu:%s,w!" %
                                          (getRdPath(), BLOCK_ROOT_DEV)],
-                       "kernel"       : "/usr/lib/xen/boot/hvmloader",
+                       "kernel"       : "hvmloader",
                        "builder"      : "hvm",
                        "sdl"          : 0,
                        "vnc"          : 0,

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel