WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] [xen-unstable] tools: remove hard coded paths in example

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-unstable] tools: remove hard coded paths in example config files
From: Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date: Fri, 26 Jun 2009 08:57:05 -0700
Delivery-date: Fri, 26 Jun 2009 09:08:03 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1245838631 -3600
# Node ID b51f9542ab140550502d4e47d50102c59435455c
# Parent  e7a585e69ce3227908e7b5959e6e419fde754c6e
tools: remove hard coded paths in example config files

Signed-off-by: Christoph Egger <Christoph.Egger@xxxxxxx>
---
 tools/examples/xeninfo.pl                |    2 +-
 tools/examples/xmexample.hvm             |   14 ++++----------
 tools/examples/xmexample.hvm-stubdom     |    7 ++++---
 tools/examples/xmexample.pv-grub         |    2 +-
 tools/examples/xmexample.vti             |    2 +-
 tools/python/xen/xm/tests/test_create.py |    8 ++++----
 tools/xm-test/lib/XmTestLib/arch.py      |    2 +-
 7 files changed, 16 insertions(+), 21 deletions(-)

diff -r e7a585e69ce3 -r b51f9542ab14 tools/examples/xeninfo.pl
--- a/tools/examples/xeninfo.pl Wed Jun 24 11:16:42 2009 +0100
+++ b/tools/examples/xeninfo.pl Wed Jun 24 11:17:11 2009 +0100
@@ -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";
diff -r e7a585e69ce3 -r b51f9542ab14 tools/examples/xmexample.hvm
--- a/tools/examples/xmexample.hvm      Wed Jun 24 11:16:42 2009 +0100
+++ b/tools/examples/xmexample.hvm      Wed Jun 24 11:17:11 2009 +0100
@@ -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"
 
 #----------------------------------------------------------------------------
diff -r e7a585e69ce3 -r b51f9542ab14 tools/examples/xmexample.hvm-stubdom
--- a/tools/examples/xmexample.hvm-stubdom      Wed Jun 24 11:16:42 2009 +0100
+++ b/tools/examples/xmexample.hvm-stubdom      Wed Jun 24 11:17:11 2009 +0100
@@ -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"
 
 #----------------------------------------------------------------------------
diff -r e7a585e69ce3 -r b51f9542ab14 tools/examples/xmexample.pv-grub
--- a/tools/examples/xmexample.pv-grub  Wed Jun 24 11:16:42 2009 +0100
+++ b/tools/examples/xmexample.pv-grub  Wed Jun 24 11:17:11 2009 +0100
@@ -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"
diff -r e7a585e69ce3 -r b51f9542ab14 tools/examples/xmexample.vti
--- a/tools/examples/xmexample.vti      Wed Jun 24 11:16:42 2009 +0100
+++ b/tools/examples/xmexample.vti      Wed Jun 24 11:17:11 2009 +0100
@@ -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'
diff -r e7a585e69ce3 -r b51f9542ab14 tools/python/xen/xm/tests/test_create.py
--- a/tools/python/xen/xm/tests/test_create.py  Wed Jun 24 11:16:42 2009 +0100
+++ b/tools/python/xen/xm/tests/test_create.py  Wed Jun 24 11:17:11 2009 +0100
@@ -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(),
diff -r e7a585e69ce3 -r b51f9542ab14 tools/xm-test/lib/XmTestLib/arch.py
--- a/tools/xm-test/lib/XmTestLib/arch.py       Wed Jun 24 11:16:42 2009 +0100
+++ b/tools/xm-test/lib/XmTestLib/arch.py       Wed Jun 24 11:17:11 2009 +0100
@@ -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-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-unstable] tools: remove hard coded paths in example config files, Xen patchbot-unstable <=