x86 hvm: stubdom and hvmloader always live under /usr/lib, never /usr/lib64

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/tools/examples/stubdom-ExampleHVMDomain b/tools/examples/stubdom-ExampleHVMDomain
index 2822f05ded2262e5e0092f60c64c8c6c8bcd62be..de1619ba322e8e05db2bb0bc2792528811138dee 100644 (file)
--- a/tools/examples/stubdom-ExampleHVMDomain
+++ b/tools/examples/stubdom-ExampleHVMDomain
@@ -1,14 +1,7 @@
 # Not to be started directly,
 # See xmexample.hvm-stubdom and stubdom/README for more details
 
-import os, re
-arch = os.uname()[4]
-if re.search('64', arch):
-    arch_libdir = 'lib64'
-else:
-    arch_libdir = 'lib'
-
-kernel = "/usr/" + arch_libdir + "/xen/boot/ioemu-stubdom.gz"
+kernel = "/usr/lib/xen/boot/ioemu-stubdom.gz"
 
 # Must be the same as in xmexample.hvm-stubdom, with a prepended vif for TCP/IP
 # networking in the stubdomain itself, here just ''

diff --git a/tools/examples/xmexample.hvm b/tools/examples/xmexample.hvm
index b681dcc67ed61985ffe84ef09be6d53c9a9cf932..94a0fd160a233b8b8e78d389d1bb0d37720d69a5 100644 (file)
--- a/tools/examples/xmexample.hvm
+++ b/tools/examples/xmexample.hvm
@@ -15,7 +15,7 @@ else:
 
 #----------------------------------------------------------------------------
 # Kernel image file.
-kernel = "/usr/" + arch_libdir + "/xen/boot/hvmloader"
+kernel = "/usr/lib/xen/boot/hvmloader"
 
 # The domain build function. HVM domain uses 'hvm'.
 builder='hvm'

diff --git a/tools/examples/xmexample.hvm-stubdom b/tools/examples/xmexample.hvm-stubdom
index 06adbf7daf612d9e63ed7e7177336438fbb36f23..117273c5e5fc26208cf3dbebc99e5d612f391102 100644 (file)
--- a/tools/examples/xmexample.hvm-stubdom
+++ b/tools/examples/xmexample.hvm-stubdom
@@ -10,16 +10,9 @@
 # stubdom-ExampleHVMDomain and stubdom/README for more details
 # The differences with xmexample.hvm are marked with "STUBDOM"
 
-import os, re
-arch = os.uname()[4]
-if re.search('64', arch):
-    arch_libdir = 'lib64'
-else:
-    arch_libdir = 'lib'
-
 #----------------------------------------------------------------------------
 # Kernel image file.
-kernel = "/usr/" + arch_libdir + "/xen/boot/hvmloader"
+kernel = "/usr/lib/xen/boot/hvmloader"
 
 # The domain build function. HVM domain uses 'hvm'.
 builder='hvm'
@@ -129,7 +122,7 @@ vif = [ 'type=ioemu, bridge=xenbr0' ]
 #
 # STUBDOM: this is a script that creates the stub domain running the device
 # model
-device_model = '/usr/' + arch_libdir + '/xen/bin/stubdom-dm'
+device_model = '/usr/lib/xen/bin/stubdom-dm'
 
 #-----------------------------------------------------------------------------
 # boot on floppy (a), hard disk (c), Network (n) or CD-ROM (d)