aboutsummaryrefslogtreecommitdiffstats
path: root/Config.mk
Commit message (Collapse)AuthorAgeFilesLines
...
* QEMU_TAG updateIan Jackson2012-05-111-3/+3
|
* autoconf: add ovmf, rombios and seabios and configure optionsRoger Pau Monne2012-04-241-4/+0
| | | | | | | | | Move this hardcoded options from Config.mk to config/Tools.mk and add the appropiate configure options. Signed-off-by: Roger Pau Monne <roger.pau@citrix.com> Acked-by: Ian Campbell <ian.campbell@citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* xen: Add -Wno-unused-value to the clang CFLAGSTim Deegan2012-04-111-1/+2
| | | | | | | | | | | clang complains about a lot of functions and macros whose return value is unused. I started on patches to drop some functions' return values and scatter (void)s around callers, but it was getting too messy. Just turn off the warning instead. Signed-off-by: Tim Deegan <tim@xen.org> Acked-by: Keir Fraser <keir@xen.org> Committed-by: Tim Deegan <tim@xen.org>
* QEMU_TAG updateIan Jackson2012-04-031-3/+3
|
* QEMU_TAG updateIan Jackson2012-04-021-3/+3
|
* Disable OVMF build - it's not baked yet.Tim Deegan2012-03-221-1/+1
| | | | | Signed-off-by: Tim Deegan <tim@xen.org> Committed-by: Keir Fraser <keir@xen.org>
* Fetch the OVMF repository from specific git mirror and enable itAttilio Rao2012-03-221-1/+4
| | | | | Signed-off-by: Attilio Rao <attilio.rao@citrix.com> Committed-by: Keir Fraser <keir@xen.org>
* Update SEABIOS_UPSTREAM_TAGIan Campbell2012-03-131-3/+3
| | | | | | | | Switch to recently released 1.6.3.2 from upstream. This incorporates all the changesets which we previously applied to 1.6.3.1. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* QEMU_TAG updateIan Jackson2012-03-011-3/+3
|
* build: remove hypervisor-only configuration from tools/configureDaniel De Graaf2012-03-011-0/+4
| | | | | | | | | | | When adding autoconf support, the configuration options for XSM and FLASK_ENABLE were incorrectly removed from Config.mk and added to the tools configuration. Since these are hypervisor configuration options, they should not depend on running tools configuration. Signed-off-by: Daniel De Graaf <dgdegra@tycho.nsa.gov> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* Update SEABIOS_UPSTREAM_TAGIan Campbell2012-02-271-3/+3
| | | | | Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Committed-by: Ian Campbell <Ian.Campbell@citrix.com>
* SEABIOS_UPSTREAM_TAG UpdateIan Campbell2012-02-271-1/+3
| | | | | Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Committed-by: Ian Campbell <Ian.Campbell@citrix.com>
* hvmloader: Add OVMF UEFI support and directly use itAttilio Rao2012-02-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | ...when specified in the guest configuration file. This work is somewhat based on Bei Guan effort during the SoC 2011 and relies on upstream edk2/ovmf Tianocore ROM to be built separately and manually copied as: Build/OvmfX64/DEBUG_GCC44/FV/OVMF.fd -> tools/firmware/ovmf/ovmf-x64.bin Build/OvmfIa32/DEBUG_GCC44/FV/OVMF.fd -> toolf/firmware/ovmf/ovmf-ia32.bin A way to integrate OVMF build directly into XEN has still be discussed on the mailing list appropriately. Signed-off-by: Attilio Rao <attilio.rao@citrix.com> Disable CONFIG_OVMF by default as ovmf is not integrated into the build. Signed-off-by: Keir Fraser <keir@xen.org> Committed-by: Keir Fraser <keir@xen.org>
* build: add autoconf to replace custom checks in tools/checkIan Jackson2012-02-221-39/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added autotools magic to replace custom check scripts. The previous checks have been ported to autoconf, and some additional ones have been added (plus the suggestions from running autoscan). Two files are created as a result from executing configure script, config/Tools.mk and config.h. conf/Tools.mk is included by tools/Rules.mk, and contains most of the options previously defined in .config, that can now be set passing parameters or defining environment variables when executing configure script. config.h is only used by libxl/xl to detect yajl_version.h. [ tools/config.sub and config.guess copied from autotools-dev 20100122.1 from Debian squeeze i386, which is GPLv2. tools/configure generated using the included ./autogen.sh which ran autoconf 2.67-2 from Debian squeeze i386. autoconf is GPLv3+ but has a special exception for the autoconf output; this exception applies to us and exempts us from complying with GPLv3+ for configure, which is good as Xen is GPL2 only. - Ian Jackson ] Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu> Tested-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
* QEMU_TAG updateIan Jackson2012-02-201-3/+3
|
* arm: Set XEN_COMPILE_ARCH correctly from "uname -m" on ARMIan Campbell2012-02-151-1/+1
| | | | | | Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Committed-by: Ian Campbell <Ian.Campbell@citrix.com>
* QEMU_TAG updateIan Jackson2012-02-131-3/+3
|
* firmware: Introduce CONFIG_ROMBIOS and CONFIG_SEABIOS optionsJulian Pidancet2012-02-131-0/+3
| | | | | | | | | | | | | | | | | | | This patch introduces configuration options allowing to built either a rombios only or a seabios only hvmloader. Building option ROMs like vgabios or etherboot is only enabled for a rombios hvmloader, since SeaBIOS takes care or extracting option ROMs itself from the PCI devices (these option ROMs are provided by the device model and do not need to be built in hvmloader). The Makefile in tools/firmware/ now only checks for bcc if rombios is enabled. These two configuration options are left on by default to remain compatible. Signed-off-by: Julian Pidancet <julian.pidancet@gmail.com> Acked-by: Ian Campbell <ian.campbell@citrix.com>
* firmware: Use mkhex from hvmloader directory for etherboot ROMsJulian Pidancet2012-02-131-0/+2
| | | | | | | | | | | | | To remain consistent with how other ROMs are built into hvmloader, call mkhex on etherboot ROMs from the hvmloader directory, instead of the etherboot directory. In other words, eb-roms.h is not used any more. Introduce ETHERBOOT_NICS config option to choose which ROMs should be built (kept rtl8139 and 8086100e per default as before). Signed-off-by: Julian Pidancet <julian.pidancet@gmail.com> Acked-by: Ian Campbell <ian.campbell@citrix.com>
* QEMU_TAG updateIan Jackson2012-02-071-3/+3
|
* Tools: build testsAndres Lagar-Cavilla2012-02-061-0/+1
| | | | | | | | | | | | | Build tests as part of the tools build. It is enabled with CONFIG_TESTS in Config.mk Currently disabled build of tests/regressions and tests/xen-access (in 32-bit mode) as they fail. Signed-off-by: Andres Lagar-Cavilla <andres@lagarcavilla.org> Acked-by: Ian Campbell <ian.campbell@citrix.com> Committed-by: Keir Fraser <keir@xen.org>
* Update QEMU_TAG, for CVE-2012-0029Ian Jackson2012-02-021-3/+3
|
* libxl: add support for yajl 2.xRoger Pau Monne2012-01-311-0/+5
| | | | | | | | | This patch adds support for yajl versions 2.x, while retaining 1.x compatibility. All the needed ifdefs can be found in libxl_json.h. Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* mini-os: use BSD sys/queue.h instead of Linux list.hIan Campbell2012-01-311-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The latter is GPL which makes the whole of mini-os GPL rather than BSD as intended. In tree users are all GPL or GPL-compatible but we should fix this so that mini-os is BSD. Do so by using the same BSD sys/queue.h as we use in libxl. Tested with the builtin mini-os test app and qemu stubdomain, both of which appear to still function as expected. Move tools/libxl/external and the associated sed script to tools/include/xen-external to allow more sensible access from mini-os. Also add s/NULL/0/ in the sed script due to NULL not always being defined in stubdom code when mini-os/wait.h is included. As well as the obvious ABI changes there are a few API updates associated with the change: - struct rw_semaphore.wait_list is unused - remove_waiter needs to take the wait_queue_head The latter requires a qemu update, so there is also a QEMU_TAG update in this changeset. I sprinkled some extra-emacs local variables around the files I edited which didn't have them. I think this should be backported to the stable branches since external users of mini-os may have been mislead into thinking they could safely link mini-os against GPL-incompatible code. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Committed-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
* seabios: update to 1.6.3.1 releaseIan Campbell2012-01-261-1/+1
| | | | | | | This is the latest seabios stable release. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Committed-by: Keir Fraser <keir@xen.org>
* Clone and build Seabios by default2012-01-241-9/+3
| | | | | | | | From: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson.citrix.com> Acked-by: Ian Campbell <ian.campbell@citrix.com>
* Clone and build upstream Qemu by default2012-01-241-0/+7
| | | | | | | From: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson.citrix.com>
* build: detect if libiconv is presentRoger Pau Monne2011-12-201-0/+5
| | | | | | | | | Detect if libiconv is present in the system, since we will have to link against it when using iconv. Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu> Committed-by: Ian Jackson <ian.jackson.citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
* Update QEMU_TAGIan Jackson2012-01-051-3/+3
|
* Update QEMU_TAGIan Jackson2011-12-221-3/+3
|
* stubdom: allow to build with older tool chainJan Beulich2011-12-131-0/+3
| | | | | | | | | | | GNU make prior to 3.81 doesn't support $(realpath ...). This fixes a regression introduced in 23368:0f670f5146c8 (the option tested via cc-option-add got interpreted as the argument of the -I compiler option, as its intended argument was blank, and hence the compiler was falsely considered to support *any* option in the pciutils sub-tree). Signed-off-by: Jan Beulich <jbeulich@suse.com> Acked-by: Keir Fraser <keir@xen.org>
* remove the use of -Wno-unused-valueJan Beulich2011-12-131-4/+0
| | | | | | | | It has been hiding actual mistakes, and there are not too many changes necessary to make things build without suppressing this warning. Signed-off-by: Jan Beulich <jbeulich@suse.com> Acked-by: Keir Fraser <keir@xen.org>
* Update QEMU_TAGIan Jackson2011-12-081-3/+3
|
* Update QEMU_TAGIan Jackson2011-12-051-3/+3
|
* Update QEMU_TAGIan Jackson2011-12-011-3/+3
|
* Update QEMU_TAGIan Jackson2011-12-011-3/+3
|
* tools: Switch to system libaio (again)Ian Jackson2011-12-011-1/+1
| | | | | | | | The test system problems which prompted 24233:a9c67c2daf4b (itself a tiny partial revert of 24184:4ecd3615e726 / 24186:7aa5838499d1) have now been resolved, we think. So revert 24233. Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* Update QEMU_TAGIan Jackson2011-11-281-3/+3
|
* tools: Revert to our built-in aioIan Jackson2011-11-281-1/+1
| | | | | | | | | | These two changesets: 24184:4ecd3615e726 tools: use system installed libaio by default. 24186:7aa5838499d1 tools: use system libaio for blktap1 as well. cause HVM guest installs (both Windows and Redhat) to fail on Debian squeeze with xl. So change the default for now. Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* xenpaging: add XEN_PAGING_DIR / libxl_xenpaging_dir_path()Olaf Hering2011-11-201-1/+1
| | | | | Signed-off-by: Olaf Hering <olaf@aepfle.de> Committed-by: Ian Jackson <ian.jackson.citrix.com>
* tools: use system installed libaio by default.Ian Campbell2011-11-221-0/+1
| | | | | | | | | | | | | | | | | | | | I could have sworn I did this years ago. IIRC the need for our own copy was due to the use of io_set_eventfd which is not present in version 0.3.106. However it is in 0.3.107 the first version of which was uploaded to Debian in June 2008 (I can't find a better reference for the release date). The necessary version is available in Debian Lenny onwards and is in at least RHEL 6, Fedora 13 and OpenSuSE 11.3. The necessary version appears to not be available in RHEL 5 or SLES 11 which is why I haven't simply nuked the in tree version. This is based on tools-system-libaio.diff from the Debian packaging although I have made it optional (but default on). Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* Update QEMU_TAGIan Jackson2011-11-221-3/+3
|
* tools/check: check for headers and libraries in user defined folders.Roger Pau Monne2011-11-141-0/+3
| | | | | | | | | Parse EXTRA_INCLUDES, EXTRA_LIB, PREPEND_INCLUDES, PREPEND_LIB, APPEND_INCLUDES, APPEND_LIB during checks, to search for required files. Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools/build: Introduce {PREPEND,APPEND}_{LIB,INCLUDES}Roger Pau Monne2011-11-141-0/+4
| | | | | | | | | | | | | | | | | | | | | | | Create two new variables called APPEND_ and PREPEND_ to add compile flags at the beginning or at the end of the search path. Added a new semantic for user defined compile flags, here is the list of possible options: PREPEND_LIB: add libraries to the search path before xen (before xen installation folders). PREPEND_INCLUDES: add headers to the search path before xen (before xen installation folders). APPEND_LIB: add libraries to the search path at the end (after all xen installation folders have been added). APPEND_INCLUDES: add libraries to the search path at the end (after all xen installation folders have been added). EXTRA_INCLUDES and EXTRA_LIB can still be used, and they will have the same effect as PREPEND_INCLUDES and PREPEND_LIB. Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* Update QEMU_TAGIan Jackson2011-11-021-3/+3
|
* Config.mk: error out on non-absolute $(XEN_ROOT)Ian Campbell2011-10-071-0/+4
| | | | | Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Committed-by: Keir Fraser <keir@xen.org>
* QEMU_TAG updateIan Jackson2011-10-061-3/+3
|
* build: fix grep invocation in cc-optionsKeir Fraser2011-09-301-1/+1
| | | | | | | | | | | | | | Currently the build produces lots of Usage: grep [OPTION]... PATTERN [FILE]... Try `grep --help' for more information. This is due to the "grep -- $(2)" in cc-options. It seems that the default of reading stdin is disabled when using "--". I don't know if this is a bug in grep or how it is supposed to be but we can work around it by explicitly passing in "-" Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Committed-by: Keir Fraser <keir@xen.org>
* tools: Revert seabios and upstream qemu build changesIan Jackson2011-09-141-6/+9
| | | | | | | | | | | | | | | These have broken the build and it seems to be difficult to fix. So we will revert the whole lot for now, and await corrected patch(es). Revert "fix the build when CONFIG_QEMU is specified by the user" Revert "tools: fix permissions of git-checkout.sh" Revert "scripts/git-checkout.sh: Is not bash specific. Invoke with /bin/sh." Revert "Clone and build Seabios by default" Revert "Clone and build upstream Qemu by default" Revert "Rename ioemu-dir as qemu-xen-traditional-dir" Revert "Move the ioemu-dir-find shell script to an external file" Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
* Clone and build Seabios by defaultStefano Stabellini2011-09-131-9/+2
| | | | Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>