Xen project Mailing List

[Xen-changelog] mem-map.sxp and vmxloader are unaffected by a 64-bit build,

From: Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>

Date: Wed, 14 Sep 2005 10:58:11 +0000

Delivery-date: Wed, 14 Sep 2005 10:56:42 +0000

List-id: BK change log <xen-changelog.lists.xensource.com>

# HG changeset patch # User kaf24@xxxxxxxxxxxxxxxxxxxx # Node ID 0a7194ec36a48141c162df97a7fd4c3fd65f5cc6 # Parent c63529f3367d0285ebe9d8287dfbfabc66a8cdbd mem-map.sxp and vmxloader are unaffected by a 64-bit build, and belong in /usr/lib always (never /usr/lib64). qemu-dm continues to live under /usr/lib64 on 64-bit systems. Modify the vmx config script to auto-detect correct path to qemu-dm, rather than staically configuring at compile time. Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx> diff -r c63529f3367d -r 0a7194ec36a4 .hgignore --- a/.hgignore Wed Sep 14 08:41:49 2005 +++ b/.hgignore Wed Sep 14 09:14:32 2005 @@ -84,7 +84,6 @@ ^tools/blktap/ublkback/ublkback$ ^tools/blktap/xen/.*$ ^tools/check/\..*$ -^tools/examples/xmexample\.vmx$ ^tools/console/xenconsoled$ ^tools/console/xenconsole$ ^tools/debugger/pdb/pdb$ diff -r c63529f3367d -r 0a7194ec36a4 tools/examples/Makefile --- a/tools/examples/Makefile Wed Sep 14 08:41:49 2005 +++ b/tools/examples/Makefile Wed Sep 14 09:14:32 2005 @@ -25,20 +25,19 @@ XEN_SCRIPTS += block-file XEN_SCRIPTS += block-enbd -XEN_BOOT_DIR = /usr/$(LIBDIR)/xen/boot +# no 64-bit specifics in mem-map.sxp +# so place in /usr/lib, not /usr/lib64 +XEN_BOOT_DIR = /usr/lib/xen/boot XEN_BOOT = mem-map.sxp XEN_HOTPLUG_DIR = /etc/hotplug XEN_HOTPLUG_SCRIPTS = xen-backend.agent -all: +all: build: install: all install-initd install-configs install-scripts install-boot \ install-hotplug - -xmexample.vmx: xmexample.vmx.in - sed -e 's/@@LIBDIR@@/$(LIBDIR)/' < $< > $@ install-initd: [ -d $(DESTDIR)/etc/init.d ] || $(INSTALL_DIR) $(DESTDIR)/etc/init.d @@ -80,4 +79,3 @@ done clean: - $(RM) xmexample.vmx diff -r c63529f3367d -r 0a7194ec36a4 tools/firmware/Makefile --- a/tools/firmware/Makefile Wed Sep 14 08:41:49 2005 +++ b/tools/firmware/Makefile Wed Sep 14 09:14:32 2005 @@ -1,6 +1,8 @@ XEN_ROOT = ../.. include $(XEN_ROOT)/tools/Rules.mk +# vmxloader is a 32-bit protected mode binary. +# It belongs in /usr/lib, not /usr/lib64. TARGET := vmxassist/vmxloader INSTALL_DIR := $(DESTDIR)/usr/lib/xen/boot diff -r c63529f3367d -r 0a7194ec36a4 tools/examples/xmexample.vmx --- /dev/null Wed Sep 14 08:41:49 2005 +++ b/tools/examples/xmexample.vmx Wed Sep 14 09:14:32 2005 @@ -0,0 +1,102 @@ +# -*- mode: python; -*- +#============================================================================ +# Python configuration setup for 'xm create'. +# This script sets the parameters used when a domain is created using 'xm create'. +# You use a separate script for each domain you want to create, or +# you can set the parameters for the domain on the xm command line. +#============================================================================ + +import os, re +arch = os.uname()[4] +if re.search('64', arch): + arch_libdir = 'lib64' +else: + arch_libdir = 'lib' + +#---------------------------------------------------------------------------- +# Kernel image file. +kernel = "/usr/lib/xen/boot/vmxloader" + +# The domain build function. VMX domain uses 'vmx'. +builder='vmx' + +# Initial memory allocation (in megabytes) for the new domain. +memory = 128 + +# A name for your domain. All domains must have different names. +name = "ExampleVMXDomain" + +# Which CPU to start domain on? +#cpu = -1 # leave to Xen to pick + +# Optionally define mac and/or bridge for the network interfaces. +# Random MACs are assigned if not given. +#vif = [ 'mac=aa:00:00:00:00:11, bridge=xen-br0' ] + +#---------------------------------------------------------------------------- +# Define the disk devices you want the domain to have access to, and +# what you want them accessible as. +# Each disk entry is of the form phy:UNAME,DEV,MODE +# where UNAME is the device, DEV is the device name the domain will see, +# and MODE is r for read-only, w for read-write. + +#disk = [ 'phy:hda1,hda1,r' ] +disk = [ 'file:/var/images/min-el3-i386.img,ioemu:hda,w' ] + +#---------------------------------------------------------------------------- +# Set according to whether you want the domain restarted when it exits. +# The default is 'onreboot', which restarts the domain when it shuts down +# with exit code reboot. +# Other values are 'always', and 'never'. + +#restart = 'onreboot' + +#============================================================================ + +# New stuff +device_model = '/usr/' + arch_libdir + '/xen/bin/qemu-dm' + +# Advanced users only. Don't touch if you don't know what you're doing +memmap = '/usr/lib/xen/boot/mem-map.sxp' + +#----------------------------------------------------------------------------- +# Disk image for +#cdrom= + +#----------------------------------------------------------------------------- +# boot on floppy (a), hard disk (c) or CD-ROM (d) +#boot=[a|c|d] +#----------------------------------------------------------------------------- +# write to temporary files instead of disk image files +#snapshot=1 + +#---------------------------------------------------------------------------- +# enable SDL library for graphics, default = 0 +sdl=0 + +#---------------------------------------------------------------------------- +# enable VNC library for graphics, default = 1 +vnc=1 + +#---------------------------------------------------------------------------- +# enable spawning vncviewer(only valid when vnc=1), default = 1 +vncviewer=1 + +#---------------------------------------------------------------------------- +# no graphics, use serial port +#nographic=0 + + +#----------------------------------------------------------------------------- +# enable audio support +#enable-audio=1 + + +#----------------------------------------------------------------------------- +# set the real time clock to local time [default=0 i.e. set to utc] +#localtime=1 + + +#----------------------------------------------------------------------------- +# start in full screen +#full-screen=1 diff -r c63529f3367d -r 0a7194ec36a4 tools/examples/xmexample.vmx.in --- a/tools/examples/xmexample.vmx.in Wed Sep 14 08:41:49 2005 +++ /dev/null Wed Sep 14 09:14:32 2005 @@ -1,96 +0,0 @@ -# -*- mode: python; -*- -#============================================================================ -# Python configuration setup for 'xm create'. -# This script sets the parameters used when a domain is created using 'xm create'. -# You use a separate script for each domain you want to create, or -# you can set the parameters for the domain on the xm command line. -#============================================================================ - -#---------------------------------------------------------------------------- -# Kernel image file. -kernel = "/usr/@@LIBDIR@@/xen/boot/vmxloader" - -# The domain build function. VMX domain uses 'vmx'. -builder='vmx' - -# Initial memory allocation (in megabytes) for the new domain. -memory = 128 - -# A name for your domain. All domains must have different names. -name = "ExampleVMXDomain" - -# Which CPU to start domain on? -#cpu = -1 # leave to Xen to pick - -# Optionally define mac and/or bridge for the network interfaces. -# Random MACs are assigned if not given. -#vif = [ 'mac=aa:00:00:00:00:11, bridge=xen-br0' ] - -#---------------------------------------------------------------------------- -# Define the disk devices you want the domain to have access to, and -# what you want them accessible as. -# Each disk entry is of the form phy:UNAME,DEV,MODE -# where UNAME is the device, DEV is the device name the domain will see, -# and MODE is r for read-only, w for read-write. - -#disk = [ 'phy:hda1,hda1,r' ] -disk = [ 'file:/var/images/min-el3-i386.img,ioemu:hda,w' ] - -#---------------------------------------------------------------------------- -# Set according to whether you want the domain restarted when it exits. -# The default is 'onreboot', which restarts the domain when it shuts down -# with exit code reboot. -# Other values are 'always', and 'never'. - -#restart = 'onreboot' - -#============================================================================ - - -# New stuff -device_model = '/usr/@@LIBDIR@@/xen/bin/qemu-dm' - -# Advanced users only. Don't touch if you don't know what you're doing -memmap = '/usr/@@LIBDIR@@/xen/boot/mem-map.sxp' - -#----------------------------------------------------------------------------- -# Disk image for -#cdrom= - -#----------------------------------------------------------------------------- -# boot on floppy (a), hard disk (c) or CD-ROM (d) -#boot=[a|c|d] -#----------------------------------------------------------------------------- -# write to temporary files instead of disk image files -#snapshot=1 - -#---------------------------------------------------------------------------- -# enable SDL library for graphics, default = 0 -sdl=0 - -#---------------------------------------------------------------------------- -# enable VNC library for graphics, default = 1 -vnc=1 - -#---------------------------------------------------------------------------- -# enable spawning vncviewer(only valid when vnc=1), default = 1 -vncviewer=1 - -#---------------------------------------------------------------------------- -# no graphics, use serial port -#nographic=0 - - -#----------------------------------------------------------------------------- -# enable audio support -#enable-audio=1 - - -#----------------------------------------------------------------------------- -# set the real time clock to local time [default=0 i.e. set to utc] -#localtime=1 - - -#----------------------------------------------------------------------------- -# start in full screen -#full-screen=1 _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxxxxxxxx http://lists.xensource.com/xen-changelog

©2013 Xen Project, A Linux Foundation Collaborative Project. All Rights Reserved.
Linux Foundation is a registered trademark of The Linux Foundation.
Xen Project is a trademark of The Linux Foundation.