Commit Graph
413 Commits
Author SHA1 Message Date
Jan Beulich d708b695a3 update Xen version to 4.6.6 2017-07-06 09:04:28 +02:00
Ian Jackson ac4c5d4ddf QEMU_TAG update 2017-03-21 18:44:50 +00:00
Jan Beulich abb5a12915 update Xen version to 4.6.5 2017-03-07 17:19:05 +01:00
Ian Jackson e9fbb8eb83 QEMU_TAG update 2017-02-22 16:39:13 +00:00
Ian Jackson 7789292340 QEMU_TAG update 2016-12-07 16:54:20 +00:00
Ian Jackson 22f70a3edd QEMU_TAG update 2016-11-29 18:38:11 +00:00
Jan Beulich fa062b2b9a update Xen version to 4.6.4 2016-11-04 12:33:10 +01:00
Ian Jackson 245fa11021 QEMU_TAG update 2016-09-20 16:37:08 +01:00
Jan Beulich 285248d91b update Xen version to 4.6.3
Skipping 4.6.2 due to qemu changes having become necessary after that
tree had got tagged already.
2016-06-20 14:08:22 +02:00
Ian Jackson c68f2364d5 QEMU_UPSTREAM_REVISION update.
Update to what we hope to make a stable release of soon.  Includes
XSA-180 fix and Ubuntu build fix.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
2016-06-14 18:34:13 +01:00
Ian Jackson 402c25dc12 QEMU_UPSTREAM_REVISION update
This commit id is equivalent to qemu-xen-4.6.2
2016-06-10 17:32:12 +01:00
Ian Jackson 88f863194f QEMU_TAG update 2016-06-10 11:53:51 +01:00
Ian Jackson 08d0ba6ed1 QEMU_TAG update 2016-06-07 17:05:33 +01:00
Wei Liu aa3cdb6cb6 Config.mk: update mini-os changeset
Patches pulled in:
    lib/sys.c: enclose file_types in define guards
    build: change MINI-OS_ROOT to MINIOS_ROOT

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
2016-05-18 12:29:52 +02:00
Ian Jackson 426783e661 Update QEMU_UPSTREAM_REVISION 2016-05-10 19:19:36 +01:00
Ian Jackson 8919e76cce QEMU_TAG update 2016-05-10 19:15:38 +01:00
Ian Jackson 5f05c100ca QEMU_TAG update 2016-05-10 18:58:50 +01:00
Ian Jackson ff4357574c QEMU_TAG update 2016-05-10 18:58:08 +01:00
Wei Liu b4030b89b3 Config.mk: update mini-os commit
Backport several fixes to mini-os in order to fix stubdom in 4.6.

Patches pulled in:

xenbus: notify the other end when necessary
Mini-OS: netfront: fix off-by-one error introduced in 7c8f3483
Clean arch/x86/time.c
Fix time update

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
2016-05-09 16:29:53 +02:00
Jan Beulich d77bac5c06 update Xen version to 4.6.1 2016-02-09 15:44:19 +01:00
Wei Liu 1d3cc6e62c Config.mk: update OVMF changeset
The new osstest tested head contains a fix for gcc-4.4 toolchain.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
(cherry picked from commit f046e501bb)

This should have been folded into the previous commit.

Conflicts:
	Config.mk

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
2016-01-07 15:46:03 +00:00
Wei Liu 6c3c6ff9ec Config.mk: update OVMF changeset
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

(cherry picked from commit 04c5efb0a1)

Apropos of discussion in
 "OVMF related osstest failures on multiple branches"
 http://lists.xenproject.org/archives/html/xen-devel/2016-01/msg00442.html

We believe the older ovmf.git does not work when built with the gcc in
Debian jessie.  We do not know where this bug lies but we are fixing
it by updating ovmf.

We have decided that we are not in a position to review the changes to
OVMF upstream, and ourselves decide what to cherry pick.  Instead we
will update the revision wholesale and use the xen.git stable
branches' push gate.

Conflicts:
	Config.mk

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
2016-01-07 15:30:44 +00:00
Ian Jackson 828ac175e5 QEMU_TAG update 2016-01-04 15:35:54 +00:00
Ian Jackson cdd96b9be5 QEMU_TAG update 2015-12-18 14:57:01 +00:00
Ian Jackson 564c79d48c QEMU_TAG update 2015-12-09 11:49:59 +00:00
Ian Campbell 78833c0425 Config: Switch to unified qemu trees.
Upstream qemu is now in qemu-xen.git and the trad fork is in
qemu-xen-traditional.git.

QEMU_UPSTREAM_REVISION is currently a tag and
QEMU_TRADITIONAL_REVISION is a specific revision, so no changes are
required to those.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

Conflicts:
	Config.mk
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
2015-11-18 17:05:28 +00:00
Ian Jackson 40d7a74548 QEMU_TAG update 2015-10-29 15:22:50 +00:00
Ian Jackson 605542411f Update MINIOS_UPSTREAM_REVISION to final 4.6.0 tag
No effective change: this tag refers to the commit whose id is being
removed.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
2015-10-05 15:28:48 +01:00
Ian Jackson b30720fcef Update QEMU_*_REVISION to final 4.6.0 tags
No effective change: these tags refer to the commits whose ids are
being removed.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
2015-10-05 15:22:44 +01:00
Ian Jackson e275fbcbe9 QEMU_UPSTREAM_REVISION update
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
2015-09-29 11:49:34 +01:00
Ian Jackson 0b6d907c5a QEMU_TAG update 2015-09-11 11:18:27 +01:00
Ian Jackson cb5599f7fa Config.mk: Non-debug build by default.
Set debug ?= n, in preperation for late RCs and eventual release.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
CC: Wei Liu <wei.liu2@citrix.com>
2015-09-09 16:22:39 +01:00
Ian Jackson 8d7fee3ac2 Branch for 4.6: Update QEMU references
Refer to the 4.6-testing versions of all these.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
2015-09-09 13:08:15 +01:00
Ian Jackson f843657642 Update QEMU_UPSTREAM_REVISION for rc3
As requested by Wei.
2015-09-01 18:24:57 +01:00
Ian Jackson 801ab48e55 QEMU_TAG update 2015-08-28 16:01:55 +01:00
Ian Jackson 145a8004a7 Update QEMU_UPSTREAM_REVISION for 4.6 RC1
When we make RC1 we arrange to get a specific version of
qemu-xen-upstream.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
CC: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
2015-08-11 15:39:25 +01:00
Ian Jackson 217a91b94e Update QEMU_TRADITIONAL_REVISION for 4.6 RC1
(We will not necessarily bump this tag number for future RCs, unless
something has changed in qemu-xen-traditional.)

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
2015-08-11 15:39:25 +01:00
Ian Jackson 9bec4b89b0 QEMU_TAG update 2015-07-29 16:32:48 +01:00
Ian Campbell 9379af08cc stubdom: vtpmmgr: Correctly format size_t with %z when printing.
Also contains a fix from Thomas Leonard (to use %u for "4 + 32", not
%lu) previously posted as part of "mini-os: enable compiler check for
printk format types" but with mini-os now having been split a separate
repo most of that change has been applied there.

This fixes the 32-bit build with updated mini-os which includes format
string checking.

Signed-off-by: Thomas Leonard <talex5@gmail.com>
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Daniel De Graaf <dgdegra@tycho.nsa.gov>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>
Acked-By: Samuel Thibault <samuel.thibault@ens-lyon.org>
[ ijc -- Updated MINIOS_UPSTREAM_REVISION ]
2015-07-03 11:11:28 +01:00
Wei Liu 28e5d9a9ad Config.mk: update in-tree OVMF changeset
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
2015-06-30 16:16:47 +01:00
Ian Campbell 46bc4edd8c Update to SeaBIOS rel-1.8.2
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
2015-06-26 12:56:59 +01:00
Ian Jackson 6b444c8e1c QEMU_TAG update 2015-06-23 11:42:28 +01:00
Ian Jackson 7c9a93a013 QEMU_TAG update 2015-06-09 16:21:43 +01:00
Ian Jackson d6b6bd8374 QEMU_TAG update 2015-05-27 16:54:07 +01:00
Olaf Hering bf36d07920 tools: add configure --with-dumpdir=DIR option
The current base directory /var/xen/dump for domU dumps will be patched
to /var/lib/xen/dump by most distros to follow FHS.

This change does three things:
 - change the default from /var/xen/dump to /var/lib/xen/dump
 - provide a configure option to avoid patching the source.
 - update docs to refer to the new default location

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
[ ijc -- s,/var,LOCALSTATEDIR, in help test, ran autogen.sh ]
2015-05-21 15:57:26 +01:00
Olaf Hering 93790b1c38 tools: replace private LIBDIR with automake libdir
Reuse automake variable instead of inventing a private variable.

The result of this command:
 git grep -wnl LIBDIR | xargs sed -i 's@LIBDIR@libdir@g'

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
2015-05-21 15:12:11 +01:00
Olaf Hering 7f5f57b466 tools: replace private PREFIX with automake prefix
Reuse automake variable instead of inventing a private variable.

Only qemu-traditional expects PREFIX in environment, which is provided
by buildmakevars2shellvars.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
2015-05-21 15:12:10 +01:00
Olaf Hering 8db2e4bab2 tools: replace private BINDIR with automake bindir
Reuse automake variable instead of inventing a private variable.

The result of this command:
 git grep -wnl BINDIR | xargs sed -i 's@BINDIR@bindir@g'

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
Cc: George Dunlap <george.dunlap@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
2015-05-21 15:12:10 +01:00
Olaf Hering 8e986e5a61 tools: replace private SBINDIR with automake sbindir
Reuse automake variable instead of inventing a private variable.

The result of this command:
 git grep -wnl SBINDIR | xargs sed -i 's@SBINDIR@sbindir@g'

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
Cc: Mukesh Rathor <mukesh.rathor@oracle.com>
Cc: Tim Deegan <tim@xen.org>
Cc: Daniel De Graaf <dgdegra@tycho.nsa.gov>
Cc: David Scott <dave.scott@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
2015-05-21 15:12:10 +01:00
Ian Jackson 5d4c0952f8 Config.mk: Fix (and, effectively, update) QEMU_TAG
In 952944f7 "QEMU_TAG update" my tag update script mangled the
machinery which sets QEMU_TRADITIONAL_REVISION, by replacing the first
assignment to QEMU_TRADITIONAL_REVISION it found rather than the one
which ought to have been replaced.

The result was that:
 * From that commit on, QEMU_TAG was no longer honoured although
   QEMU_TRADITIONAL_REVISION still was
 * That particular update to QEMU_TRADITIONAL_REVISION's default
   value was effective
 * The next attempt to update QEMU_TRADITIONAL_REVISION, in
   1fc3aeb3 "libxl: use new QEMU xenstore protocol" was totally
   ineffective.

Fix this by restoring the transfer from QEMU_TAG.  The effects are:
 * Once more, honour QEMU_TAG.
 * Belatedly apply the qemu-trad change part of "libxl: use new QEMU
   xenstore protocol.

(I have also fixed my script to not do this again.)

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
CC: Wei Liu <wei.liu2@citrix.com>
CC: Ian Campbell <ian.campbell@citrix.com>
CC: George Dunlap <george.dunlap@eu.citrix.com>
CC: Jan Beulich <jbeulich@suse.com>
Reported-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
2015-04-21 14:46:35 +01:00