Sync from SUSE:SLFO:Main xen revision 4d5e5d4e9a7a0dfde59c1d61df70884b

Sync from SUSE:SLFO:Main xen revision 8d29a7d10d60058ce13aa728041a2bc4
Sync from SUSE:SLFO:Main xen revision 4c1c9473a770d45c019a6b6be8512faa
2025-02-07 18:47:59 +01:00 · 2024-12-09 12:16:23 +01:00 · 2024-10-18 15:48:08 +02:00 · 2024-10-01 08:54:04 +02:00
34 changed files with 523 additions and 560 deletions
--- a/6617d62c-x86-hvm-Misra-Rule-19-1-regression.patch
+++ b/6617d62c-x86-hvm-Misra-Rule-19-1-regression.patch
@ -1,45 +0,0 @@
-# Commit d0a718a45f14b86471d8eb3083acd72760963470
-# Date 2024-04-11 13:23:08 +0100
-# Author Andrew Cooper <andrew.cooper3@citrix.com>
-# Committer Andrew Cooper <andrew.cooper3@citrix.com>
-x86/hvm: Fix Misra Rule 19.1 regression
-
-Despite noticing an impending Rule 19.1 violation, the adjustment made (the
-uint32_t cast) wasn't sufficient to avoid it.  Try again.
-
-Subsequently noticed by Coverity too.
-
-Fixes: 6a98383b0877 ("x86/HVM: clear upper halves of GPRs upon entry from 32-bit code")
-Coverity-IDs: 1596289 thru 1596298
-Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
-Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
-
--- a/xen/arch/x86/include/asm/hvm/hvm.h
-+++ b/xen/arch/x86/include/asm/hvm/hvm.h
-@@ -585,16 +585,16 @@ static inline void hvm_sanitize_regs_fie
-     if ( compat )
-     {
-         /* Clear GPR upper halves, to counteract guests playing games. */
-        regs->rbp = (uint32_t)regs->ebp;
-        regs->rbx = (uint32_t)regs->ebx;
-        regs->rax = (uint32_t)regs->eax;
-        regs->rcx = (uint32_t)regs->ecx;
-        regs->rdx = (uint32_t)regs->edx;
-        regs->rsi = (uint32_t)regs->esi;
-        regs->rdi = (uint32_t)regs->edi;
-        regs->rip = (uint32_t)regs->eip;
-        regs->rflags = (uint32_t)regs->eflags;
-        regs->rsp = (uint32_t)regs->esp;
-+        regs->rbp = (uint32_t)regs->rbp;
-+        regs->rbx = (uint32_t)regs->rbx;
-+        regs->rax = (uint32_t)regs->rax;
-+        regs->rcx = (uint32_t)regs->rcx;
-+        regs->rdx = (uint32_t)regs->rdx;
-+        regs->rsi = (uint32_t)regs->rsi;
-+        regs->rdi = (uint32_t)regs->rdi;
-+        regs->rip = (uint32_t)regs->rip;
-+        regs->rflags = (uint32_t)regs->rflags;
-+        regs->rsp = (uint32_t)regs->rsp;
-     }
- 
- #ifndef NDEBUG
--- a/bin-python3-conversion.patch
+++ b/bin-python3-conversion.patch
@ -1,50 +0,0 @@
-Index: xen-4.18.0-testing/tools/misc/xencov_split
-===================================================================
--- xen-4.18.0-testing.orig/tools/misc/xencov_split
-+++ xen-4.18.0-testing/tools/misc/xencov_split
-@@ -1,4 +1,4 @@
-#!/usr/bin/env python
-+#!/usr/bin/python3
- 
- from __future__ import print_function
- from builtins import str
-Index: xen-4.18.0-testing/tools/python/scripts/convert-legacy-stream
-===================================================================
--- xen-4.18.0-testing.orig/tools/python/scripts/convert-legacy-stream
-+++ xen-4.18.0-testing/tools/python/scripts/convert-legacy-stream
-@@ -1,4 +1,4 @@
-#!/usr/bin/env python
-+#!/usr/bin/python3
- # -*- coding: utf-8 -*-
- 
- """
-Index: xen-4.18.0-testing/tools/python/scripts/verify-stream-v2
-===================================================================
--- xen-4.18.0-testing.orig/tools/python/scripts/verify-stream-v2
-+++ xen-4.18.0-testing/tools/python/scripts/verify-stream-v2
-@@ -1,4 +1,4 @@
-#!/usr/bin/env python
-+#!/usr/bin/python3
- # -*- coding: utf-8 -*-
- 
- """ Verify a v2 format migration stream """
-Index: xen-4.18.0-testing/tools/xenmon/xenmon.py
-===================================================================
--- xen-4.18.0-testing.orig/tools/xenmon/xenmon.py
-+++ xen-4.18.0-testing/tools/xenmon/xenmon.py
-@@ -1,4 +1,4 @@
-#!/usr/bin/env python
-+#!/usr/bin/python3
- 
- #####################################################################
- # xenmon is a front-end for xenbaked.
-Index: xen-4.18.0-testing/tools/xentrace/xentrace_format
-===================================================================
--- xen-4.18.0-testing.orig/tools/xentrace/xentrace_format
-+++ xen-4.18.0-testing/tools/xentrace/xentrace_format
-@@ -1,4 +1,4 @@
-#!/usr/bin/env python
-+#!/usr/bin/python3
- 
- # by Mark Williamson, (C) 2004 Intel Research Cambridge
- 
--- a/build-python3-conversion.patch
+++ b/build-python3-conversion.patch
@ -1,7 +1,7 @@
-Index: xen-4.18.3-testing/Config.mk
+Index: xen-4.19.0-testing/Config.mk
 ===================================================================
--- xen-4.18.3-testing.orig/Config.mk
-+++ xen-4.18.3-testing/Config.mk
+--- xen-4.19.0-testing.orig/Config.mk
+++ xen-4.19.0-testing/Config.mk
@@ -77,7 +77,7 @@ EXTRA_INCLUDES += $(EXTRA_PREFIX)/includ
 EXTRA_LIB += $(EXTRA_PREFIX)/lib
 endif
@ -11,47 +11,34 @@ Index: xen-4.18.3-testing/Config.mk
 PYTHON_PREFIX_ARG ?= --prefix="$(prefix)"
 # The above requires that prefix contains *no spaces*. This variable is here
 # to permit the user to set PYTHON_PREFIX_ARG to '' to workaround this bug:
-Index: xen-4.18.3-testing/tools/configure
+Index: xen-4.19.0-testing/tools/configure
 ===================================================================
--- xen-4.18.3-testing.orig/tools/configure
-+++ xen-4.18.3-testing/tools/configure
-@@ -7382,15 +7382,15 @@ if test x"${PYTHONPATH}" = x"no"
+--- xen-4.19.0-testing.orig/tools/configure
+++ xen-4.19.0-testing/tools/configure
+@@ -8297,15 +8297,15 @@ if test x"${PYTHONPATH}" = x"no"
 then
     as_fn_error $? "Unable to find $PYTHON, please install $PYTHON" "$LINENO" 5
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for python version >= 2.6 " >&5
-$as_echo_n "checking for python version >= 2.6 ... " >&6; }
-`$PYTHON -c 'import sys; sys.exit(eval("sys.version_info < (2, 6)"))'`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for python3 version >= 3.0 " >&5
-+$as_echo_n "checking for python3 version >= 3.0 ... " >&6; }
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python version >= 2.7 " >&5
+-printf %s "checking for python version >= 2.7 ... " >&6; }
+-`$PYTHON -c 'import sys; sys.exit(eval("sys.version_info < (2, 7)"))'`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python version >= 3.0 " >&5
+printf %s "checking for python version >= 3.0 ... " >&6; }
 +`$PYTHON -c 'import sys; sys.exit(eval("sys.version_info < (3, 0)"))'`
 if test "$?" != "0"
 then
     python_version=`$PYTHON -V 2>&1`
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-    as_fn_error $? "$python_version is too old, minimum required version is 2.6" "$LINENO" 5
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ printf "%s\n" "no" >&6; }
+-    as_fn_error $? "$python_version is too old, minimum required version is 2.7" "$LINENO" 5
 +    as_fn_error $? "$python_version is too old, minimum required version is 3.0" "$LINENO" 5
 else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-Index: xen-4.18.3-testing/tools/configure.ac
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ printf "%s\n" "yes" >&6; }
+Index: xen-4.19.0-testing/tools/libs/light/idl.py
 ===================================================================
--- xen-4.18.3-testing.orig/tools/configure.ac
-+++ xen-4.18.3-testing/tools/configure.ac
-@@ -385,7 +385,7 @@ PYTHONPATH=$PYTHON
- PYTHON=`basename $PYTHONPATH`
- 
- AX_PATH_PROG_OR_FAIL([PYTHONPATH], [$PYTHON])
-AX_CHECK_PYTHON_VERSION([2], [6])
-+AX_CHECK_PYTHON_VERSION([3], [0])
- 
- AS_IF([test "$cross_compiling" != yes], [
-     AX_CHECK_PYTHON_DEVEL()
-Index: xen-4.18.3-testing/tools/libs/light/idl.py
-===================================================================
--- xen-4.18.3-testing.orig/tools/libs/light/idl.py
-+++ xen-4.18.3-testing/tools/libs/light/idl.py
+--- xen-4.19.0-testing.orig/tools/libs/light/idl.py
+++ xen-4.19.0-testing/tools/libs/light/idl.py
@@ -271,7 +271,7 @@ class KeyedUnion(Aggregate):
         if not isinstance(keyvar_type, Enumeration):
             raise ValueError
@ -79,123 +66,73 @@ Index: xen-4.18.3-testing/tools/libs/light/idl.py
         if isinstance(t, Type):
             globs[n] = t
         elif isinstance(t,type(object)) and issubclass(t, Type):
-Index: xen-4.18.3-testing/tools/libs/light/gentest.py
+Index: xen-4.19.0-testing/tools/libs/light/gentest.py
 ===================================================================
--- xen-4.18.3-testing.orig/tools/libs/light/gentest.py
-+++ xen-4.18.3-testing/tools/libs/light/gentest.py
+--- xen-4.19.0-testing.orig/tools/libs/light/gentest.py
+++ xen-4.19.0-testing/tools/libs/light/gentest.py
@@ -1,4 +1,4 @@
 -#!/usr/bin/python
 +#!/usr/bin/python3
 
 from __future__ import print_function
 
-Index: xen-4.18.3-testing/tools/libs/light/gentypes.py
+Index: xen-4.19.0-testing/tools/libs/light/gentypes.py
 ===================================================================
--- xen-4.18.3-testing.orig/tools/libs/light/gentypes.py
-+++ xen-4.18.3-testing/tools/libs/light/gentypes.py
+--- xen-4.19.0-testing.orig/tools/libs/light/gentypes.py
+++ xen-4.19.0-testing/tools/libs/light/gentypes.py
@@ -1,4 +1,4 @@
 -#!/usr/bin/python
 +#!/usr/bin/python3
 
 from __future__ import print_function
 
-Index: xen-4.18.3-testing/tools/include/xen-foreign/mkheader.py
+Index: xen-4.19.0-testing/tools/include/xen-foreign/mkheader.py
 ===================================================================
--- xen-4.18.3-testing.orig/tools/include/xen-foreign/mkheader.py
-+++ xen-4.18.3-testing/tools/include/xen-foreign/mkheader.py
+--- xen-4.19.0-testing.orig/tools/include/xen-foreign/mkheader.py
+++ xen-4.19.0-testing/tools/include/xen-foreign/mkheader.py
@@ -1,4 +1,4 @@
 -#!/usr/bin/python
 +#!/usr/bin/python3
 
 from __future__ import print_function
 
-Index: xen-4.18.3-testing/tools/include/xen-foreign/mkchecker.py
+Index: xen-4.19.0-testing/tools/include/xen-foreign/mkchecker.py
 ===================================================================
--- xen-4.18.3-testing.orig/tools/include/xen-foreign/mkchecker.py
-+++ xen-4.18.3-testing/tools/include/xen-foreign/mkchecker.py
+--- xen-4.19.0-testing.orig/tools/include/xen-foreign/mkchecker.py
+++ xen-4.19.0-testing/tools/include/xen-foreign/mkchecker.py
@@ -1,4 +1,4 @@
 -#!/usr/bin/python
 +#!/usr/bin/python3
 
 import sys;
 from structs import structs, compat_arches;
-Index: xen-4.18.3-testing/xen/tools/gen-cpuid.py
+Index: xen-4.19.0-testing/xen/tools/gen-cpuid.py
 ===================================================================
--- xen-4.18.3-testing.orig/xen/tools/gen-cpuid.py
-+++ xen-4.18.3-testing/xen/tools/gen-cpuid.py
+--- xen-4.19.0-testing.orig/xen/tools/gen-cpuid.py
+++ xen-4.19.0-testing/xen/tools/gen-cpuid.py
@@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
 import sys, os, re
-Index: xen-4.18.3-testing/xen/tools/compat-build-source.py
+Index: xen-4.19.0-testing/xen/tools/compat-build-source.py
 ===================================================================
--- xen-4.18.3-testing.orig/xen/tools/compat-build-source.py
-+++ xen-4.18.3-testing/xen/tools/compat-build-source.py
+--- xen-4.19.0-testing.orig/xen/tools/compat-build-source.py
+++ xen-4.19.0-testing/xen/tools/compat-build-source.py
@@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python3
 
 import re,sys
 
-Index: xen-4.18.3-testing/xen/tools/compat-build-header.py
+Index: xen-4.19.0-testing/xen/tools/compat-build-header.py
 ===================================================================
--- xen-4.18.3-testing.orig/xen/tools/compat-build-header.py
-+++ xen-4.18.3-testing/xen/tools/compat-build-header.py
+--- xen-4.19.0-testing.orig/xen/tools/compat-build-header.py
+++ xen-4.19.0-testing/xen/tools/compat-build-header.py
@@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python3
 
 import re,sys
 
-Index: xen-4.18.3-testing/tools/misc/xensymoops
-===================================================================
--- xen-4.18.3-testing.orig/tools/misc/xensymoops
-+++ xen-4.18.3-testing/tools/misc/xensymoops
-@@ -1,4 +1,4 @@
-#!/usr/bin/env python
-+#!/usr/bin/python3
- 
- # An oops analyser for Xen
- # Usage: xensymoops path-to-xen.s < oops-message
-@@ -43,12 +43,12 @@ def read_oops():
-     return (eip_addr, stack_addresses)
- 
- def usage():
-    print >> sys.stderr, """Usage: %s path-to-asm < oops-msg
-+    print("""Usage: %s path-to-asm < oops-msg
-     The oops message should be fed to the standard input.  The
-     command-line argument specifies the path to the Xen assembly dump
-     produced by \"make debug\".  The location of EIP and the backtrace
-     will be output to standard output.
-    """ % sys.argv[0]
-+    """ % sys.argv[0], file=sys.stderr)
-     sys.exit()
- 
- ##### main
-@@ -99,7 +99,7 @@ while True:
- 
-     # if this address was seen as a potential code address in the backtrace then
-     # record it in the backtrace list
-    if stk_addrs.has_key(address):
-+    if address in stk_addrs:
-         backtrace.append((stk_addrs[address], address, func))
- 
-     # if this was the address that EIP...
-@@ -107,12 +107,12 @@ while True:
-         eip_func = func
- 
- 
-print "EIP %s in function %s" % (eip_addr, eip_func)
-print "Backtrace:"
-+print("EIP %s in function %s" % (eip_addr, eip_func))
-+print("Backtrace:")
- 
- # sorting will order primarily by the first element of each tuple,
- # i.e. the order in the original oops
- backtrace.sort()
- 
- for (i, a, f) in backtrace:
-    print "%s in function %s" % ( a, f )
-+    print("%s in function %s" % ( a, f ))
--- a/gcc14-fixes.patch
+++ b/gcc14-fixes.patch
@ -1,81 +0,0 @@
-References: bsc#1225953
-
-Compiling against gcc14.
- ../../../../../newlib-1.16.0/newlib/libc/stdlib/wcstoull.c: In function ‘wcstoull’:
- ../../../../../newlib-1.16.0/newlib/libc/stdlib/wcstoull.c:136:16: error: implicit declaration of function ‘_wcstoull_r’; did you mean ‘wcstoull’? [-Wimplicit-function-declaration]
-   136 |         return _wcstoull_r (_REENT, s, ptr, base);
-       |                ^~~~~~~~~~~
-       |                wcstoull
-
- In file included from ../../../../../newlib-1.16.0/newlib/libc/reent/signalr.c:7:
- ../../../../../newlib-1.16.0/newlib/libc/reent/signalr.c: In function ‘_kill_r’:
- ../../../../../newlib-1.16.0/newlib/libc/reent/signalr.c:61:14: error: implicit declaration of function ‘kill’; did you mean ‘_kill’? [-Wimplicit-function-declaration]
-    61 |   if ((ret = _kill (pid, sig)) == -1 && errno != 0)
-       |              ^~~~~
-
-
-Index: xen-4.18.2-testing/stubdom/Makefile
-===================================================================
--- xen-4.18.2-testing.orig/stubdom/Makefile
-+++ xen-4.18.2-testing/stubdom/Makefile
-@@ -97,6 +97,7 @@ newlib-$(NEWLIB_VERSION): newlib-$(NEWLI
- 	patch -d $@ -p1 < newlib-disable-texinfo.patch
- 	patch -d $@ -p1 < newlib-cygmon-gmon.patch
- 	patch -d $@ -p1 < newlib-makedoc.patch
-+	patch -d $@ -p1 < newlib-gcc14-pragmas.patch
- 	find $@ -type f | xargs perl -i.bak \
- 		-pe 's/\b_(tzname|daylight|timezone)\b/$$1/g'
- 	touch $@
-Index: xen-4.18.2-testing/stubdom/newlib-gcc14-pragmas.patch
-===================================================================
--- /dev/null
-+++ xen-4.18.2-testing/stubdom/newlib-gcc14-pragmas.patch
-@@ -0,0 +1,36 @@
-+--- newlib-1.16.0/newlib/libc/stdlib/wcstoull.c.orig	2024-06-04 15:32:01.495146632 -0600
-++++ newlib-1.16.0/newlib/libc/stdlib/wcstoull.c	2024-06-04 15:38:56.627156524 -0600
-+@@ -127,6 +127,10 @@ PORTABILITY
-+
-+ #ifndef _REENT_ONLY
-+
-++#if __GNUC__ >= 14
-++#pragma GCC diagnostic ignored "-Wimplicit-function-declaration"
-++#endif
-++
-+ unsigned long long
-+ _DEFUN (wcstoull, (s, ptr, base),
-+ 	_CONST wchar_t *s _AND
-+--- newlib-1.16.0/newlib/libc/reent/signalr.c.orig	2024-06-04 15:39:15.139156966 -0600
-++++ newlib-1.16.0/newlib/libc/reent/signalr.c	2024-06-04 15:40:24.899158628 -0600
-+@@ -49,6 +49,10 @@ DESCRIPTION
-+ 	<<errno>>.
-+ */
-+
-++#if __GNUC__ >= 14
-++#pragma GCC diagnostic ignored "-Wimplicit-function-declaration"
-++#endif
-++
-+ int
-+ _DEFUN (_kill_r, (ptr, pid, sig),
-+      struct _reent *ptr _AND
-+--- newlib-1.16.0/newlib/doc/makedoc.c.orig	2024-06-04 16:07:54.423197934 -0600
-++++ newlib-1.16.0/newlib/doc/makedoc.c	2024-06-04 16:15:15.395208441 -0600
-+@@ -798,6 +798,7 @@ DEFUN( iscommand,(ptr, idx),
-+ }
-+
-+
-++static unsigned int
-+ DEFUN(copy_past_newline,(ptr, idx, dst),
-+       string_type *ptr AND
-+       unsigned int idx AND
--- xen-4.18.2-testing/extras/mini-os-remote/include/posix/sys/mman.h.orig	2024-06-04 16:27:35.155226069 -0600
-+++ xen-4.18.2-testing/extras/mini-os-remote/include/posix/sys/mman.h	2024-06-04 16:31:46.591232060 -0600
-@@ -16,7 +16,7 @@
- 
- void *mmap(void *start, size_t length, int prot, int flags, int fd, off_t offset) asm("mmap64");
- int munmap(void *start, size_t length);
-static inline mlock(const void *addr, size_t len) { return 0; }
-static inline munlock(const void *addr, size_t len) { return 0; }
-+static inline int mlock(const void *addr, size_t len) { return 0; }
-+static inline int munlock(const void *addr, size_t len) { return 0; }
- 
- #endif /* _POSIX_SYS_MMAN_H */
--- a/libxc-sr-LIBXL_HAVE_DOMAIN_SUSPEND_PROPS.patch
+++ b/libxc-sr-LIBXL_HAVE_DOMAIN_SUSPEND_PROPS.patch
@ -20,7 +20,7 @@ Acked-by: Christian Lindig <christian.lindig@citrix.com>

 --- a/tools/include/libxl.h
 +++ b/tools/include/libxl.h
-@@ -1811,13 +1811,28 @@ static inline int libxl_retrieve_domain_
+@@ -1855,13 +1855,28 @@ static inline int libxl_retrieve_domain_
     libxl_retrieve_domain_configuration_0x041200
 #endif
 
--- a/libxc-sr-abort_if_busy.patch
+++ b/libxc-sr-abort_if_busy.patch
@ -53,7 +53,7 @@ Signed-off-by: Olaf Hering <olaf@aepfle.de>
 =item B<remus> [I<OPTIONS>] I<domain-id> I<host>
 --- a/tools/include/libxl.h
 +++ b/tools/include/libxl.h
-@@ -1824,6 +1824,7 @@ typedef struct {
+@@ -1868,6 +1868,7 @@ typedef struct {
 } libxl_domain_suspend_suse_properties;
 #define LIBXL_SUSPEND_DEBUG 1
 #define LIBXL_SUSPEND_LIVE 2
@ -93,7 +93,7 @@ Signed-off-by: Olaf Hering <olaf@aepfle.de>
     dss->checkpointed_stream = LIBXL_CHECKPOINTED_STREAM_NONE;
 --- a/tools/libs/light/libxl_internal.h
 +++ b/tools/libs/light/libxl_internal.h
-@@ -3655,9 +3655,11 @@ struct libxl__domain_save_state {
+@@ -3651,9 +3651,11 @@ struct libxl__domain_save_state {
     libxl_domain_type type;
     int live;
     int debug;
--- a/libxc-sr-max_iters.patch
+++ b/libxc-sr-max_iters.patch
@ -46,7 +46,7 @@ Signed-off-by: Olaf Hering <olaf@aepfle.de>
 =item B<remus> [I<OPTIONS>] I<domain-id> I<host>
 --- a/tools/include/libxl.h
 +++ b/tools/include/libxl.h
-@@ -1819,6 +1819,7 @@ static inline int libxl_retrieve_domain_
+@@ -1863,6 +1863,7 @@ static inline int libxl_retrieve_domain_
 
 typedef struct {
     uint32_t flags; /* LIBXL_SUSPEND_* */
@ -77,7 +77,7 @@ Signed-off-by: Olaf Hering <olaf@aepfle.de>
     dss->checkpointed_stream = LIBXL_CHECKPOINTED_STREAM_NONE;
 --- a/tools/libs/light/libxl_internal.h
 +++ b/tools/libs/light/libxl_internal.h
-@@ -3656,6 +3656,7 @@ struct libxl__domain_save_state {
+@@ -3652,6 +3652,7 @@ struct libxl__domain_save_state {
     int live;
     int debug;
     int checkpointed_stream;
--- a/libxc-sr-min_remaining.patch
+++ b/libxc-sr-min_remaining.patch
@ -51,7 +51,7 @@ Signed-off-by: Olaf Hering <olaf@aepfle.de>
 =item B<remus> [I<OPTIONS>] I<domain-id> I<host>
 --- a/tools/include/libxl.h
 +++ b/tools/include/libxl.h
-@@ -1820,6 +1820,7 @@ static inline int libxl_retrieve_domain_
+@@ -1864,6 +1864,7 @@ static inline int libxl_retrieve_domain_
 typedef struct {
     uint32_t flags; /* LIBXL_SUSPEND_* */
     uint32_t max_iters;
@ -82,7 +82,7 @@ Signed-off-by: Olaf Hering <olaf@aepfle.de>
     dss->checkpointed_stream = LIBXL_CHECKPOINTED_STREAM_NONE;
 --- a/tools/libs/light/libxl_internal.h
 +++ b/tools/libs/light/libxl_internal.h
-@@ -3657,6 +3657,7 @@ struct libxl__domain_save_state {
+@@ -3653,6 +3653,7 @@ struct libxl__domain_save_state {
     int debug;
     int checkpointed_stream;
     uint32_t max_iters;
--- a/libxc-sr-number-of-iterations.patch
+++ b/libxc-sr-number-of-iterations.patch
@ -13,7 +13,7 @@ iterations for dirty memory, and a final copy iteration prior move.

 --- a/tools/libs/light/libxl_internal.h
 +++ b/tools/libs/light/libxl_internal.h
-@@ -124,7 +124,7 @@
+@@ -125,7 +125,7 @@
 #define DOMID_XS_PATH "domid"
 #define PVSHIM_BASENAME "xen-shim"
 #define PVSHIM_CMDLINE "pv-shim console=xen,pv"
@ -21,4 +21,4 @@ iterations for dirty memory, and a final copy iteration prior move.
 +#define LIBXL_XGS_POLICY_MAX_ITERATIONS 1
 #define LIBXL_XGS_POLICY_TARGET_DIRTY_COUNT 50
 
- /* Size macros. */
+ #define DIV_ROUNDUP(n, d) (((n) + (d) - 1) / (d))
--- a/libxc-sr-precopy_policy.patch
+++ b/libxc-sr-precopy_policy.patch
@ -60,15 +60,15 @@ v02:
     dss->sws.dss = dss;
 --- a/tools/libs/light/libxl_internal.h
 +++ b/tools/libs/light/libxl_internal.h
-@@ -124,6 +124,8 @@
+@@ -125,6 +125,8 @@
 #define DOMID_XS_PATH "domid"
 #define PVSHIM_BASENAME "xen-shim"
 #define PVSHIM_CMDLINE "pv-shim console=xen,pv"
 +#define LIBXL_XGS_POLICY_MAX_ITERATIONS 5
 +#define LIBXL_XGS_POLICY_TARGET_DIRTY_COUNT 50
 
- /* Size macros. */
- #define MB(_mb)     (_AC(_mb, ULL) << 20)
+ #define DIV_ROUNDUP(n, d) (((n) + (d) - 1) / (d))
+ 
 --- a/tools/libs/light/libxl_save_msgs_gen.pl
 +++ b/tools/libs/light/libxl_save_msgs_gen.pl
@@ -23,6 +23,7 @@ our @msgs = (
--- a/libxc-sr-readv_exact.patch
+++ b/libxc-sr-readv_exact.patch
@ -19,7 +19,7 @@ v2:

 --- a/tools/libs/ctrl/xc_private.c
 +++ b/tools/libs/ctrl/xc_private.c
-@@ -699,8 +699,23 @@ int write_exact(int fd, const void *data
+@@ -633,8 +633,23 @@ int write_exact(int fd, const void *data
 
 #if defined(__MINIOS__)
 /*
@ -44,7 +44,7 @@ v2:
 int writev_exact(int fd, const struct iovec *iov, int iovcnt)
 {
     int rc, i;
-@@ -715,6 +730,46 @@ int writev_exact(int fd, const struct io
+@@ -649,6 +664,46 @@ int writev_exact(int fd, const struct io
     return 0;
 }
 #else
@ -93,7 +93,7 @@ v2:
     struct iovec *local_iov = NULL;
 --- a/tools/libs/ctrl/xc_private.h
 +++ b/tools/libs/ctrl/xc_private.h
-@@ -395,6 +395,7 @@ int xc_flush_mmu_updates(xc_interface *x
+@@ -382,6 +382,7 @@ int xc_flush_mmu_updates(xc_interface *x
 
 /* Return 0 on success; -1 on error setting errno. */
 int read_exact(int fd, void *data, size_t size); /* EOF => -1, errno=0 */
--- a/libxc-sr-track-migration-time.patch
+++ b/libxc-sr-track-migration-time.patch
@ -34,7 +34,7 @@ Signed-off-by: Olaf Hering <olaf@aepfle.de>
                     uint32_t domid)
 {
 +    int ret;
-     DECLARE_DOMCTL;
+     struct xen_domctl domctl = {};
     domctl.cmd = XEN_DOMCTL_pausedomain;
     domctl.domain = domid;
 -    return do_domctl(xch, &domctl);
@ -49,7 +49,7 @@ Signed-off-by: Olaf Hering <olaf@aepfle.de>
                       uint32_t domid)
 {
 +    int ret;
-     DECLARE_DOMCTL;
+     struct xen_domctl domctl = {};
     domctl.cmd = XEN_DOMCTL_unpausedomain;
     domctl.domain = domid;
 -    return do_domctl(xch, &domctl);
--- a/libxl.LIBXL_HOTPLUG_TIMEOUT.patch
+++ b/libxl.LIBXL_HOTPLUG_TIMEOUT.patch
@ -85,7 +85,7 @@ the execution time of each script.
 
 --- a/tools/libs/light/libxl_create.c
 +++ b/tools/libs/light/libxl_create.c
-@@ -1323,6 +1323,7 @@ static void initiate_domain_create(libxl
+@@ -1363,6 +1363,7 @@ static void initiate_domain_create(libxl
      * build info around just to know if the domain has a device model or not.
      */
     store_libxl_entry(gc, domid, &d_config->b_info);
@ -95,7 +95,7 @@ the execution time of each script.
         ret = libxl__disk_devtype.set_default(gc, domid, &d_config->disks[i],
 --- a/tools/libs/light/libxl_device.c
 +++ b/tools/libs/light/libxl_device.c
-@@ -1296,7 +1296,7 @@ static void device_hotplug(libxl__egc *e
+@@ -1309,7 +1309,7 @@ static void device_hotplug(libxl__egc *e
     }
 
     aes->ao = ao;
@ -104,7 +104,7 @@ the execution time of each script.
     aes->env = env;
     aes->args = args;
     aes->callback = device_hotplug_child_death_cb;
-@@ -1305,6 +1305,15 @@ static void device_hotplug(libxl__egc *e
+@@ -1318,6 +1318,15 @@ static void device_hotplug(libxl__egc *e
     aes->stdfds[1] = 2;
     aes->stdfds[2] = -1;
 
@ -278,7 +278,7 @@ the execution time of each script.
 
 #include <xenevtchn.h>
 #include <xenstore.h>
-@@ -1629,6 +1630,7 @@ struct libxl__xswait_state {
+@@ -1626,6 +1627,7 @@ struct libxl__xswait_state {
     const char *what; /* for error msgs: noun phrase, what we're waiting for */
     const char *path;
     int timeout_ms; /* as for poll(2) */
@ -286,7 +286,7 @@ the execution time of each script.
     libxl__xswait_callback *callback;
     /* remaining fields are private to xswait */
     libxl__ev_time time_ev;
-@@ -2707,6 +2709,7 @@ struct libxl__async_exec_state {
+@@ -2703,6 +2705,7 @@ struct libxl__async_exec_state {
     char **args; /* execution arguments */
     char **env; /* execution environment */
 
@ -294,7 +294,7 @@ the execution time of each script.
     /* private */
     libxl__ev_time time;
     libxl__ev_child child;
-@@ -4896,6 +4899,9 @@ _hidden int userlookup_helper_getpwuid(l
+@@ -4899,6 +4902,9 @@ _hidden int userlookup_helper_getpwuid(l
 
 #endif
 
--- a/libxl.add-option-to-disable-disk-cache-flushes-in-qdisk.patch
+++ b/libxl.add-option-to-disable-disk-cache-flushes-in-qdisk.patch
@ -7,11 +7,11 @@ https://bugzilla.novell.com/show_bug.cgi?id=879425
 tools/libxl/libxlu_disk_l.l |    1 +
 5 files changed, 18 insertions(+), 1 deletion(-)

-Index: xen-4.18.0-testing/docs/man/xl-disk-configuration.5.pod.in
+Index: xen-4.20.0-testing/docs/man/xl-disk-configuration.5.pod.in
 ===================================================================
--- xen-4.18.0-testing.orig/docs/man/xl-disk-configuration.5.pod.in
-+++ xen-4.18.0-testing/docs/man/xl-disk-configuration.5.pod.in
-@@ -337,6 +337,32 @@ No
+--- xen-4.20.0-testing.orig/docs/man/xl-disk-configuration.5.pod.in
+++ xen-4.20.0-testing/docs/man/xl-disk-configuration.5.pod.in
+@@ -339,6 +339,32 @@ No
 
 discard
 
@ -44,13 +44,13 @@ Index: xen-4.18.0-testing/docs/man/xl-disk-configuration.5.pod.in
 =back
 
 An advisory setting for the backend driver, specifying whether to
-Index: xen-4.18.0-testing/tools/include/libxl.h
+Index: xen-4.20.0-testing/tools/include/libxl.h
 ===================================================================
--- xen-4.18.0-testing.orig/tools/include/libxl.h
-+++ xen-4.18.0-testing/tools/include/libxl.h
-@@ -584,6 +584,21 @@
-  */
- #define LIBXL_HAVE_CONSOLE_ADD_XENSTORE 1
+--- xen-4.20.0-testing.orig/tools/include/libxl.h
+++ xen-4.20.0-testing/tools/include/libxl.h
+@@ -603,6 +603,21 @@
+ #define LIBXL_HAVE_P9_ADD 1
+ 
 /*
 + * The libxl_device_disk has no way to indicate that cache=unsafe is
 + * supposed to be used. Provide this knob without breaking the ABI.
@ -70,11 +70,11 @@ Index: xen-4.18.0-testing/tools/include/libxl.h
  * libxl ABI compatibility
  *
  * The only guarantee which libxl makes regarding ABI compatibility
-Index: xen-4.18.0-testing/tools/libs/light/libxl_disk.c
+Index: xen-4.20.0-testing/tools/libs/light/libxl_disk.c
 ===================================================================
--- xen-4.18.0-testing.orig/tools/libs/light/libxl_disk.c
-+++ xen-4.18.0-testing/tools/libs/light/libxl_disk.c
-@@ -422,6 +422,8 @@ static void device_disk_add(libxl__egc *
+--- xen-4.20.0-testing.orig/tools/libs/light/libxl_disk.c
+++ xen-4.20.0-testing/tools/libs/light/libxl_disk.c
+@@ -464,6 +464,8 @@ static void device_disk_add(libxl__egc *
         flexarray_append_pair(back, "discard-enable",
                               libxl_defbool_val(disk->discard_enable) ?
                               "1" : "0");
@ -83,11 +83,11 @@ Index: xen-4.18.0-testing/tools/libs/light/libxl_disk.c
         flexarray_append(back, "specification");
         flexarray_append(back, libxl__device_disk_string_of_specification(disk->specification));
         if (disk->specification == LIBXL_DISK_SPECIFICATION_VIRTIO) {
-Index: xen-4.18.0-testing/tools/libs/light/libxl_dm.c
+Index: xen-4.20.0-testing/tools/libs/light/libxl_dm.c
 ===================================================================
--- xen-4.18.0-testing.orig/tools/libs/light/libxl_dm.c
-+++ xen-4.18.0-testing/tools/libs/light/libxl_dm.c
-@@ -1019,14 +1019,27 @@ enum {
+--- xen-4.20.0-testing.orig/tools/libs/light/libxl_dm.c
+++ xen-4.20.0-testing/tools/libs/light/libxl_dm.c
+@@ -1003,14 +1003,27 @@ enum {
     LIBXL__COLO_SECONDARY,
 };
 
@ -117,7 +117,7 @@ Index: xen-4.18.0-testing/tools/libs/light/libxl_dm.c
     const char *exportname = disk->colo_export;
     const char *active_disk = disk->active_disk;
     const char *hidden_disk = disk->hidden_disk;
-@@ -1085,8 +1098,8 @@ static char *qemu_disk_ide_drive_string(
+@@ -1069,8 +1082,8 @@ static char *qemu_disk_ide_drive_string(
     switch (colo_mode) {
     case LIBXL__COLO_NONE:
         drive = GCSPRINTF
@ -128,7 +128,7 @@ Index: xen-4.18.0-testing/tools/libs/light/libxl_dm.c
         break;
     case LIBXL__COLO_PRIMARY:
         /*
-@@ -1099,13 +1112,14 @@ static char *qemu_disk_ide_drive_string(
+@@ -1083,13 +1096,14 @@ static char *qemu_disk_ide_drive_string(
          *  vote-threshold=1
          */
         drive = GCSPRINTF(
@ -145,7 +145,7 @@ Index: xen-4.18.0-testing/tools/libs/light/libxl_dm.c
         break;
     case LIBXL__COLO_SECONDARY:
         /*
-@@ -1119,7 +1133,7 @@ static char *qemu_disk_ide_drive_string(
+@@ -1103,7 +1117,7 @@ static char *qemu_disk_ide_drive_string(
          *  file.backing.backing=exportname,
          */
         drive = GCSPRINTF(
@ -154,7 +154,7 @@ Index: xen-4.18.0-testing/tools/libs/light/libxl_dm.c
             "driver=replication,"
             "mode=secondary,"
             "top-id=top-colo,"
-@@ -1128,7 +1142,8 @@ static char *qemu_disk_ide_drive_string(
+@@ -1112,7 +1126,8 @@ static char *qemu_disk_ide_drive_string(
             "file.backing.driver=qcow2,"
             "file.backing.file.filename=%s,"
             "file.backing.backing=%s",
@ -164,7 +164,7 @@ Index: xen-4.18.0-testing/tools/libs/light/libxl_dm.c
         break;
     default:
          abort();
-@@ -1998,8 +2013,8 @@ static int libxl__build_device_model_arg
+@@ -1985,8 +2000,8 @@ static int libxl__build_device_model_arg
                         return ERROR_INVAL;
                     }
                     flexarray_vappend(dm_args, "-drive",
@ -175,10 +175,10 @@ Index: xen-4.18.0-testing/tools/libs/light/libxl_dm.c
                         "-device", GCSPRINTF("ide-hd,bus=ahci0.%d,unit=0,drive=ahcidisk-%d",
                         disk, disk), NULL);
                     continue;
-Index: xen-4.18.0-testing/tools/libs/util/libxlu_disk.c
+Index: xen-4.20.0-testing/tools/libs/util/libxlu_disk.c
 ===================================================================
--- xen-4.18.0-testing.orig/tools/libs/util/libxlu_disk.c
-+++ xen-4.18.0-testing/tools/libs/util/libxlu_disk.c
+--- xen-4.20.0-testing.orig/tools/libs/util/libxlu_disk.c
+++ xen-4.20.0-testing/tools/libs/util/libxlu_disk.c
@@ -78,6 +78,8 @@ int xlu_disk_parse(XLU_Config *cfg,
         if (!disk->pdev_path || !strcmp(disk->pdev_path, ""))
             disk->format = LIBXL_DISK_FORMAT_EMPTY;
@ -188,10 +188,10 @@ Index: xen-4.18.0-testing/tools/libs/util/libxlu_disk.c
 
     if (!disk->vdev) {
         xlu__disk_err(&dpc,0, "no vdev specified");
-Index: xen-4.18.0-testing/tools/libs/util/libxlu_disk_i.h
+Index: xen-4.20.0-testing/tools/libs/util/libxlu_disk_i.h
 ===================================================================
--- xen-4.18.0-testing.orig/tools/libs/util/libxlu_disk_i.h
-+++ xen-4.18.0-testing/tools/libs/util/libxlu_disk_i.h
+--- xen-4.20.0-testing.orig/tools/libs/util/libxlu_disk_i.h
+++ xen-4.20.0-testing/tools/libs/util/libxlu_disk_i.h
@@ -10,7 +10,7 @@ typedef struct {
     void *scanner;
     YY_BUFFER_STATE buf;
@ -201,10 +201,10 @@ Index: xen-4.18.0-testing/tools/libs/util/libxlu_disk_i.h
     const char *spec;
 } DiskParseContext;
 
-Index: xen-4.18.0-testing/tools/libs/util/libxlu_disk_l.l
+Index: xen-4.20.0-testing/tools/libs/util/libxlu_disk_l.l
 ===================================================================
--- xen-4.18.0-testing.orig/tools/libs/util/libxlu_disk_l.l
-+++ xen-4.18.0-testing/tools/libs/util/libxlu_disk_l.l
+--- xen-4.20.0-testing.orig/tools/libs/util/libxlu_disk_l.l
+++ xen-4.20.0-testing/tools/libs/util/libxlu_disk_l.l
@@ -216,6 +216,7 @@ colo-port=[^,]*,?	{ STRIP(','); setcolop
 colo-export=[^,]*,?	{ STRIP(','); SAVESTRING("colo-export", colo_export, FROMEQUALS); }
 active-disk=[^,]*,?	{ STRIP(','); SAVESTRING("active-disk", active_disk, FROMEQUALS); }
--- a/migration-python3-conversion.patch
+++ b/migration-python3-conversion.patch
@ -1,63 +0,0 @@
-Index: xen-4.18.0-testing/tools/python/xen/migration/legacy.py
-===================================================================
--- xen-4.18.0-testing.orig/tools/python/xen/migration/legacy.py
-+++ xen-4.18.0-testing/tools/python/xen/migration/legacy.py
-@@ -1,3 +1,4 @@
-+#!/usr/bin/python3
- # -*- coding: utf-8 -*-
- 
- """
-Index: xen-4.18.0-testing/tools/python/xen/migration/libxc.py
-===================================================================
--- xen-4.18.0-testing.orig/tools/python/xen/migration/libxc.py
-+++ xen-4.18.0-testing/tools/python/xen/migration/libxc.py
-@@ -1,3 +1,4 @@
-+#!/usr/bin/python3
- # -*- coding: utf-8 -*-
- 
- """
-Index: xen-4.18.0-testing/tools/python/xen/migration/libxl.py
-===================================================================
--- xen-4.18.0-testing.orig/tools/python/xen/migration/libxl.py
-+++ xen-4.18.0-testing/tools/python/xen/migration/libxl.py
-@@ -1,3 +1,4 @@
-+#!/usr/bin/python3
- # -*- coding: utf-8 -*-
- 
- """
-Index: xen-4.18.0-testing/tools/python/xen/migration/public.py
-===================================================================
--- xen-4.18.0-testing.orig/tools/python/xen/migration/public.py
-+++ xen-4.18.0-testing/tools/python/xen/migration/public.py
-@@ -1,3 +1,4 @@
-+#!/usr/bin/python3
- # -*- coding: utf-8 -*-
- 
- """
-Index: xen-4.18.0-testing/tools/python/xen/migration/tests.py
-===================================================================
--- xen-4.18.0-testing.orig/tools/python/xen/migration/tests.py
-+++ xen-4.18.0-testing/tools/python/xen/migration/tests.py
-@@ -1,3 +1,4 @@
-+#!/usr/bin/python3
- # -*- coding: utf-8 -*-
- 
- """
-Index: xen-4.18.0-testing/tools/python/xen/migration/verify.py
-===================================================================
--- xen-4.18.0-testing.orig/tools/python/xen/migration/verify.py
-+++ xen-4.18.0-testing/tools/python/xen/migration/verify.py
-@@ -1,3 +1,4 @@
-+#!/usr/bin/python3
- # -*- coding: utf-8 -*-
- 
- """
-Index: xen-4.18.0-testing/tools/python/xen/migration/xl.py
-===================================================================
--- xen-4.18.0-testing.orig/tools/python/xen/migration/xl.py
-+++ xen-4.18.0-testing/tools/python/xen/migration/xl.py
-@@ -1,3 +1,4 @@
-+#!/usr/bin/python3
- # -*- coding: utf-8 -*-
- 
- """
--- a/mini-os.tar.bz2
+++ b/mini-os.tar.bz2
--- a/pygrub-boot-legacy-sles.patch
+++ b/pygrub-boot-legacy-sles.patch
@ -1,8 +1,8 @@
-Index: xen-4.17.2-testing/tools/pygrub/src/pygrub
+Index: xen-4.19.0-testing/tools/pygrub/src/pygrub
 ===================================================================
--- xen-4.17.2-testing.orig/tools/pygrub/src/pygrub
-+++ xen-4.17.2-testing/tools/pygrub/src/pygrub
-@@ -579,7 +579,7 @@ class Grub:
+--- xen-4.19.0-testing.orig/tools/pygrub/src/pygrub
+++ xen-4.19.0-testing/tools/pygrub/src/pygrub
+@@ -593,7 +593,7 @@ class Grub:
                 self.cf.filename = f
                 break
         if self.__dict__.get('cf', None) is None:
@ -11,7 +11,7 @@ Index: xen-4.17.2-testing/tools/pygrub/src/pygrub
         f = fs.open_file(self.cf.filename)
         # limit read size to avoid pathological cases
         buf = f.read(FS_READ_MAX)
-@@ -754,6 +754,20 @@ def run_grub(file, entry, fs, cfg_args):
+@@ -768,6 +768,20 @@ def run_grub(file, entry, fs, cfg_args):
 
     g = Grub(file, fs)
 
@ -32,7 +32,7 @@ Index: xen-4.17.2-testing/tools/pygrub/src/pygrub
     if list_entries:
         for i in range(len(g.cf.images)):
             img = g.cf.images[i]
-@@ -840,6 +854,19 @@ def sniff_netware(fs, cfg):
+@@ -854,6 +868,19 @@ def sniff_netware(fs, cfg):
 
     return cfg
 
@ -52,7 +52,7 @@ Index: xen-4.17.2-testing/tools/pygrub/src/pygrub
 def format_sxp(kernel, ramdisk, args):
     s = "linux (kernel %s)" % repr(kernel)
     if ramdisk:
-@@ -918,7 +945,7 @@ if __name__ == "__main__":
+@@ -932,7 +959,7 @@ if __name__ == "__main__":
     debug = False
     not_really = False
     output_format = "sxp"
--- a/replace-obsolete-network-configuration-commands-in-s.patch
+++ b/replace-obsolete-network-configuration-commands-in-s.patch
@ -16,11 +16,11 @@ brctl. Replace them by commands from iproute2 package.
 .../i386-dm/qemu-ifup-Linux                                |  5 +++--
 9 files changed, 26 insertions(+), 26 deletions(-)

-Index: xen-4.17.0-testing/README
+Index: xen-4.19.0-testing/README
 ===================================================================
--- xen-4.17.0-testing.orig/README
-+++ xen-4.17.0-testing/README
-@@ -61,8 +61,7 @@ provided by your OS distributor:
+--- xen-4.19.0-testing.orig/README
+++ xen-4.19.0-testing/README
+@@ -59,8 +59,7 @@ provided by your OS distributor:
     * Development install of GLib v2.0 (e.g. libglib2.0-dev)
     * Development install of Pixman (e.g. libpixman-1-dev)
     * pkg-config
@ -30,10 +30,10 @@ Index: xen-4.17.0-testing/README
     * GNU bison and GNU flex
     * ACPI ASL compiler (iasl)
 
-Index: xen-4.17.0-testing/tools/hotplug/Linux/remus-netbuf-setup
+Index: xen-4.19.0-testing/tools/hotplug/Linux/remus-netbuf-setup
 ===================================================================
--- xen-4.17.0-testing.orig/tools/hotplug/Linux/remus-netbuf-setup
-+++ xen-4.17.0-testing/tools/hotplug/Linux/remus-netbuf-setup
+--- xen-4.19.0-testing.orig/tools/hotplug/Linux/remus-netbuf-setup
+++ xen-4.19.0-testing/tools/hotplug/Linux/remus-netbuf-setup
@@ -76,6 +76,7 @@
 #specific setup code such as renaming.
 dir=$(dirname "$0")
@ -60,10 +60,10 @@ Index: xen-4.17.0-testing/tools/hotplug/Linux/remus-netbuf-setup
         check_ifb "$ifb" || continue
         REMUS_IFB="$ifb"
         break
-Index: xen-4.17.0-testing/tools/hotplug/Linux/vif-bridge
+Index: xen-4.19.0-testing/tools/hotplug/Linux/vif-bridge
 ===================================================================
--- xen-4.17.0-testing.orig/tools/hotplug/Linux/vif-bridge
-+++ xen-4.17.0-testing/tools/hotplug/Linux/vif-bridge
+--- xen-4.19.0-testing.orig/tools/hotplug/Linux/vif-bridge
+++ xen-4.19.0-testing/tools/hotplug/Linux/vif-bridge
@@ -42,7 +42,8 @@ if [ -z "$bridge" ]; then
     if which brctl >&/dev/null; then
         bridge=$(brctl show | awk 'NR==2{print$1}')
@ -74,10 +74,10 @@ Index: xen-4.17.0-testing/tools/hotplug/Linux/vif-bridge
     fi
   if [ -z "$bridge" ]
   then
-Index: xen-4.17.0-testing/tools/hotplug/Linux/vif-nat
+Index: xen-4.19.0-testing/tools/hotplug/Linux/vif-nat
 ===================================================================
--- xen-4.17.0-testing.orig/tools/hotplug/Linux/vif-nat
-+++ xen-4.17.0-testing/tools/hotplug/Linux/vif-nat
+--- xen-4.19.0-testing.orig/tools/hotplug/Linux/vif-nat
+++ xen-4.19.0-testing/tools/hotplug/Linux/vif-nat
@@ -172,7 +172,11 @@ case "$command" in
         ;;
     offline)
@ -91,10 +91,10 @@ Index: xen-4.17.0-testing/tools/hotplug/Linux/vif-nat
         ;;
 esac
 
-Index: xen-4.17.0-testing/tools/hotplug/Linux/vif-route
+Index: xen-4.19.0-testing/tools/hotplug/Linux/vif-route
 ===================================================================
--- xen-4.17.0-testing.orig/tools/hotplug/Linux/vif-route
-+++ xen-4.17.0-testing/tools/hotplug/Linux/vif-route
+--- xen-4.19.0-testing.orig/tools/hotplug/Linux/vif-route
+++ xen-4.19.0-testing/tools/hotplug/Linux/vif-route
@@ -23,13 +23,23 @@ main_ip=$(dom0_ip)
 
 case "${command}" in
@ -121,10 +121,10 @@ Index: xen-4.17.0-testing/tools/hotplug/Linux/vif-route
         ipcmd='del'
         cmdprefix='do_without_error'
         ;;
-Index: xen-4.17.0-testing/tools/hotplug/Linux/xen-network-common.sh
+Index: xen-4.19.0-testing/tools/hotplug/Linux/xen-network-common.sh
 ===================================================================
--- xen-4.17.0-testing.orig/tools/hotplug/Linux/xen-network-common.sh
-+++ xen-4.17.0-testing/tools/hotplug/Linux/xen-network-common.sh
+--- xen-4.19.0-testing.orig/tools/hotplug/Linux/xen-network-common.sh
+++ xen-4.19.0-testing/tools/hotplug/Linux/xen-network-common.sh
@@ -15,6 +15,12 @@
 #
 
--- a/stdvga-cache.patch
+++ b/stdvga-cache.patch
@ -1,16 +0,0 @@
-Index: xen-4.18.0-testing/xen/arch/x86/hvm/stdvga.c
-===================================================================
--- xen-4.18.0-testing.orig/xen/arch/x86/hvm/stdvga.c
-+++ xen-4.18.0-testing/xen/arch/x86/hvm/stdvga.c
-@@ -165,7 +165,10 @@ static int stdvga_outb(uint64_t addr, ui
- 
-     /* When in standard vga mode, emulate here all writes to the vram buffer
-      * so we can immediately satisfy reads without waiting for qemu. */
-    s->stdvga = (s->sr[7] == 0x00);
-+    s->stdvga =
-+        (s->sr[7] == 0x00) &&  /* standard vga mode */
-+        (s->gr[6] == 0x05);    /* misc graphics register w/ MemoryMapSelect=1
-+                                * 0xa0000-0xaffff (64k region), AlphaDis=1 */
- 
-     if ( !prev_stdvga && s->stdvga )
-     {
--- a/stubdom.tar.bz2
+++ b/stubdom.tar.bz2
--- a/x86-ioapic-ack-default.patch
+++ b/x86-ioapic-ack-default.patch
@ -2,7 +2,7 @@ Change default IO-APIC ack mode for single IO-APIC systems to old-style.

 --- a/xen/arch/x86/io_apic.c
 +++ b/xen/arch/x86/io_apic.c
-@@ -2076,7 +2076,10 @@ void __init setup_IO_APIC(void)
+@@ -2152,7 +2152,10 @@ void __init setup_IO_APIC(void)
         io_apic_irqs = ~PIC_IRQS;
 
     printk("ENABLING IO-APIC IRQs\n");
--- a/xen-4.18.3-testing-src.tar.bz2
+++ b/xen-4.18.3-testing-src.tar.bz2
--- a/xen-4.20.0-testing-src.tar.bz2
+++ b/xen-4.20.0-testing-src.tar.bz2
--- a/xen-arch-kconfig-nr_cpus.patch
+++ b/xen-arch-kconfig-nr_cpus.patch
@ -1,13 +1,13 @@
-Index: xen-4.18.0-testing/xen/arch/Kconfig
+Index: xen-4.20.0-testing/xen/arch/Kconfig
 ===================================================================
--- xen-4.18.0-testing.orig/xen/arch/Kconfig
-+++ xen-4.18.0-testing/xen/arch/Kconfig
-@@ -7,7 +7,7 @@ config PHYS_ADDR_T_32
- config NR_CPUS
+--- xen-4.20.0-testing.orig/xen/arch/Kconfig
+++ xen-4.20.0-testing/xen/arch/Kconfig
+@@ -8,7 +8,7 @@ config NR_CPUS
 	int "Maximum number of CPUs"
- 	range 1 4095
+ 	range 1 1 if ARM && MPU
+ 	range 1 16383
 -	default "256" if X86
 +	default "1024" if X86
+ 	default "1" if ARM && MPU
 	default "8" if ARM && RCAR3
 	default "4" if ARM && QEMU
- 	default "4" if ARM && MPSOC
--- a/xen-destdir.patch
+++ b/xen-destdir.patch
@ -1,7 +1,5 @@
-Index: xen-4.18.3-testing/tools/xs-clients/Makefile
-===================================================================
--- xen-4.18.3-testing.orig/tools/xs-clients/Makefile
-+++ xen-4.18.3-testing/tools/xs-clients/Makefile
+--- a/tools/xs-clients/Makefile
+++ b/tools/xs-clients/Makefile
@@ -29,7 +29,7 @@ all: $(TARGETS)
 clients: xenstore $(CLIENTS) xenstore-control
 
@ -20,10 +18,8 @@ Index: xen-4.18.3-testing/tools/xs-clients/Makefile
 	done
 
 .PHONY: uninstall
-Index: xen-4.18.3-testing/tools/xenstored/Makefile
-===================================================================
--- xen-4.18.3-testing.orig/tools/xenstored/Makefile
-+++ xen-4.18.3-testing/tools/xenstored/Makefile
+--- a/tools/xenstored/Makefile
+++ b/tools/xenstored/Makefile
@@ -32,6 +32,7 @@ TAGS:
 install: all
 	$(INSTALL_DIR) $(DESTDIR)$(sbindir)
--- a/10
+++ b/10
@ -60,11 +60,15 @@ conf_files $OF "$XEN_CONF_FILES"
 log_cmd $OF "xl list --long"
 log_cmd $OF "xl dmesg"
 # network-related info often useful for debugging
-if [ systemctl is-enabled NetworkManager.service 2>&1 > /dev/null ]; then
+if systemctl is-enabled NetworkManager.service &> /dev/null ; then
    log_write $OF "NOTE: NetworkManager should not be enabled on a Xen host"
 fi
-log_cmd $OF "route -n"
-log_cmd $OF "arp -v"
+for proto in '-4' '-6'
+do
+    log_cmd $OF "ip $proto neighbor show"
+    log_cmd $OF "ip $proto route show"
+    log_cmd $OF "ip $proto address show"
+done
 log_cmd $OF "ip link show type bridge"
 log_cmd $OF "bridge link show"
 # list contents of common config and image directories
--- a/xen.bug1026236.suse_vtsc_tolerance.patch
+++ b/xen.bug1026236.suse_vtsc_tolerance.patch
@ -20,7 +20,7 @@ actually handle. The default is zero tolerance.
 unsigned long __read_mostly cpu_khz;  /* CPU clock frequency in kHz. */
 DEFINE_SPINLOCK(rtc_lock);
 unsigned long pit0_ticks;
-@@ -2720,6 +2723,8 @@ int tsc_set_info(struct domain *d,
+@@ -2926,6 +2929,8 @@ int tsc_set_info(struct domain *d,
 
     switch ( tsc_mode )
     {
@ -29,7 +29,7 @@ actually handle. The default is zero tolerance.
     case XEN_CPUID_TSC_MODE_DEFAULT:
     case XEN_CPUID_TSC_MODE_ALWAYS_EMULATE:
         d->arch.vtsc_offset = get_s_time() - elapsed_nsec;
-@@ -2733,8 +2738,25 @@ int tsc_set_info(struct domain *d,
+@@ -2939,8 +2944,25 @@ int tsc_set_info(struct domain *d,
          * When a guest is created, gtsc_khz is passed in as zero, making
          * d->arch.tsc_khz == cpu_khz. Thus no need to check incarnation.
          */
--- a/xen.changes
+++ b/xen.changes
@ -1,3 +1,263 @@
+-------------------------------------------------------------------
+Fri Jan 31 09:59:45 MST 2025 - carnold@suse.com
+
+- Update to Xen 4.20.0 RC3 release
+  * x86/HVM: correct MMIO emulation cache bounds check
+  * x86/HVM: allocate emulation cache entries dynamically
+  * x86/HVM: correct read/write split at page boundaries
+  * x86/iommu: check for CMPXCHG16B when enabling IOMMU
+  * iommu/vtd: remove non-CX16 logic from interrupt remapping
+  * x86/iommu: remove non-CX16 logic from DMA remapping
+  * iommu/amd: atomically update IRTE
+  * x86emul: further correct 64-bit mode zero count repeated string
+    insn handling
+  * x86/PV: further harden guest memory accesses against speculative
+    abuse
+  * x86/intel: Fix PERF_GLOBAL fixup when virtualised
+
+-------------------------------------------------------------------
+Fri Jan 31 08:49:14 UTC 2025 - Markéta Machová <mmachova@suse.com>
+                
+- Add explicit build dependency on python3-setuptools, needed by python313
+
+-------------------------------------------------------------------
+Mon Jan 20 05:46:51 MST 2025 - carnold@suse.com
+
+- Update to Xen 4.20.0 RC2 release
+  * xen/arm: Fully initialise struct membanks_hdr fields
+  * build: Set DATE to SOURCE_DATE_EPOCH if available (for 
+    reproducible builds)
+  * x86: Add Support for Paging-Write Feature
+  * x86/time: introduce command line option to select wallclock
+  * x86/time: prefer CMOS over EFI_GET_TIME
+  * xentrace: free CPU mask string before overwriting pointer
+  * xl: properly dispose of vTPM struct instance
+  * xl: properly dispose of libxl_dominfo struct instances
+  * Various documentation fixes and updates (including ppc and
+    riscv additions)
+  * Various MISRA compliance improvements.
+
+-------------------------------------------------------------------
+Fri Jan 10 12:43:42 MST 2025 - carnold@suse.com
+
+- Update to Xen 4.20.0 RC1 release
+  * x86/amd: Misc setup for Fam1Ah processors
+  * xen/perfc cleanups and adjustments
+  * libxl: drop setting XEN_QEMU_CONSOLE_LIMIT in the environment
+    (XSA-180 / CVE-2014-3672)
+  * x86emul: VCVT{,U}DQ2PD ignores embedded rounding
+  * x86emul: correct put_fpu()'s segment selector handling
+  * xen/flask: Wire up XEN_DOMCTL_dt_overlay and XEN_DOMCTL_set_llc_colors
+  * xen/events: fix race with set_global_virq_handler()
+
+-------------------------------------------------------------------
+Mon Jan  6 06:01:11 MST 2025 - carnold@suse.com
+
+- Update to Xen 4.20.0 pre-release (jsc#PED-8907)
+  xen-4.20.0-testing-src.tar.bz2
+- New Features
+  * On Arm:
+    - Experimental support for Armv8-R.
+    - Support for NXP S32G3 Processors Family and NXP LINFlexD UART driver.
+    - Basic handling for SCMI requests over SMC using Shared Memory, by allowing
+      forwarding the calls to EL3 FW if coming from hwdom.
+    - Support for LLC (Last Level Cache) coloring.
+  * On x86:
+    - xl suspend/resume subcommands.
+    - Support for SRSO_U/S_NO and SRSO_MSR_FIX
+- Changed Features
+  * Fixed blkif protocol specification for sector sizes different than 512b.
+  * The dombuilder in libxenguest no longer un-gzips secondary modules, instead
+    leaving this to the guest kernel to do in guest context.
+  * On x86:
+    - Prefer ACPI reboot over UEFI ResetSystem() run time service call.
+    - Switched the xAPIC flat driver to use physical destination mode for external
+      interrupts instead of logical destination mode.
+- Removed Features
+  * On x86:
+    - Support for running on Xeon Phi processors.
+    - Removed the `ucode=allow-same` command line option.
+    - Removed x2APIC Cluster Mode for external interrupts.  x2APIC Physical and
+      Mixed Modes are still available.
+- Dropped patches
+  xsa466.patch
+
+-------------------------------------------------------------------
+Wed Dec 11 11:11:11 UTC 2024 - ohering@suse.de
+
+- Move /etc/bash_completion.d/xl back to %_datadir/bash-completion/completions
+
+-------------------------------------------------------------------
+Mon Dec  9 10:13:51 MST 2024 - carnold@suse.com
+
+- bsc#1234282 - VUL-0: xen: XSA-466: Xen hypercall page unsafe
+  against speculative attacks
+  xsa466.patch
+
+-------------------------------------------------------------------
+Wed Dec  4 09:16:24 MST 2024 - carnold@suse.com
+
+- Update to Xen 4.19.1 bug fix release (jsc#PED-8907)
+  xen-4.19.1-testing-src.tar.bz2
+  * No upstream changelog found in sources or webpage
+- Dropped patches
+  66a8b8ac-bunzip2-rare-failure.patch
+  66bb6f78-x86-IOMMU-move-tracking-in-iommu_identity_mapping.patch
+  66bb6fa5-x86-pass-through-document-as-security-unsupported.patch
+  66cf737b-x86-Dom0-disable-SMAP-for-PV-only.patch
+  66d02b69-Arm64-adjust-irq_to_desc-to-fix-build-with-gcc14.patch
+  66d6dca8-libxl-nul-termination-in-xen_console_read_line.patch
+  66d8690f-SUPPORT-split-XSM-from-Flask.patch
+  66e29480-x86-HVM-properly-reject-indirect-VRAM-writes.patch
+  66e44ae2-x86-ucode-AMD-buffer-underrun.patch
+  66f2af41-x86-vLAPIC-undue-recursion-of-vlapic_error.patch
+  66f2fd92-x86-ucode-Intel-stricter-sanity-check.patch
+  xsa463-01.patch
+  xsa463-02.patch
+  xsa463-03.patch
+  xsa463-04.patch
+  xsa463-05.patch
+  xsa463-06.patch
+  xsa463-07.patch
+  xsa463-08.patch
+  xsa463-09.patch
+  xsa464.patch
+  gcc14-fixes.patch
+
+-------------------------------------------------------------------
+Wed Oct 30 09:34:38 MDT 2024 - carnold@suse.com
+
+- bsc#1232622 - VUL-0: CVE-2024-45818: xen: Deadlock in x86 HVM
+  standard VGA handling (XSA-463)
+  xsa463-01.patch
+  xsa463-02.patch
+  xsa463-03.patch
+  xsa463-04.patch
+  xsa463-05.patch
+  xsa463-06.patch
+  xsa463-07.patch
+  xsa463-08.patch
+  xsa463-09.patch
+- bsc#1232624 - VUL-0: CVE-2024-45819: xen: libxl leaks data to PVH
+  guests via ACPI tables (XSA-464)
+  xsa464.patch
+- Drop stdvga-cache.patch
+
+-------------------------------------------------------------------
+Tue Oct 29 12:34:56 UTC 2024 - ohering@suse.de
+
+- bsc#1232542 - remove usage of net-tools-deprecated from supportconfig plugin
+
+-------------------------------------------------------------------
+Thu Sep 26 11:30:00 CEST 2024 - jbeulich@suse.com
+
+- bsc#1230366 - VUL-0: CVE-2024-45817: xen: x86: Deadlock in
+  vlapic_error() (XSA-462)
+  66f2af41-x86-vLAPIC-undue-recursion-of-vlapic_error.patch
+  Drop xsa462.patch
+- Upstream bug fixes (bsc#1027519)
+  66cf737b-x86-Dom0-disable-SMAP-for-PV-only.patch
+  66d6dca8-libxl-nul-termination-in-xen_console_read_line.patch
+  66d8690f-SUPPORT-split-XSM-from-Flask.patch
+  66e29480-x86-HVM-properly-reject-indirect-VRAM-writes.patch
+  66e44ae2-x86-ucode-AMD-buffer-underrun.patch
+  66f2fd92-x86-ucode-Intel-stricter-sanity-check.patch
+
+-------------------------------------------------------------------
+Tue Sep 10 09:54:34 MDT 2024 - carnold@suse.com
+
+- bsc#1230366 - VUL-0: CVE-2024-45817: xen: x86: Deadlock in
+  vlapic_error() (XSA-462)
+  xsa462.patch
+
+-------------------------------------------------------------------
+Fri Aug 30 07:32:58 UTC 2024 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Fix build on aarch64 with gcc14 (bsc#1225953)
+  66d02b69-Arm64-adjust-irq_to_desc-to-fix-build-with-gcc14.patch
+
+-------------------------------------------------------------------
+Thu Aug 15 15:13:42 MDT 2024 - carnold@suse.com
+
+- Update to Xen 4.19.0 FCS release (jsc#PED-8907)
+  xen-4.19.0-testing-src.tar.bz2
+- New Features
+  * On x86:
+    - Introduce a new x2APIC driver that uses Cluster Logical addressing mode
+      for IPIs and Physical addressing mode for external interrupts.
+  * On Arm:
+    - FF-A notification support.
+    - Introduction of dynamic node programming using overlay dtbo.
+  * Add a new 9pfs backend running as a daemon in dom0. First user is
+    Xenstore-stubdom now being able to support full Xenstore trace capability.
+  * libxl support for backendtype=tap with tapback.
+- Changed Features
+  * Changed flexible array definitions in public I/O interface headers to not
+    use "1" as the number of array elements.
+  * The minimum supported OCaml toolchain version is now 4.05
+  * On x86:
+    - HVM PIRQs are disabled by default.
+    - Reduce IOMMU setup time for hardware domain.
+    - Allow HVM/PVH domains to map foreign pages.
+    - Declare PVH dom0 supported with caveats.
+  * xl/libxl configures vkb=[] for HVM domains with priority over vkb_device.
+  * Increase the maximum number of CPUs Xen can be built for from 4095 to
+    16383.
+  * When building with Systemd support (./configure --enable-systemd), remove
+    libsystemd as a build dependency.  Systemd Notify support is retained, now
+    using a standalone library implementation.
+  * xenalyze no longer requires `--svm-mode` when analyzing traces
+    generated on AMD CPUs
+  * Code symbol annotations and MISRA compliance improvements.
+- Removed Features
+  * caml-stubdom.  It hasn't built since 2014, was pinned to Ocaml 4.02, and has
+    been superseded by the MirageOS/SOLO5 projects.
+  * /usr/bin/pygrub symlink.  This was deprecated in Xen 4.2 (2012) but left for
+    compatibility reasons.  VMs configured with bootloader="/usr/bin/pygrub"
+    should be updated to just bootloader="pygrub".
+  * The Xen gdbstub on x86.
+  * xentrace_format has been removed; use xenalyze instead.
+- Dropped patches contained in new tarball
+  6617d62c-x86-hvm-Misra-Rule-19-1-regression.patch
+  6627a4ee-vRTC-UIP-set-for-longer-than-expected.patch
+  6627a5fc-x86-MTRR-inverted-WC-check.patch
+  662a6a4c-x86-spec-reporting-of-BHB-clearing.patch
+  662a6a8d-x86-spec-adjust-logic-to-elide-LFENCE.patch
+  663090fd-x86-gen-cpuid-syntax.patch
+  663a383c-libxs-open-xenbus-fds-as-O_CLOEXEC.patch
+  663a4f3e-x86-cpu-policy-migration-IceLake-to-CascadeLake.patch
+  663d05b5-x86-ucode-distinguish-up-to-date.patch
+  663eaa27-libxl-XenStore-error-handling-in-device-creation.patch
+  66450626-sched-set-all-sched_resource-data-inside-locked.patch
+  66450627-x86-respect-mapcache_domain_init-failing.patch
+  6646031f-x86-ucode-further-identify-already-up-to-date.patch
+  6666ba52-x86-irq-remove-offline-CPUs-from-old-CPU-mask-when.patch
+  666994ab-x86-SMP-no-shorthand-IPI-in-hotplug.patch
+  666994f0-x86-IRQ-limit-interrupt-movement-in-fixup_irqs.patch
+  666b07ee-x86-EPT-special-page-in-epte_get_entry_emt.patch
+  666b0819-x86-EPT-avoid-marking-np-ents-for-reconfig.patch
+  666b085a-x86-EPT-drop-questionable-mfn_valid-from-.patch
+  667187cc-x86-Intel-unlock-CPUID-earlier.patch
+  66718849-x86-IRQ-old_cpu_mask-in-fixup_irqs.patch
+  6671885e-x86-IRQ-handle-moving-in-_assign_irq_vector.patch
+  6672c846-x86-xstate-initialisation-of-XSS-cache.patch
+  6672c847-x86-CPUID-XSAVE-dynamic-leaves.patch
+  6673ffdc-x86-IRQ-forward-pending-to-new-dest-in-fixup_irqs.patch
+  xsa458.patch
+- Dropped patches no longer necessary
+  bin-python3-conversion.patch
+  migration-python3-conversion.patch
+
+-------------------------------------------------------------------
+Wed Aug 14 14:10:47 MDT 2024 - carnold@suse.com
+
+- bsc#1228574 - VUL-0: CVE-2024-31145: xen: error handling in x86
+  IOMMU identity mapping (XSA-460)
+  66bb6f78-x86-IOMMU-move-tracking-in-iommu_identity_mapping.patch
+- bsc#1228575 - VUL-0: CVE-2024-31146: xen: PCI device pass-through
+  with shared resources (XSA-461)
+  66bb6fa5-x86-pass-through-document-as-security-unsupported.patch
+  
 -------------------------------------------------------------------
 Wed Aug 14 11:33:39 MDT 2024 - carnold@suse.com

@ -35,6 +295,17 @@ Wed Aug 14 11:33:39 MDT 2024 - carnold@suse.com
  6673ffdc-x86-IRQ-forward-pending-to-new-dest-in-fixup_irqs.patch
  xsa458.patch

+-------------------------------------------------------------------
+Wed Aug  7 08:06:00 CEST 2024 - jbeulich@suse.com
+  
+- Upstream bug fixes (bsc#1027519)
+  66a8b8ac-bunzip2-rare-failure.patch 
+
+-------------------------------------------------------------------
+Tue Jul 23 09:43:13 UTC 2024 - Franz Sirl <franz.sirl-obs@lauterbach.com>
+
+- Enable support for ZSTD and LZO compression formats
+
 -------------------------------------------------------------------
 Wed Jul  3 12:41:39 MDT 2024 - carnold@suse.com

--- a/xen.libxl.dmmd.patch
+++ b/xen.libxl.dmmd.patch
@ -9,7 +9,7 @@ References: bsc#954872

 --- a/tools/libs/light/libxl_disk.c
 +++ b/tools/libs/light/libxl_disk.c
-@@ -203,7 +203,7 @@ static int libxl__device_disk_setdefault
+@@ -237,7 +237,7 @@ static int libxl__device_disk_setdefault
     return rc;
 }
 
@ -18,9 +18,9 @@ References: bsc#954872
                                    const libxl_device_disk *disk,
                                    libxl__device *device)
 {
-@@ -372,6 +372,10 @@ static void device_disk_add(libxl__egc *
-                 rc = ERROR_FAIL;
-                 goto out;
+@@ -414,6 +414,10 @@ static void device_disk_add(libxl__egc *
+                 assert(device->backend_kind == LIBXL__DEVICE_KIND_VBD3);
+                 break;
             case LIBXL_DISK_BACKEND_QDISK:
 +		if (disk->script) {
 +                    script = libxl__abs_path(gc, disk->script, libxl__xen_script_dir_path());
@ -31,8 +31,8 @@ References: bsc#954872
                               libxl__device_disk_string_of_format(disk->format),
 --- a/tools/libs/light/libxl_device.c
 +++ b/tools/libs/light/libxl_device.c
-@@ -351,7 +351,8 @@ static int disk_try_backend(disk_try_bac
-         return 0;
+@@ -361,7 +361,8 @@ static int disk_try_backend(disk_try_bac
+         return backend;
 
     case LIBXL_DISK_BACKEND_QDISK:
 -        if (a->disk->script) goto bad_script;
@ -43,7 +43,7 @@ References: bsc#954872
     case LIBXL_DISK_BACKEND_STANDALONE:
 --- a/tools/libs/light/libxl_dm.c
 +++ b/tools/libs/light/libxl_dm.c
-@@ -1197,6 +1197,30 @@ out:
+@@ -1181,6 +1181,30 @@ out:
     return rc;
 }
 
@ -72,9 +72,9 @@ References: bsc#954872
 +}
 +
 static int libxl__build_device_model_args_new(libxl__gc *gc,
-                                         const char *dm, int guest_domid,
-                                         const libxl_domain_config *guest_config,
-@@ -1885,9 +1909,11 @@ static int libxl__build_device_model_arg
+     const char *dm, int guest_domid,
+     const libxl_domain_config *guest_config,
+@@ -1873,9 +1897,11 @@ static int libxl__build_device_model_arg
                 libxl__device_disk_dev_number(disks[i].vdev, &disk, &part);
             const char *format;
             char *drive;
@ -89,7 +89,7 @@ References: bsc#954872
                      disks[i].vdev);
 --- a/tools/libs/util/libxlu_disk_l.l
 +++ b/tools/libs/util/libxlu_disk_l.l
-@@ -253,6 +253,8 @@ target=.*	{ STRIP(','); SAVESTRING("targ
+@@ -256,6 +256,8 @@ target=.*	{ STRIP(','); SAVESTRING("targ
                     free(newscript);
                 }
 
@ -100,7 +100,7 @@ References: bsc#954872
 aio:/.*		{ DPC->had_depr_prefix=1; DEPRECATE(0); }
 --- a/tools/libs/light/libxl_internal.h
 +++ b/tools/libs/light/libxl_internal.h
-@@ -2073,6 +2073,10 @@ _hidden char *libxl__object_to_json(libx
+@@ -2070,6 +2070,10 @@ _hidden char *libxl__object_to_json(libx
 _hidden int libxl__cpuid_legacy(libxl_ctx *ctx, uint32_t domid, bool retore,
                                 libxl_domain_build_info *info);
 
--- a/xen.spec
+++ b/xen.spec
@ -1,7 +1,7 @@
 #
 # spec file for package xen
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -26,9 +26,11 @@
 # Keep it at the original location (/usr/lib) for backward compatibility
 %define _libexecdir /usr/lib

+%{?!primary_python:%define primary_python python3}
+
 Name:           xen
 ExclusiveArch:  %ix86 x86_64 aarch64
-%define xen_build_dir xen-4.18.3-testing
+%define xen_build_dir xen-4.20.0-testing
 #
 %define with_gdbsx 0
 %define with_dom0_support 0
@ -96,9 +98,12 @@ BuildRequires:  makeinfo
 %endif
 %endif
 BuildRequires:  acpica
+BuildRequires:  libzstd-devel
+BuildRequires:  lzo-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  openssl-devel
 BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
 BuildRequires:  xz-devel
 BuildRequires:  pkgconfig(systemd)
 %ifarch x86_64
@ -117,14 +122,15 @@ BuildRequires:  makeinfo
 %ifarch x86_64
 BuildRequires:  pesign-obs-integration
 %endif
+BuildRequires:  python-rpm-macros
 Provides:       installhint(reboot-needed)

-Version:        4.18.3_02
+Version:        4.20.0_06
 Release:        0
 Summary:        Xen Virtualization: Hypervisor (aka VMM aka Microkernel)
 License:        GPL-2.0-only
 Group:          System/Kernel
-Source0:        xen-4.18.3-testing-src.tar.bz2
+Source0:        xen-4.20.0-testing-src.tar.bz2
 Source1:        stubdom.tar.bz2
 Source2:        mini-os.tar.bz2
 Source9:        xen.changes
@ -154,7 +160,6 @@ Source10183:    xen_maskcalc.py
 # For xen-libs
 Source99:       baselibs.conf
 # Upstream patches
-Patch1:         6617d62c-x86-hvm-Misra-Rule-19-1-regression.patch
 # EMBARGOED security fixes
 # libxc
 Patch301:       libxc-bitmap-long.patch
@ -200,15 +205,13 @@ Patch408:       ignore-ip-command-script-errors.patch
 # Needs to go upstream
 Patch420:       suspend_evtchn_lock.patch
 Patch421:       vif-route.patch
-Patch422:       gcc14-fixes.patch
 # Other bug fixes or features
 Patch450:       xen.sysconfig-fillup.patch
 Patch451:       xenconsole-no-multiple-connections.patch
 Patch452:       hibernate.patch
-Patch453:       stdvga-cache.patch
-Patch454:       xl-save-pc.patch
-Patch455:       pygrub-boot-legacy-sles.patch
-Patch456:       pygrub-handle-one-line-menu-entries.patch
+Patch453:       xl-save-pc.patch
+Patch454:       pygrub-boot-legacy-sles.patch
+Patch455:       pygrub-handle-one-line-menu-entries.patch
 Patch461:       libxl.max_event_channels.patch
 Patch463:       libxl.add-option-to-disable-disk-cache-flushes-in-qdisk.patch
 Patch464:       xen.libxl.dmmd.patch
@ -217,8 +220,6 @@ Patch466:       libxl.helper_done-crash.patch
 Patch467:       libxl.LIBXL_HOTPLUG_TIMEOUT.patch
 # python3 conversion patches
 Patch500:       build-python3-conversion.patch
-Patch501:       migration-python3-conversion.patch
-Patch502:       bin-python3-conversion.patch
 # Hypervisor and PV driver Patches
 Patch600:       xen.bug1026236.suse_vtsc_tolerance.patch
 Patch601:       x86-ioapic-ack-default.patch
@ -282,8 +283,8 @@ Requires:       qemu-arm
 Requires:       %{name} = %{version}-%{release}
 Requires:       %{name}-libs = %{version}-%{release}
 Recommends:     multipath-tools
-Requires:       python3
-Requires:       python3-curses
+Requires:       %{primary_python}
+Requires:       %{primary_python}-curses
 %ifarch %{ix86} x86_64
 Requires:       qemu-seabios
 %endif
@ -475,7 +476,7 @@ configure_flags="${configure_flags} --enable-stubdom"
 sed -i~ 's/ XENSTORETYPE=domain$/ XENSTORETYPE=daemon/' tools/hotplug/Linux/launch-xenstore.in
 configure_flags="${configure_flags} --disable-stubdom"
 %endif
-export PYTHON="/usr/bin/python3"
+export PYTHON=$(realpath /usr/bin/python3)
 configure_flags="${configure_flags} --disable-qemu-traditional"
 ./configure \
        --disable-xen \
@ -512,6 +513,7 @@ make \
 	DESTDIR=%{buildroot} \
 	SYSCONFIG_DIR=%{_fillupdir} \
 	PKG_INSTALLDIR=%{_libdir}/pkgconfig \
+	BASH_COMPLETION_DIR=%{_datadir}/bash-completion/completions \
 	%{?_smp_mflags} \
 	install
 find %{buildroot} -ls
@ -809,17 +811,18 @@ done
 # Xen utilities
 install -m755 %SOURCE36 %{buildroot}/usr/sbin/xen2libvirt
 install -m755 %SOURCE10183 %{buildroot}/usr/sbin/xen_maskcalc
+%python3_fix_shebang

 rm -f %{buildroot}/etc/xen/README*
 # Example config
 mkdir -p %{buildroot}/etc/xen/{vm,examples,scripts}
 mv %{buildroot}/etc/xen/xlexample* %{buildroot}/etc/xen/examples
 rm -f %{buildroot}/etc/xen/examples/*nbd
-install -m644 tools/xentrace/formats %{buildroot}/etc/xen/examples/xentrace_formats.txt

 # Scripts
 rm -f %{buildroot}/etc/xen/scripts/block-*nbd
 install -m755 %SOURCE21 %SOURCE22 %SOURCE23 %SOURCE24 %{buildroot}/etc/xen/scripts/
+install -m755 tools/pygrub/src/pygrub %{buildroot}/usr/bin/pygrub
 mkdir -p %{buildroot}/usr/lib/supportconfig/plugins
 install -m 755 %SOURCE13 %{buildroot}/usr/lib/supportconfig/plugins/xen

@ -905,12 +908,15 @@ find %{buildroot} \( \
 	-name "*.dtb" -o \
 	-name "openbios-*" -o \
 	-name "petalogix*" -o \
-	-name "ppc*" -o \
 	-name "*.pyc" -o \
 	-name "s390*" -o \
 	-name "slof*" -o \
 	-name "spapr*" -o \
-	-name "*.egg-info" \) \
+        -name "PKG-INFO" -o \
+        -name "SOURCES.txt" -o \
+        -name "dependency_links.txt" -o \
+        -name "top_level.txt" -o \
+        -name "*.egg-info" \) \
 	-print -delete
 # Wipe empty directories
 if find %{buildroot}/usr -type d -print0 | xargs -0n1 rmdir -p 2>/dev/null
@ -939,7 +945,7 @@ rm -rf %{buildroot}/%{with_systemd_modules_load}
 rm -rf %{buildroot}/usr/sbin
 rm -rf %{buildroot}/etc/xen
 rm -rf %{buildroot}/var
-rm -f  %{buildroot}/%{_sysconfdir}/bash_completion.d/xl
+rm -f  %{buildroot}/%{_datadir}/bash-completion/completions/xl
 rm -f  %{buildroot}/%{_sysconfdir}/init.d/xen*
 rm -f  %{buildroot}/%{_bindir}/*trace*
 rm -f  %{buildroot}/%{_bindir}/vchan-socket-proxy
@ -976,7 +982,6 @@ rm -f  %{buildroot}/usr/libexec/qemu-bridge-helper
 /usr/bin/pygrub
 /usr/bin/vchan-socket-proxy
 /usr/bin/xencov_split
-/usr/bin/xentrace_format
 %ifarch x86_64
 /usr/bin/xen-cpuid
 %endif
@ -1076,7 +1081,7 @@ rm -f  %{buildroot}/usr/libexec/qemu-bridge-helper
 %exclude %{_unitdir}/%{name}-vcpu-watch.service
 %exclude %{_unitdir}/xendomains-wait-disks.service
 %config %{with_systemd_modules_load}
-/etc/bash_completion.d/xl
+%{_datadir}/bash-completion/completions/xl
 %dir %{_libdir}/python%{pyver}/site-packages/grub
 %dir %{_libdir}/python%{pyver}/site-packages/xen
 %dir %{_libdir}/python%{pyver}/site-packages/xen/lowlevel
--- a/xen.sysconfig-fillup.patch
+++ b/xen.sysconfig-fillup.patch
@ -18,10 +18,10 @@ Basically fillup removed all comments, and also the two added key=value lines.

 Prevent this by defining all keys, with empty values, so that consumers
 of the values will continue to use the built-in defaults.
-Index: xen-4.16.0-testing/tools/hotplug/Linux/init.d/sysconfig.xencommons.in
+Index: xen-4.19.0-testing/tools/hotplug/Linux/init.d/sysconfig.xencommons.in
 ===================================================================
--- xen-4.16.0-testing.orig/tools/hotplug/Linux/init.d/sysconfig.xencommons.in
-+++ xen-4.16.0-testing/tools/hotplug/Linux/init.d/sysconfig.xencommons.in
+--- xen-4.19.0-testing.orig/tools/hotplug/Linux/init.d/sysconfig.xencommons.in
+++ xen-4.19.0-testing/tools/hotplug/Linux/init.d/sysconfig.xencommons.in
@@ -3,7 +3,9 @@
 ## Default: "none"
 #
@ -55,20 +55,19 @@ Index: xen-4.16.0-testing/tools/hotplug/Linux/init.d/sysconfig.xencommons.in
 
 ## Type: string
 ## Default: unlimited
-@@ -57,9 +59,10 @@ XENSTORED_ARGS=
+@@ -57,8 +59,9 @@ XENSTORED_ARGS=
 ## Type: string
 ## Default: Not defined, tracing off
 #
 -# Log xenstored messages
-+# Log xenstored messages if a non-empty value is assigned.
- # Only evaluated if XENSTORETYPE is "daemon".
 -#XENSTORED_TRACE=[yes|on|1]
+# Log xenstored messages if a non-empty value is assigned.
 +#
 +XENSTORED_TRACE=
 
 ## Type: integer
 ## Default: 50
-@@ -75,14 +78,14 @@ XENSTORED_ARGS=
+@@ -74,14 +77,14 @@ XENSTORED_ARGS=
 #
 # xenstore domain kernel.
 # Only evaluated if XENSTORETYPE is "domain".
@ -85,7 +84,7 @@ Index: xen-4.16.0-testing/tools/hotplug/Linux/init.d/sysconfig.xencommons.in
 
 ## Type: string
 ## Default: not set, no autoballooning of xenstore domain
-@@ -93,7 +96,7 @@ XENSTORED_ARGS=
+@@ -92,7 +95,7 @@ XENSTORED_ARGS=
 # - combination of both in form of <val>:<frac> (e.g. 8:1/100), resulting
 #   value will be the higher of both specifications
 # Only evaluated if XENSTORETYPE is "domain".
@ -94,7 +93,7 @@ Index: xen-4.16.0-testing/tools/hotplug/Linux/init.d/sysconfig.xencommons.in
 
 ## Type: string
 ## Default: ""
-@@ -106,4 +109,4 @@ XENSTORE_DOMAIN_ARGS=
+@@ -105,4 +108,4 @@ XENSTORE_DOMAIN_ARGS=
 #QEMU_XEN=@qemu_xen_path@
 
 # Dom0 UUID
--- a/xenstore-run-in-studomain.patch
+++ b/xenstore-run-in-studomain.patch
@ -11,7 +11,7 @@ References: fate#323663 - Run Xenstore in stubdomain
 #
 # Select type of xentore service.
 #
-@@ -81,14 +81,14 @@ XENSTORED_TRACE=
+@@ -80,14 +80,14 @@ XENSTORED_TRACE=
 XENSTORE_DOMAIN_KERNEL=
 
 ## Type: integer
@ -49,6 +49,6 @@ References: fate#323663 - Run Xenstore in stubdomain
 -	[ -z "$XENSTORE_MAX_DOMAIN_SIZE" ] || XENSTORE_DOMAIN_ARGS="$XENSTORE_DOMAIN_ARGS --maxmem $XENSTORE_MAX_DOMAIN_SIZE"
 +	[ -z "$XENSTORE_MAX_DOMAIN_SIZE" ] && XENSTORE_MAX_DOMAIN_SIZE="1/100"
 +	XENSTORE_DOMAIN_ARGS="$XENSTORE_DOMAIN_ARGS --maxmem $XENSTORE_MAX_DOMAIN_SIZE"
+ 	[ -z "$XENSTORED_TRACE" ] || XENSTORE_DOMAIN_ARGS="$XENSTORE_DOMAIN_ARGS -T xenstored-trace.log"
 
 	echo -n Starting $XENSTORE_DOMAIN_KERNEL...
- 	${LIBEXEC_BIN}/init-xenstore-domain $XENSTORE_DOMAIN_ARGS || exit 1
--- a/xenwatchdogd-restart.patch
+++ b/xenwatchdogd-restart.patch
@ -1,93 +1,104 @@
 References: bsc#1178736

 Allow restart of xenwatchdogd in case it terminated unexpectetly.
-Index: xen-4.14.0-testing/tools/misc/xenwatchdogd.c
+Index: xen-4.19.0-testing/tools/misc/xenwatchdogd.c
 ===================================================================
--- xen-4.14.0-testing.orig/tools/misc/xenwatchdogd.c
-+++ xen-4.14.0-testing/tools/misc/xenwatchdogd.c
-@@ -9,12 +9,16 @@
- #include <unistd.h>
- #include <signal.h>
+--- xen-4.19.0-testing.orig/tools/misc/xenwatchdogd.c
+++ xen-4.19.0-testing/tools/misc/xenwatchdogd.c
+@@ -21,6 +21,8 @@
 #include <stdio.h>
+ #include <stdbool.h>
+ #include <getopt.h>
 +#include <libgen.h>
 +#include <syslog.h>
 
- xc_interface *h;
- int id = 0;
+ #define WDOG_MIN_TIMEOUT 2
+ #define WDOG_MIN_SLEEP 1
+@@ -29,9 +31,11 @@
+ static xc_interface *h;
+ static volatile bool safeexit = false;
+ static volatile bool done = false;
 +static const char id_file[] = "/run/xenwatchdog_id.txt";
 
-void daemonize(void)
+-static void daemonize(void)
 +static void daemonize(const char *str)
 {
 +    const char *err_str = "";
     switch (fork()) {
     case -1:
- 	err(1, "fork");
-@@ -23,7 +27,9 @@ void daemonize(void)
+ 	err(EXIT_FAILURE, "fork");
+@@ -40,7 +44,9 @@ static void daemonize(void)
     default:
- 	exit(0);
+ 	exit(EXIT_SUCCESS);
     }
 -    umask(0);
 +#define err(x,s) do { err_str = (s); goto out; } while (0)
 +    openlog(str, LOG_CONS, LOG_DAEMON);
 +    umask(~(S_IRUSR|S_IWUSR));
     if (setsid() < 0)
- 	err(1, "setsid");
+ 	err(EXIT_FAILURE, "setsid");
     if (chdir("/") < 0)
-@@ -34,6 +40,10 @@ void daemonize(void)
-         err(1, "reopen stdout");
+@@ -51,6 +57,10 @@ static void daemonize(void)
+         err(EXIT_FAILURE, "reopen stdout");
     if(freopen("/dev/null", "w", stderr) == NULL)
-         err(1, "reopen stderr");
+         err(EXIT_FAILURE, "reopen stderr");
 +    return;
 +out:
 +    syslog(LOG_ERR, "%s: %m", err_str);
 +    exit(1);
 }
 
- void catch_exit(int sig)
-@@ -47,18 +57,21 @@ void catch_usr1(int sig)
+ static void catch_exit(int sig)
+@@ -62,6 +72,7 @@ static void catch_usr1(int sig)
 {
-     if (id)
-         xc_watchdog(h, id, 0);
+     safeexit = true;
+     done = true;
 +    unlink(id_file);
-     exit(0);
 }
 
+ static void __attribute__((noreturn)) usage(int exit_code)
+@@ -98,10 +109,12 @@ static int parse_secs(const char *arg, c
+ 
 int main(int argc, char **argv)
 {
 +    FILE *f;
+     int id;
     int t, s;
     int ret;
+     bool daemon = true;
 +    const char *err_str = "";
 
-     if (argc < 2)
- 	errx(1, "usage: %s <timeout> <sleep>", argv[0]);
+     for ( ;; )
+     {
+@@ -160,7 +173,7 @@ int main(int argc, char **argv)
+ 	s = t / 2;
 
-    daemonize();
-+    daemonize(basename(argv[0]));
+     if (daemon)
+-	daemonize();
+	daemonize(basename(argv[0]));
 
     h = xc_interface_open(NULL, NULL, 0);
     if (h == NULL)
-@@ -86,9 +99,25 @@ int main(int argc, char **argv)
+@@ -177,9 +190,25 @@ int main(int argc, char **argv)
     if (signal(SIGUSR1, &catch_usr1) == SIG_ERR)
- 	err(1, "signal");
+ 	err(EXIT_FAILURE, "signal");
 
 -    id = xc_watchdog(h, 0, t);
 -    if (id <= 0)
-        err(1, "xc_watchdog setup");
+-        err(EXIT_FAILURE, "xc_watchdog setup");
 +    f = fopen(id_file, "r");
 +    if (f) {
 +        if (fscanf(f, "%d", &id) != 1)
 +            id = -1;
 +        if (id <= 0)
-+            err(1, "xc_watchdog setup");
+            err(EXIT_FAILURE, "xc_watchdog setup");
 +        syslog(LOG_INFO, "reusing id %d", id);
 +        fclose(f);
 +    } else {
 +        id = xc_watchdog(h, 0, t);
 +        syslog(LOG_INFO, "obtained id %d", id);
 +        if (id <= 0)
-+            err(1, "xc_watchdog setup");
+            err(EXIT_FAILURE, "xc_watchdog setup");
 +        f = fopen(id_file, "w");
 +        if (f) {
 +            fprintf(f, "%d\n", id);
@ -95,14 +106,14 @@ Index: xen-4.14.0-testing/tools/misc/xenwatchdogd.c
 +        }
 +    }
 
-     for (;;) {
+     while (!done) {
         sleep(s);
-@@ -96,4 +125,8 @@ int main(int argc, char **argv)
-         if (ret != 0)
-             err(1, "xc_watchdog");
-     }
+@@ -191,4 +220,8 @@ int main(int argc, char **argv)
+     // Zero seconds timeout will disarm the watchdog timer
+     xc_watchdog(h, id, safeexit ? 0 : WDOG_EXIT_TIMEOUT);
+     return 0;
 +
 +out:
 +    syslog(LOG_ERR, "%s: %m", err_str);
-+    exit(1);
+    exit(EXIT_FAILURE);
 }
--- a/xl-save-pc.patch
+++ b/xl-save-pc.patch
@ -40,8 +40,8 @@ Keep going if the event type and shutdown reason remains the same.
 install: all
 --- a/tools/xl/xl.h
 +++ b/tools/xl/xl.h
-@@ -303,6 +303,7 @@ typedef enum {
-     DOMAIN_RESTART_SOFT_RESET,   /* Soft reset should be performed */
+@@ -306,6 +306,7 @@ typedef enum {
+     DOMAIN_RESTART_SUSPENDED,    /* Domain suspended - keep looping */
 } domain_restart_type;
 
 +#define XL_SAVE_PAUSE_CHECKPOINT "suse-xl-save-pc"
@ -102,7 +102,7 @@ Keep going if the event type and shutdown reason remains the same.
 #include <libxl.h>
 #include <libxl_utils.h>
 #include <libxlutil.h>
-@@ -668,6 +669,10 @@ int create_domain(struct domain_create *
+@@ -706,6 +707,10 @@ int create_domain(struct domain_create *
     int migrate_fd = dom_info->migrate_fd;
     bool config_in_json;
 
@ -113,7 +113,7 @@ Keep going if the event type and shutdown reason remains the same.
     int i;
     int need_daemon = daemonize;
     int ret, rc;
-@@ -1034,6 +1039,24 @@ start:
+@@ -1073,6 +1078,24 @@ start:
         ret = domain_wait_event(domid, &event);
         if (ret) goto out;
 
@ -138,7 +138,7 @@ Keep going if the event type and shutdown reason remains the same.
         switch (event->type) {
 
         case LIBXL_EVENT_TYPE_DOMAIN_SHUTDOWN:
-@@ -1095,14 +1118,39 @@ start:
+@@ -1134,10 +1157,34 @@ start:
                 goto start;
 
             case DOMAIN_RESTART_NONE:
@ -171,10 +171,5 @@ Keep going if the event type and shutdown reason remains the same.
                 goto out;
 +                }
 
-             default:
-                 abort();
-             }
-+            break;
- 
-         case LIBXL_EVENT_TYPE_DOMAIN_DEATH:
-             LOG("Domain %u has been destroyed.", domid);
+             case DOMAIN_RESTART_SUSPENDED:
+                 LOG("Continue waiting for domain %u", domid);
Author	SHA256	Message	Date
Adrian Schröter	5be7b338bb	Sync from SUSE:SLFO:Main xen revision 4d5e5d4e9a7a0dfde59c1d61df70884b	2025-02-07 18:47:59 +01:00
Adrian Schröter	4ce9e75764	Sync from SUSE:SLFO:Main xen revision 8d29a7d10d60058ce13aa728041a2bc4	2024-12-09 12:16:23 +01:00
Adrian Schröter	245e26a41b	Sync from SUSE:SLFO:Main xen revision 4c1c9473a770d45c019a6b6be8512faa	2024-10-18 15:48:08 +02:00
Adrian Schröter	8b440090d6	Sync from SUSE:SLFO:Main xen revision 54ebbe781035741953178d5d7cea2263	2024-10-01 08:54:04 +02:00