ia64/xen-unstable

changeset 18126:f528dd7fae7b

x86 hvm: stubdom and hvmloader always live under /usr/lib, never /usr/lib64
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Tue Jul 22 07:59:44 2008 +0100 (2008-07-22)
parents f95a37f2deab
children aa4d69e16f0e
files tools/examples/stubdom-ExampleHVMDomain tools/examples/xmexample.hvm tools/examples/xmexample.hvm-stubdom
line diff
     1.1 --- a/tools/examples/stubdom-ExampleHVMDomain	Mon Jul 21 16:24:19 2008 +0100
     1.2 +++ b/tools/examples/stubdom-ExampleHVMDomain	Tue Jul 22 07:59:44 2008 +0100
     1.3 @@ -1,14 +1,7 @@
     1.4  # Not to be started directly,
     1.5  # See xmexample.hvm-stubdom and stubdom/README for more details
     1.6  
     1.7 -import os, re
     1.8 -arch = os.uname()[4]
     1.9 -if re.search('64', arch):
    1.10 -    arch_libdir = 'lib64'
    1.11 -else:
    1.12 -    arch_libdir = 'lib'
    1.13 -
    1.14 -kernel = "/usr/" + arch_libdir + "/xen/boot/ioemu-stubdom.gz"
    1.15 +kernel = "/usr/lib/xen/boot/ioemu-stubdom.gz"
    1.16  
    1.17  # Must be the same as in xmexample.hvm-stubdom, with a prepended vif for TCP/IP
    1.18  # networking in the stubdomain itself, here just ''
     2.1 --- a/tools/examples/xmexample.hvm	Mon Jul 21 16:24:19 2008 +0100
     2.2 +++ b/tools/examples/xmexample.hvm	Tue Jul 22 07:59:44 2008 +0100
     2.3 @@ -15,7 +15,7 @@ else:
     2.4  
     2.5  #----------------------------------------------------------------------------
     2.6  # Kernel image file.
     2.7 -kernel = "/usr/" + arch_libdir + "/xen/boot/hvmloader"
     2.8 +kernel = "/usr/lib/xen/boot/hvmloader"
     2.9  
    2.10  # The domain build function. HVM domain uses 'hvm'.
    2.11  builder='hvm'
     3.1 --- a/tools/examples/xmexample.hvm-stubdom	Mon Jul 21 16:24:19 2008 +0100
     3.2 +++ b/tools/examples/xmexample.hvm-stubdom	Tue Jul 22 07:59:44 2008 +0100
     3.3 @@ -10,16 +10,9 @@
     3.4  # stubdom-ExampleHVMDomain and stubdom/README for more details
     3.5  # The differences with xmexample.hvm are marked with "STUBDOM"
     3.6  
     3.7 -import os, re
     3.8 -arch = os.uname()[4]
     3.9 -if re.search('64', arch):
    3.10 -    arch_libdir = 'lib64'
    3.11 -else:
    3.12 -    arch_libdir = 'lib'
    3.13 -
    3.14  #----------------------------------------------------------------------------
    3.15  # Kernel image file.
    3.16 -kernel = "/usr/" + arch_libdir + "/xen/boot/hvmloader"
    3.17 +kernel = "/usr/lib/xen/boot/hvmloader"
    3.18  
    3.19  # The domain build function. HVM domain uses 'hvm'.
    3.20  builder='hvm'
    3.21 @@ -129,7 +122,7 @@ vif = [ 'type=ioemu, bridge=xenbr0' ]
    3.22  #
    3.23  # STUBDOM: this is a script that creates the stub domain running the device
    3.24  # model
    3.25 -device_model = '/usr/' + arch_libdir + '/xen/bin/stubdom-dm'
    3.26 +device_model = '/usr/lib/xen/bin/stubdom-dm'
    3.27  
    3.28  #-----------------------------------------------------------------------------
    3.29  # boot on floppy (a), hard disk (c), Network (n) or CD-ROM (d)