summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2024-03-15 03:23:21 +0000
committerBruce Ashfield <bruce.ashfield@gmail.com>2024-03-15 17:17:20 +0000
commit25c9c87cce1f4189496be95baa5ec1995eae61e2 (patch)
treed35a0e6a27ed25b695f806100949eff62e3c636b
parenta0a41ec5eda2c3bcd529cc93f80ca02ec295db3d (diff)
downloadmeta-virtualization-25c9c87cce1f4189496be95baa5ec1995eae61e2.tar.gz
xen-tools/4.18: update to -tip
Drop upstreamed patch, otherwise, no other changes. Bumping xen to version RELEASE-4.18.0-71-g4da8ca9cb9, which comprises the following commits: 4da8ca9cb9 x86: protect conditional lock taking from speculative execution e107a8ece7 x86/mm: add speculation barriers to open coded locks 9de8a52b0e locking: attempt to ensure lock wrappers are always inline 5a13c81542 percpu-rwlock: introduce support for blocking speculation into critical regions e7f0f11c88 rwlock: introduce support for blocking speculation into critical regions 1932973ac9 x86/spinlock: introduce support for blocking speculation into critical regions bdda600406 xen: Swap order of actions in the FREE*() macros 908cbd1893 x86/spec-ctrl: Mitigation Register File Data Sampling fb85a8fc91 x86/spec-ctrl: VERW-handling adjustments b7205fc1cb x86/spec-ctrl: Rename VERW related options 95dd34fdbe x86/spec-ctrl: Perform VERW flushing later in exit paths 9f89ec65fb x86/vmx: Perform VERW flushing later in the VMExit path b91c253e81 x86: Resync intel-family.h from Linux fe1869a569 x86/entry: Introduce EFRAME_* constants a96d2d4355 x86/mm: fix detection of last L1 entry in modify_xen_mappings_lite() 4c84fa6cb6 hvmloader/PCI: skip huge BARs in certain calculations fd7cb7a1d0 x86/cpu-policy: Allow for levelling of VERW side effects 75221fb0f8 x86/altcall: always use a temporary parameter stashing variable 267845a838 libxl: Fix segfault in device_model_spawn_outcome e9516b73e7 xen/livepatch: properly build the noapply and norevert tests d81bfc7ff8 xen/livepatch: fix norevert test attempt to open-code revert 50a8f74df7 xen/livepatch: search for symbols in all loaded payloads 5382a6a79c xen/livepatch: register livepatch regions when loaded 7404c25efd x86/spec: do not print thunk option selection if not built-in 09b9db0413 x86/spec: fix INDIRECT_THUNK option to only be set when build-enabled b7f9168878 x86/spec: print the built-in SPECULATIVE_HARDEN_* options 57f1370536 xen/sched: Fix UB shift in compat_set_timer_op() 3e383bb413 x86/HVM: hide SVM/VMX when their enabling is prohibited by firmware 498b3624d0 xen/arm: Fix UBSAN failure in start_xen() 58bb811510 x86: account for shadow stack in exception-from-stub recovery 4d47dca20d x86/spec: fix BRANCH_HARDEN option to only be set when build-enabled 19fd9ff998 x86/altcall: use a union as register type for function parameters on clang f6e5ab5fa7 xen/cmdline: fix printf format specifier in no_config_param() 33a0368d3b xen/livepatch: fix norevert test hook setup typo a751d1321f x86emul: add missing EVEX.R' checks 5fda826414 build: make sure build fails when running kconfig fails 489c2b9ba1 libxl: Disable relocating memory for qemu-xen in stubdomain too 006764b871 build: Replace `which` with `command -v` 59e6ad6597 x86/HVM: tidy state on hvmemul_map_linear_addr()'s error path b51fd78aed x86/hvm: Fix fast singlestep state persistence 16475909ba block-common: Fix same_vm for no targets fa9950a527 amd-vi: fix IVMD memory type checks 184d723e7a tools/xentop: fix sorting bug for some columns b1fdd7d0e4 x86/ucode: Fix stability of the raw CPU Policy rescan 295ab8060d x86/p2m-pt: fix off by one in entry check assert 579a622eb4 lib{fdt,elf}: move lib{fdt,elf}-temp.o and their deps to $(targets) 00550e808c x86/vmx: Disallow the use of inactivity states 4cc0f88c42 x86/vmx: Fix IRQ handling for EXIT_REASON_INIT 6ccf064b0c x86/intel: ensure Global Performance Counter Control is setup correctly b26c30a408 CirrusCI: drop FreeBSD 12 62b3d7f8e4 x86/amd: Extend CPU erratum #1474 fix to more affected models c7ac596a57 VT-d: Fix "else" vs "#endif" misplacement 637da04812 pci: fail device assignment if phantom functions cannot be assigned 1792d1723b x86/x2apic: introduce a mixed physical/cluster mode a4f3f5a62c xen/arm: page: Avoid pointer overflow on cache clean & invalidate 48eb9e9199 xen/sched: fix sched_move_domain() a56d598e13 Only compile the hypervisor with -Wdeclaration-after-statement 25b7f9ed0f xen/domain: fix error path in domain_create() 5ac87c8afd xen/sched: fix adding offline cpu to cpupool 18f900b77b x86emul: avoid triggering event related assertions 3af9d1cbb6 tools/xg: Fix potential memory leak in cpu policy getters/setters 61d032e322 xen/x86: In x2APIC mode, derive LDR from APIC ID 480168fcb3 livepatch: do not use .livepatch.funcs section to store internal state 90a6d82175 x86/mem_sharing: Release domain if we are not able to enable memory sharing 3f9390fea5 xen/sched: fix sched_move_domain() 40bfa9dd57 x86/spec-ctrl: Add SRSO whitepaper URL fcb1016bbd x86/i8259: do not assume interrupts always target CPU0 9e8edd4c75 x86/x2apic: remove usage of ACPI_FADT_APIC_CLUSTER 880e06fdea x86/pv-shim: fix grant table operations for 32-bit guests 52be29df79 x86/mem_sharing: add missing m2p entry when mapping shared_info page 02f8d0adfb update Xen version to 4.18.1-pre d75f1e9b74 SUPPORT.md: Update release notes URL Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r--recipes-extended/xen/files/0001-Config.mk-drop-Wdeclaration-after-statement.patch42
-rw-r--r--recipes-extended/xen/xen-tools_4.18.bb3
2 files changed, 1 insertions, 44 deletions
diff --git a/recipes-extended/xen/files/0001-Config.mk-drop-Wdeclaration-after-statement.patch b/recipes-extended/xen/files/0001-Config.mk-drop-Wdeclaration-after-statement.patch
deleted file mode 100644
index dcfffb06..00000000
--- a/recipes-extended/xen/files/0001-Config.mk-drop-Wdeclaration-after-statement.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From 70e8b986fe78f5fbd1dfdef4f02ea9b50c7158db Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Tue, 28 Nov 2023 18:34:17 +0100
4Subject: [PATCH] Config.mk: drop -Wdeclaration-after-statement
5
6Such constructs are fully allowed by C99:
7https://gcc.gnu.org/onlinedocs/gcc-12.2.0/gcc/Mixed-Labels-and-Declarations.html#Mixed-Labels-and-Declarations
8
9If the flag is present, then building against python 3.12 will fail thusly:
10
11| In file included from /srv/storage/alex/yocto/build-virt/tmp/work/core2-64-poky-linux/xen-tools/4.17+stable/recipe-sysroot/usr/include/python3.12/Python.h:44,
12| from xen/lowlevel/xc/xc.c:8:
13| /srv/storage/alex/yocto/build-virt/tmp/work/core2-64-poky-linux/xen-tools/4.17+stable/recipe-sysroot/usr/include/python3.12/object.h: In function 'Py_SIZE':
14| /srv/storage/alex/yocto/build-virt/tmp/work/core2-64-poky-linux/xen-tools/4.17+stable/recipe-sysroot/usr/include/python3.12/object.h:233:5: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
15| 233 | PyVarObject *var_ob = _PyVarObject_CAST(ob);
16| | ^~~~~~~~~~~
17| In file included from /srv/storage/alex/yocto/build-virt/tmp/work/core2-64-poky-linux/xen-tools/4.17+stable/recipe-sysroot/usr/include/python3.12/Python.h:53:
18| /srv/storage/alex/yocto/build-virt/tmp/work/core2-64-poky-linux/xen-tools/4.17+stable/recipe-sysroot/usr/include/python3.12/cpython/longintrepr.h: In function '_PyLong_CompactValue':
19| /srv/storage/alex/yocto/build-virt/tmp/work/core2-64-poky-linux/xen-tools/4.17+stable/recipe-sysroot/usr/include/python3.12/cpython/longintrepr.h:121:5: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
20| 121 | Py_ssize_t sign = 1 - (op->long_value.lv_tag & _PyLong_SIGN_MASK);
21| | ^~~~~~~~~~
22| cc1: all warnings being treated as errors
23
24Upstream-Status: Submitted [by email to xen-devel@lists.xenproject.org and maintainers printed by get_maintainer.pl]
25Signed-off-by: Alexander Kanavin <alex@linutronix.de>
26---
27 Config.mk | 2 --
28 1 file changed, 2 deletions(-)
29
30diff --git a/Config.mk b/Config.mk
31index 8bc2bcd5f6..09d5e8ebde 100644
32--- a/Config.mk
33+++ b/Config.mk
34@@ -173,8 +173,6 @@ CFLAGS += -std=gnu99
35
36 CFLAGS += -Wall -Wstrict-prototypes
37
38-$(call cc-option-add,HOSTCFLAGS,HOSTCC,-Wdeclaration-after-statement)
39-$(call cc-option-add,CFLAGS,CC,-Wdeclaration-after-statement)
40 $(call cc-option-add,CFLAGS,CC,-Wno-unused-but-set-variable)
41 $(call cc-option-add,CFLAGS,CC,-Wno-unused-local-typedefs)
42
diff --git a/recipes-extended/xen/xen-tools_4.18.bb b/recipes-extended/xen/xen-tools_4.18.bb
index 9920c358..5dbe180a 100644
--- a/recipes-extended/xen/xen-tools_4.18.bb
+++ b/recipes-extended/xen/xen-tools_4.18.bb
@@ -1,5 +1,5 @@
1# tag: RELEASE-4.18.0 1# tag: RELEASE-4.18.0
2SRCREV ?= "d75f1e9b74314cea91ce435730d4e3539ecca77d" 2SRCREV ?= "4da8ca9cb9cfdb92c9dd09d5270ae16a3b2dbc89"
3 3
4XEN_REL ?= "4.18" 4XEN_REL ?= "4.18"
5XEN_BRANCH ?= "stable-4.18" 5XEN_BRANCH ?= "stable-4.18"
@@ -7,7 +7,6 @@ XEN_BRANCH ?= "stable-4.18"
7SRC_URI = " \ 7SRC_URI = " \
8 git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \ 8 git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \
9 file://0001-python-pygrub-pass-DISTUTILS-xen-4.18.patch \ 9 file://0001-python-pygrub-pass-DISTUTILS-xen-4.18.patch \
10 file://0001-Config.mk-drop-Wdeclaration-after-statement.patch \
11 " 10 "
12 11
13LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9" 12LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"