Commit Graph
66 Commits
Author SHA1 Message Date
Keir Fraser 64e2962929 Update Xen version for 3.3.0-rc2-pre 2008-07-25 15:03:03 +01:00
Keir Fraser 2d05476a74 Update Xen version for 3.3.0-rc1. 2008-07-25 15:01:59 +01:00
Keir Fraser abcd574d95 Switching to merged (git) qemu by default
The merged qemu tree is now on xenbits at:
   http://xenbits.xensource.com/git-http/qemu-xen-unstable.git
(and a corresponding staging tree in /staging).

That's a raw git tree fetchable by `git-clone http://....', so not
really browseable.  There will be gitweb, and a real git server, set
up shortly, as well as a one-way Mercurial gateway.

The tools/ioemu subdirectory will remain in the xen-unstable tree for
this release, as an alternative.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
2008-07-09 11:05:26 +01:00
Keir Fraser 554a3a3375 Support building of out-of-tree merged qemu from git
This provides support for building the new merged qemu from
qemu-xen.git, or from a local checkout.

The default is still to use the in-tree version, because the patchman
infrastructure for testing, and propagation from staging to
xen-unstable, needs a small amount of work to cope with git.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
2008-07-03 10:44:13 +01:00
Keir Fraser 84d54d5d8b i386: Remove non-PAE hypervisor build target.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
2008-05-08 14:32:11 +01:00
Keir Fraser 1aa3c54a31 Remove defunct powerpc port.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
2008-05-08 13:40:40 +01:00
Keir Fraser 6ab58a7ed9 tools build: Fix build after subdir rules cleanups.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
2008-03-25 10:17:22 +00:00
Keir Fraser 4c4ca29ff9 build: Make PREFIX work by fixing LIBDIR
In the current tree, setting PREFIX does not work very well.  This is
because of confusion about the meaning of LIBDIR.  In some places it
is the pathname tail of directories containing libraries (lib, lib64
or lib/amd64).  But in other places it is a destination pathname
(implicitly, including any PREFIX).  This can result in PREFIX or /usr
being added the wrong number of times.

This patch splits LIBDIR into two variables, LIBLEAFDIR and
LIBDIR.  LIBDIR is the directory into which Xen libraries and other
similar code is to be placed, and includes any PREFIX.  LIBLEAFDIR is
just the library tail and can be appended to various different
prefixes; for example, to construct the X11 library directory for -L.

Neither variable contains the value of DESTDIR, which is of course
used only to redirect the results of `make install' when desired.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
2008-01-31 09:38:34 +00:00
Keir Fraser db52d0daeb Remove machine setting from HOSTCFLAGS.
The host compiler must know how to produce runnable binaries without
special settings.

Signed-off-by: Bastian Blank <waldi@debian.org>
2008-01-27 17:05:47 +00:00
Keir Fraser 9bb7f7e2ac tools: disable lomount and miniterm by default
lomount is a tool which reads and parses a partition table in a disk
image block device and then uses mount -o ...offset=... to mount it.
This is not an ideal approach.  For example, if the intended
filesystem has corrupted metadata the kernel's filesystem driver may
start to write outside of the intended region.  This might even be
exploitable in some perverse circumstances.

Nowadays people wanting to do this should use kpartx, which uses
devmapper to create appropriate range mappings.  So lomount should be
disabled.

miniterm may well be useful but it is a clone-and-hack of an upstream
project and is currently built but not installed by default, partly
because it doesn't make sense to install on the dom0 which it might be
trying to debug.

It is probably useful to retain these two programs in the source tree
but IMO they should no longer be built by default.

The attached patch does these things:
 * CONFIG_LOMOUNT and CONFIG_MINITERM in Config.mk
   can enable and disable these programs
 * They are disabled by default
 * If CONFIG_MINITERM=y it is still built but not installed.
   make -C tools/misc/miniterm install  will install it.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
2008-01-17 15:18:38 +00:00
Keir Fraser 1d0474e5be -DNDEBUG for hypervisor only
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
2008-01-15 18:50:44 +00:00
Keir Fraser af3ade42b9 Revert 16560:822d4ec5cfb1.
Preference seems to be to update library versions only when the ABI
changes. Only libxenctrl/libxenguest have their version number changed
to 3.2.0, as a reminder that they change on pretty much every major
release.

libfsimage/libxenstore/libblktap have not changed substantially
recently, hence the ABI has not changed, and version number stays the
same as in Xen 3.1 (and before).

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
2007-12-08 17:32:01 +00:00
Keir Fraser 7f9e1cf31e tools: Rationalise library soname versions.
* Arrange for the sonames of libxenstore, libxc, libfsimage and
   libblktap to be set from a single place in Config.mk.
 * Bumps the soname major version number to 3.2 in preparation for
   3.2 rc1 after which we do not expect to have ABI changes.

I have not done anything about libaio and libflask.  The former is
imported from elsewhere and if we're lucky will have sane versioning
upstream.

libflask has a very small interface and I'm hoping that the XSM
authors have been keeping some ABI discipline.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
2007-12-07 14:44:13 +00:00
Keir Fraser 8731b7b939 pv-qemu: Remove standalone xenfb code
This patch removes all trace of the standalone paravirt framebuffer
daemon. With this there is no longer any requirement for
LibVNCServer. Everything is handled by the QEMU device model. The
xenfb.c and xenfb.h files are now moved (without code change) into
tools/ioemu/hw/ & the temporary Makefile hack from the previous patch
is removed.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2007-10-25 14:37:23 +01:00
Keir Fraser a9931381f9 Fix x86/64 build for *BSD.
- Config.mk: uname -m prints "amd64". Deal with this.
 - do not assume python is always in /usr/bin
 - get-fields.sh: make it portable and non-bash specific
Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
2007-10-19 14:49:08 +01:00
kfraser@localhost.localdomain 61c6564d34 Cleanups after XSM checkin.
Signed-off-by: Keir Fraser <keir@xensource.com>

--HG--
rename : xen/include/public/acm.h => xen/include/public/xsm/acm.h
rename : xen/include/public/acm_ops.h => xen/include/public/xsm/acm_ops.h
rename : xen/include/acm/acm_core.h => xen/include/xsm/acm/acm_core.h
rename : xen/include/acm/acm_endian.h => xen/include/xsm/acm/acm_endian.h
rename : xen/include/acm/acm_hooks.h => xen/include/xsm/acm/acm_hooks.h
2007-08-31 12:05:07 +01:00
kfraser@localhost.localdomain b1ed041464 Xen Security Modules: FLASK
Signed-off-by: George Coker <gscoker@alpha.ncsc.mil>
2007-08-31 11:31:18 +01:00
kfraser@localhost.localdomain d046f361dc Xen Security Modules: XSM
Signed-off-by: George Coker <gscoker@alpha.ncsc.mil>
2007-08-31 11:21:35 +01:00
kfraser@localhost.localdomain 6fcad535ee Tack -m32/-m64 on HOSTCFLAGS when COMPILE_ARCH is x86.
Should fix building in Solaris environments.
Signed-off-by: Keir Fraser <keir@xensource.com>
2007-08-16 16:00:17 +01:00
kfraser@localhost.localdomain 9de675c1b3 [Build] Remove ACM option for NULL and STE+CHWALL policy
Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
2007-07-13 13:42:41 +01:00
Keir Fraser 43aa5ed8c0 Specify -fno-strict-aliasing in root build config file.
Fixes correctness issues with xenstored and gcc-4.2.

Original patch by Charles Coffing <ccoffing@novell.com>

Signed-off-by: Keir Fraser <keir@xensource.com>
2007-07-07 10:31:15 +01:00
kfraser@localhost.localdomain 8c706ec28d acm: Changes to XML schema of the policy
This patch changes the XML schema of the ACM policy to require a
version and that every conflict set have a name. Every VM label must
have one Chinese Wall Type and every resource label one Simple Type
Enforcement Type. As a consequence of this some example policies
needed to be changed. Also not offering that many configuration
options for compiling xen anymore to make things simpler.

Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
2007-04-25 09:31:52 +01:00
kfraser@localhost.localdomain aacef84b33 In order to allow building as non-root with a non-default CC (which
root may not have access to through its $PATH), defer the generation
of an error until CC is actually needed.

Original patch by Jan Beulich <jbeulich@novell.com>

Signed-off-by: Keir Fraser <keir@xensource.com>
2007-03-27 14:50:17 +01:00
Keir Fraser cfcf0ae284 Xen and tools now require gcc 3.4+ on x86.
- gcc-3.2 cannot handle some multi-line assertions in the Xen
 sources. Noone noticed.
 - gcc-3.3 has problems with alignment constraints inside typedefs.

gcc 3.4.0 is now three years old so I hope that everyone has an
up-to-date compiler, or can obtain a more up-to-date package for their
distribution. If not we may need to fall back to supporting gcc-3.3.x
as well.

Also clean up the way we do version checks, using the power of awk.

Signed-off-by: Keir Fraser <keir@xensource.com>
2007-03-17 12:04:48 +00:00
kfraser@localhost.localdomain ca7a6b3eb2 Make Python tools (i.e., xend and pygrub) conditionally compiled.
Config option is PYTHON_TOOLS, default is 'y'.

Signed-off-by: Ben Thomas <ben@virtualiron.com>
2007-03-06 16:46:20 +00:00
kfraser@localhost.localdomain 48ad2e6f15 Build PAE by default on x86_32.
Signed-off-by: Keir Fraser <keir@xensource.com>
2007-01-18 18:39:07 +00:00
Emmanuel Ackaouy 8589463a25 Handle the creation of startup info for compatibility mode guests. This
includes a script to auto-generate checking or translation code between
native and compatibility mode hypercall argument structures.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
2007-01-05 17:34:28 +00:00
Ewan Mellor 7169017f84 Make the xenfb tools an optional part of the build, as they introduce new
dependencies (libvncserver and libsdl devel packages).  Enable them with
XENFB_TOOLS=y.

Signed-off-by: Ewan Mellor <ewan@xensource.com>
2006-12-02 16:39:53 +00:00
jfehlig@jfehlig2.provo.novell.com 0dc1af83bf Add libxen to overall xen build via a config option in Config.mk.
Signed-off-by: Jim Fehlig <jfehlig@novell.com>
2006-11-22 14:25:07 -07:00
kfraser@localhost.localdomain f9038804d6 Replace test-gcc-flag with Linux-style cc-option.
Improve on Linux implementation by looking for any output
on stdout/stderr. This indicates badness.

Signed-off-by: Keir Fraser <keir@xensource.com>
2006-10-18 19:14:34 +01:00
kfraser@localhost.localdomain 3943db7763 [XEN] Can be built -std=gnu99 (except for .S files).
Need to be careful with static initialisers:
 1. *_LOCK_UNLOCKED, CPU_MASK_* no longer include a cast
 2. Dynamic uses of the above are replaced by
    appropriate function invocations.

Signed-off-by: Keir Fraser <keir@xensource.com>
2006-10-18 14:46:48 +01:00
kfraser@localhost.localdomain a3ef82b068 Avoid need for GREP variable by avoiding GNUisms. The
only one we appear to have is use of '-q'. Replace it
with redirection to /dev/null.

Also avoid use of 'tail' by replacing with 'head' or
'grep' as appropriate.

Signed-off-by: Keir Fraser <keir@xensource.com>
2006-10-18 13:43:35 +01:00
kfraser@localhost.localdomain c0fd920e98 [SOLARIS] Don't build ptrace code on Solaris.
Signed-off-by: Keir Fraser <keir@xensource.com>
2006-10-17 17:59:32 +01:00
kfraser@localhost.localdomain 7ffd47fbf6 [SOLARIS] Use GNU grep on Solaris.
Signed-off-by: John Levon <john.levon@sun.com>
2006-10-17 16:53:39 +01:00
kfraser@localhost.localdomain a278bc0ea1 Introduce Makefile config fragments for OS-specific differences.
Signed-off-by: John Levon <john.levon@sun.com>
2006-10-17 16:48:05 +01:00
kfraser@localhost.localdomain b11b29890d Don't use -Wunused-value. It's too aggressive with GCC4.
Signed-off-by: Keir Fraser <keir@xensource.com>
2006-10-17 15:53:42 +01:00
kfraser@localhost.localdomain 65bb7cea27 Build Xen with at least -O1 to avoid very large stack frames.
Signed-off-by: Keir Fraser <keir@xensource.com>
2006-07-27 12:59:36 +01:00
kaf24@firebug.cl.cam.ac.uk 70dfcaa268 [powerpc] add PowerPC support to Makefiles
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
2006-07-14 10:22:40 +01:00
kfraser@dhcp93.uk.xensource.com 3f2522e1ac Use a global build configuration file, and rework libxc Makefile for PPC.
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
2006-05-31 11:31:52 +01:00
kaf24@firebug.cl.cam.ac.uk 4886bb64c1 build: Make sure that DESTDIR is set
In the case where XEN_PYTHON_NATIVE_INSTALL is in effect,
if DESTDIR is not set then the install will go into a relative
directory rather than under the default prefix (usually /usr).

An alternate solution would be to update the fragments
that do the python install to use $(DESTDIR)/ instead of
$(DESTDIR). This is not an incredible burden as there
are only two such fragments in the tree. However, it
seems prone to error as new makefiles are created
in the future.

Signed-Off-By: Horms <horms@verge.net.au>
2006-04-10 16:31:53 +01:00
kaf24@firebug.cl.cam.ac.uk 945758df89 More build config changes:
- Build -O2 rather than -O3
 - Build with -Wstrict-prototypes
 - Move target-specific generic compiler switches to Config.mk

Signed-off-by: Keir Fraser <keir@xensource.com>
2006-03-10 17:32:04 +01:00
kaf24@firebug.cl.cam.ac.uk d27fbb0061 Move 'debug' build option into the outermost Config.mk file.
Signed-off-by: Keir Fraser <keir@xensource.com>
2006-03-09 22:31:45 +01:00
kaf24@firebug.cl.cam.ac.uk 326450f67e Clean up the usage of CFLAGS. This is nice for packagers, who would
like to control the base compilation flags from a central place.

Signed-off-by: Charles Coffing <ccoffing@novell.com>
2006-03-09 21:17:45 +01:00
emellor@leeni.uk.xensource.com 3f639e9079 HOSTCC should be used to set HOSTCFLAGS instead of CC.
There is a case where HOSTCC doesn't accept -Wdeclaration-after-statement,
while CC does. It results in a compilation error.
This patch fixes it

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
2005-12-14 12:22:24 +00:00
kaf24@firebug.cl.cam.ac.uk 9d401b35f0 Add -Wdeclaration-after-statement to CFLAGS only if the
compiler supports it. Move test-gcc-flag function to
Config.mk where it can be used by any component of the
build.

Signed-off-by: Keir Fraser <keir@xensource.com>
2005-11-23 11:15:18 +01:00
kaf24@firebug.cl.cam.ac.uk 869e86d8e6 Add -Wdeclaration-after-statement to Xen and tools build.
Fix the compile errors that result from this.

Signed-off-by: Keir Fraser <keir@xensource.com>
2005-11-22 18:44:08 +01:00
kaf24@firebug.cl.cam.ac.uk ac5d4d868f Enable the Xen hypervisor ACM security policy to be determined at boot
time (instead of at compile time). Allows a single xen.gz binary to
run under different security policy types, which simplifies
distributions considerably. To this end, we replace the current single
compile switch in Config.mk with the following two:

1. ACM_SECURITY (y/n) if "n", then the ACM is not compiled and no security 
policies can be configured at boot time. If "y", then the ACM is compiled 
and can be configured into any of the available policy types (null, 
chwall, ste, chwall_ste) by specifying a valid boot policy .bin file in 
the grub boot configuration.

2. ACM_DEFAULT_SECURITY_POLICY (null / chwall / ste / chwall_ste) 
specifies the policy into which Xen defaults in the case that security is 
enabled but no boot policy file is specified, or the specified policy file 
is invalid (wrong version, magic, corrupted, ...)

While the type of the enabled policy (null, ste, ...) is decided once 
during boot for the whole boot cycle, the policy instantiation can be 
changed during operation as usual with the security tools.

Signed-off by: Tomas Lendacky <toml@us.ibm.com>
Signed-off by: Reiner Sailer <sailer@us.ibm.com>
2005-11-19 10:35:38 +01:00
kaf24@firebug.cl.cam.ac.uk d56d69a032 Clean up DESTDIR handling. Default install is to root
directory (/). This is only overridden automatically
for the 'make dist' targets and their legacy aliases
(make {xen,tools,kernels,docs}).

Signed-off-by: Keir Fraser <keir@xensource.com>
2005-10-05 15:05:38 +01:00
kaf24@firebug.cl.cam.ac.uk df150a9cb5 Move setting of configuration variables to Config.mk.
Allows for partial-tree builds to be invoked from a sub-directory.
Allow for users to include a ".config" with additional custom settings.

Signed-off-by: Michal Ostrowski <mostrows@watson.ibm.com>
2005-10-05 13:32:00 +01:00
kaf24@firebug.cl.cam.ac.uk 81667d0511 VTPM is off by default. 2005-09-01 09:01:15 +00:00