xen: bump to version 4.9.1

PATCH New Peter Korsgaard 3 participants 9 messages Jan 14, 2018 – Jan 18, 2018

lore

Share & tools

lore

Peter Korsgaard

author

2018-01-14 22:47 UTC #0 lore raw

PATCH 1/1 xen: bump to version 4.9.1

Drop 0003-tools-libxc-xc_dom_arm-add-missing-variable-initiali.patch as that is now upstream:

https://xenbits.xenproject.org/gitweb/?p=xen.git;a=commit;h=88bfbf90e35f1213f9967a97dee0b2039f9998a4

Drop security patches as 4.9.1 includes up to xsa-245.

Signed-off-by Peter Korsgaard <[email protected]>

---
 ...-xc_dom_arm-add-missing-variable-initiali.patch | 41 ----------------------
 package/xen/xen.hash                               | 13 +------
 package/xen/xen.mk                                 | 15 +-------
 3 files changed, 2 insertions(+), 67 deletions(-)
 delete mode 100644 package/xen/0003-tools-libxc-xc_dom_arm-add-missing-variable-initiali.patch

package/xen/0003-tools-libxc-xc_dom_arm-add-missing-variable-initiali.patch deleted +0 ~~-41~~

deleted file mode 100644
index e8d4b32f50..0000000000
@@ -1,41 +0,0 @@
-From d4eece000391583a6e32a225d7eb5b573a5c5565 Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <[email protected]>
-Date: Sat, 19 Aug 2017 15:22:58 +0200
-Subject: [PATCH] tools/libxc/xc_dom_arm: add missing variable initialization
-
-The variable domctl.u.address_size.size may remain uninitialized if
-guest_type is not one of xen-3.0-aarch64 or xen-3.0-armv7l. And the
-code precisely checks if this variable is still 0 to decide if the
-guest type is supported or not.
-
-This fixes the following build failure with gcc 7.x:
-
-xc_dom_arm.c:229:31: error: 'domctl.u.address_size.size' may be used uninitialized in this function [-Werror=maybe-uninitialized]
-     if ( domctl.u.address_size.size == 0 )
-
-Patch originally taken from
-https://www.mail-archive.com/xen-devel at lists.xen.org/msg109313.html.
-
-Signed-off-by: Bernd Kuhls <[email protected]>
-[Thomas: improved commit log, reformatted with Git.]
-Signed-off-by: Thomas Petazzoni <[email protected]>
----
- tools/libxc/xc_dom_arm.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tools/libxc/xc_dom_arm.c b/tools/libxc/xc_dom_arm.c
-index e7d4bd0..e669fb0 100644
---- a/tools/libxc/xc_dom_arm.c
-+++ b/tools/libxc/xc_dom_arm.c
-@@ -223,6 +223,8 @@ static int set_mode(xc_interface *xch, domid_t domid, char *guest_type)
- 
-     domctl.domain = domid;
-     domctl.cmd    = XEN_DOMCTL_set_address_size;
-+    domctl.u.address_size.size = 0;
-+
-     for ( i = 0; i < ARRAY_SIZE(types); i++ )
-         if ( !strcmp(types[i].guest, guest_type) )
-             domctl.u.address_size.size = types[i].size;
--- 
-2.9.4
-

package/xen/xen.hash +1 ~~-12~~

index 4a44d7a6d1..fcd4e85f45 100644
@@ -1,13 +1,2 @@
 # Locally computed
-sha256 cade643fe3310d4d6f97d0c215c6fa323bc1130d7e64d7e2043ffaa73a96f33b xen-4.9.0.tar.gz
-sha256 b09e07aaf422ae04a4ece5e2c5b5e54036cfae5b5c632bfc6953a0cacd6f60ff xsa226.patch
-sha256 9923a47e5f86949800887596f098954a08ef73a01d74b1dbe16cab2e6b1fabb2 xsa227.patch
-sha256 1979e111442517891b483e316a15a760a4c992ac4440f95e361ff12f4bebff62 xsa228.patch
-sha256 77a73f1c32d083e315ef0b1bbb119cb8840ceb5ada790cad76cbfb9116f725cc xsa230.patch
-sha256 71a53a5133c8d4e381dd0e3e54205d31dea545ab62b261084dd3aea140f88cad xsa231-4.9.patch
-sha256 5068a78293daa58557c30c95141b775becfb650de6a5eda0d82a4a321ced551c xsa232.patch
-sha256 f721cc49ba692b2f36299b631451f51d7340b8b4732f74c98f01cb7a80d8662b xsa233.patch
-sha256 213f9d81a4ab785db67b9f579c9e88c9c8586c46b93f466a309060750df2df32 xsa234-4.9.patch
-sha256 d8f012734fbf6019c1ff864744e308c41dfb9c7804ca3be2771c2c972cdf4bd5 xsa235-4.9.patch
-sha256 526f9e1b127fbb316762ce8e8f4563bc9de0c55a1db581456a3017d570d35bdd 0001-xen-page_alloc-Cover-memory-unreserved-after-boot-in.patch
-sha256 7164010112fcccd9cd88e72ace2eeabdb364dd6f4d05c434686267d18067f420 0002-xen-arm-Correctly-report-the-memory-region-in-the-du.patch
+sha256 ecf88b01f44cd8f4ef208af3f999dceb69bdd2a316d88dd9a9535ea7b49ed356 xen-4.9.1.tar.gz

package/xen/xen.mk +1 ~~-14~~

index e07389e209..d31185914c 100644
@@ -4,21 +4,8 @@
 #
 ################################################################################
 
-XEN_VERSION = 4.9.0
+XEN_VERSION = 4.9.1
 XEN_SITE = https://downloads.xenproject.org/release/xen/$(XEN_VERSION)
-XEN_PATCH = \
-	https://xenbits.xenproject.org/xsa/xsa226.patch \
-	https://xenbits.xenproject.org/xsa/xsa227.patch \
-	https://xenbits.xenproject.org/xsa/xsa228.patch \
-	https://xenbits.xenproject.org/xsa/xsa230.patch \
-	https://xenbits.xenproject.org/xsa/xsa231-4.9.patch \
-	https://xenbits.xenproject.org/xsa/xsa232.patch \
-	https://xenbits.xenproject.org/xsa/xsa233.patch \
-	https://xenbits.xenproject.org/xsa/xsa234-4.9.patch \
-	https://xenbits.xenproject.org/xsa/xsa235-4.9.patch \
-	https://xenbits.xenproject.org/xsa/xsa245/0001-xen-page_alloc-Cover-memory-unreserved-after-boot-in.patch \
-	https://xenbits.xenproject.org/xsa/xsa245/0002-xen-arm-Correctly-report-the-memory-region-in-the-du.patch
-
 XEN_LICENSE = GPL-2.0
 XEN_LICENSE_FILES = COPYING
 XEN_DEPENDENCIES = host-acpica host-python

Signature · 1 line

2.11.0

Peter Korsgaard

author

2018-01-15 20:00 UTC #1 lore raw

PATCH 1/1 xen: bump to version 4.9.1

Quoted 10 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Peter" == Peter Korsgaard <[email protected]> writes:
Drop 0003-tools-libxc-xc_dom_arm-add-missing-variable-initiali.patch as that is now upstream:
https://xenbits.xenproject.org/gitweb/?p=xen.git;a=commit;h=88bfbf90e35f1213f9967a97dee0b2039f9998a4
Drop security patches as 4.9.1 includes up to xsa-245.
Signed-off-by Peter Korsgaard <[email protected]>

Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Matthew Weber

2018-01-16 14:18 UTC #2 lore raw

PATCH 1/1 xen: bump to version 4.9.1

In reply to Peter Korsgaard

Peter,

Quoted 7 lines · Peter Korsgaard

Drop 0003-tools-libxc-xc_dom_arm-add-missing-variable-initiali.patch as that is now upstream:
https://xenbits.xenproject.org/gitweb/?p=xen.git;a=commit;h=88bfbf90e35f1213f9967a97dee0b2039f9998a4
Drop security patches as 4.9.1 includes up to xsa-245.

I ran it through test-pkg and that looked good.

I also did a build against the autobuilder failure below. Looks like that failure is still present.
http://autobuild.buildroot.net/results/8bcb80dc93d38bb38ca32ad93d52c22d1176d57e/

Tested-by Matt Weber <[email protected]>

Peter Korsgaard

author

2018-01-16 15:50 UTC #3 lore raw

PATCH 1/1 xen: bump to version 4.9.1

Quoted 7 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Matthew" == Matthew Weber <[email protected]> writes:
Peter,
Quoted 3 lines · Peter Korsgaard
Drop 0003-tools-libxc-xc_dom_arm-add-missing-variable-initiali.patch as that is now upstream:

Quoted 6 lines

Quoted 4 lines
https://xenbits.xenproject.org/gitweb/?p=xen.git;a=commit;h=88bfbf90e35f1213f9967a97dee0b2039f9998a4
Drop security patches as 4.9.1 includes up to xsa-245.
I ran it through test-pkg and that looked good.

Thanks!

Quoted 3 lines

I also did a build against the autobuilder failure below. Looks like that failure is still present.
http://autobuild.buildroot.net/results/8bcb80dc93d38bb38ca32ad93d52c22d1176d57e/

Hmm, it looks like the embedded qemu copy picks up sdl2, which it probably shouldn't (or we should atleast handle the dependencies correctly).

Signature · 1 line

Bye, Peter Korsgaard

Matthew Weber

2018-01-17 22:40 UTC #4 lore raw

PATCH 1/1 xen: bump to version 4.9.1

Peter, all,

Quoted 16 lines · Peter Korsgaard

Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Matthew" == Matthew Weber <[email protected]> writes:
Peter,
Quoted 3 lines · Peter Korsgaard
Drop 0003-tools-libxc-xc_dom_arm-add-missing-variable-initiali.patch as that is now upstream:
Quoted 6 lines
Quoted 4 lines
https://xenbits.xenproject.org/gitweb/?p=xen.git;a=commit;h=88bfbf90e35f1213f9967a97dee0b2039f9998a4
Drop security patches as 4.9.1 includes up to xsa-245.
I ran it through test-pkg and that looked good.
Thanks!

Quoted 8 lines

Quoted 3 lines
I also did a build against the autobuilder failure below. Looks like that failure is still present.
http://autobuild.buildroot.net/results/8bcb80dc93d38bb38ca32ad93d52c22d1176d57e/
Hmm, it looks like the embedded qemu copy picks up sdl2, which it probably shouldn't (or we should atleast handle the dependencies correctly).

Should we by default force SDL to be turned on for xen tools, explicitly disable or make it optional? I can see some additional patches to make their --disable-sdl work vs fixing the include paths to formally --enable-sdl.

A second item, I realized with sdl2 is that its another package which pollutes the sysroot pkg-config with host build paths. I'll be preparing a target-finalize patch which checks for these bad paths

Matt

Peter Korsgaard

author

2018-01-18 16:42 UTC #5 lore raw

PATCH 1/1 xen: bump to version 4.9.1

Quoted 1 line

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Matthew" == Matthew Weber <[email protected]> writes:

Hi,

Quoted 9 lines

Quoted 4 lines
Hmm, it looks like the embedded qemu copy picks up sdl2, which it probably shouldn't (or we should atleast handle the dependencies correctly).
Should we by default force SDL to be turned on for xen tools, explicitly disable or make it optional? I can see some additional patches to make their --disable-sdl work vs fixing the include paths to formally --enable-sdl.

As long as it is optional, it shouldn't be forced on - So we should atleast explicitly disable it, but it would naturally be nicer to enable support if sdl2 is enabled.

Quoted 3 lines

A second item, I realized with sdl2 is that its another package which pollutes the sysroot pkg-config with host build paths. I'll be preparing a target-finalize patch which checks for these bad paths

Thanks!

Signature · 1 line

Bye, Peter Korsgaard

Alistair Francis

2018-01-18 18:04 UTC #6 lore raw

PATCH 1/1 xen: bump to version 4.9.1

Quoted 9 lines · Peter Korsgaard

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Matthew" == Matthew Weber <[email protected]> writes:
Hi,
Quoted 4 lines
Quoted 4 lines
Hmm, it looks like the embedded qemu copy picks up sdl2, which it probably shouldn't (or we should atleast handle the dependencies correctly).

Quoted 8 lines

Quoted 4 lines
Should we by default force SDL to be turned on for xen tools, explicitly disable or make it optional? I can see some additional patches to make their --disable-sdl work vs fixing the include paths to formally --enable-sdl.
As long as it is optional, it shouldn't be forced on - So we should atleast explicitly disable it, but it would naturally be nicer to enable support if sdl2 is enabled.

I dug into this a bit as well.

A simple "--disable-sdl" in the QEMU config fixes the issue for 4.9.1 and 4.10.0 Xen release. As QEMU isn't used for Xen on ARM I think this is a suitable fix.

Alistair

Quoted 13 lines

Quoted 4 lines
A second item, I realized with sdl2 is that its another package which pollutes the sysroot pkg-config with host build paths. I'll be preparing a target-finalize patch which checks for these bad paths
Thanks!
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Matthew Weber

2018-01-18 18:09 UTC #7 lore raw

PATCH 1/1 xen: bump to version 4.9.1

Alistair,

Quoted 19 lines · Alistair Francis

Quoted 9 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Matthew" == Matthew Weber <[email protected]> writes:
Hi,
Quoted 4 lines
Quoted 4 lines
Hmm, it looks like the embedded qemu copy picks up sdl2, which it probably shouldn't (or we should atleast handle the dependencies correctly).
Quoted 8 lines
Quoted 4 lines
Should we by default force SDL to be turned on for xen tools, explicitly disable or make it optional? I can see some additional patches to make their --disable-sdl work vs fixing the include paths to formally --enable-sdl.
As long as it is optional, it shouldn't be forced on - So we should atleast explicitly disable it, but it would naturally be nicer to enable support if sdl2 is enabled.

Quoted 6 lines

I dug into this a bit as well.
A simple "--disable-sdl" in the QEMU config fixes the issue for 4.9.1 and 4.10.0 Xen release. As QEMU isn't used for Xen on ARM I think this is a suitable fix.

I tested that with a build where the SDL2 headers were already installed and the disable didn't seem to work when I added it after the build had failed. I'll try with a fresh build.

Matt

Alistair Francis

2018-01-18 18:34 UTC #8 lore raw

PATCH 1/1 xen: bump to version 4.9.1

Quoted 25 lines · Matthew Weber

Alistair,
Quoted 21 lines · Alistair Francis
Quoted 9 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Matthew" == Matthew Weber <[email protected]> writes:
Hi,
Quoted 4 lines
Quoted 4 lines
Hmm, it looks like the embedded qemu copy picks up sdl2, which it probably shouldn't (or we should atleast handle the dependencies correctly).
Quoted 8 lines
Quoted 4 lines
Should we by default force SDL to be turned on for xen tools, explicitly disable or make it optional? I can see some additional patches to make their --disable-sdl work vs fixing the include paths to formally --enable-sdl.
As long as it is optional, it shouldn't be forced on - So we should atleast explicitly disable it, but it would naturally be nicer to enable support if sdl2 is enabled.
I dug into this a bit as well.

Quoted 8 lines

Quoted 4 lines
A simple "--disable-sdl" in the QEMU config fixes the issue for 4.9.1 and 4.10.0 Xen release. As QEMU isn't used for Xen on ARM I think this is a suitable fix.
I tested that with a build where the SDL2 headers were already installed and the disable didn't seem to work when I added it after the build had failed. I'll try with a fresh build.

This diff fixes it for me:

commit 923f627733569952791edffb83eca0d587ff5f9c (HEAD -> alistair/xen-fixes)

Author: Alistair Francis <[email protected]>
Date:   Thu Jan 18 10:22:51 2018 -0800

package/xen: Force disable SDL for xen-qemu build

Signed-off-by Alistair Francis <[email protected]>

(quoted diff) +0 -0

b/package/xen/003-tools-Makefile-Force-disable-SDL-QEMU-build.patch new file mode 100644
index 0000000000..fbb096a96d

package/xen/003-tools-Makefile-Force-disable-SDL-QEMU-build.patch new file +25 -0

@@ -0,0 +1,25 @@
+From 2ee22ddc26d2153aece1793dc70e344ab051c4bc Mon Sep 17 00:00:00 2001
+From: Alistair Francis <[email protected]>
+Date: Thu, 18 Jan 2018 09:51:35 -0800
+Subject: [PATCH] tools/Makefile: Force disable SDL QEMU build
+
+Signed-off-by: Alistair Francis <[email protected]>
+---
+ tools/Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tools/Makefile b/tools/Makefile
+index ab7a01ee1b..de8d44c035 100644
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -274,6 +274,7 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
+               --datadir=$(SHAREDIR)/qemu-xen \
+               --localstatedir=$(localstatedir) \
+               --disable-kvm \
++              --disable-sdl \
+               --disable-docs \
+               --disable-guest-agent \
+               --python=$(PYTHON) \
+--
+2.14.1
+

Alistair

Quoted 6 lines

Matt
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot