Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package xen for openSUSE:Factory checked in
at 2022-12-10 21:17:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xen (Old)
and /work/SRC/openSUSE:Factory/.xen.new.1835 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xen"
Sat Dec 10 21:17:47 2022 rev:323 rq:1041918 version:4.17.0_02
Changes:
--------
--- /work/SRC/openSUSE:Factory/xen/xen.changes 2022-09-02 21:56:43.224322251
+0200
+++ /work/SRC/openSUSE:Factory/.xen.new.1835/xen.changes 2022-12-10
21:18:07.845662587 +0100
@@ -1,0 +2,76 @@
+Thu Dec 8 10:54:29 MST 2022 - carn...@suse.com
+
+- Update to Xen 4.17.0 FCS release (jsc#PED-1858)
+ xen-4.17.0-testing-src.tar.bz2
+ * On x86 "vga=current" can now be used together with GrUB2's gfxpayload
setting. Note that
+ this requires use of "multiboot2" (and "module2") as the GrUB commands
loading Xen.
+ * The "gnttab" option now has a new command line sub-option for disabling the
+ GNTTABOP_transfer functionality.
+ * The x86 MCE command line option info is now updated.
+ * Out-of-tree builds for the hypervisor now supported.
+ * __ro_after_init support, for marking data as immutable after boot.
+ * The project has officially adopted 4 directives and 24 rules of MISRA-C,
+ added MISRA-C checker build integration, and defined how to document
+ deviations.
+ * IOMMU superpage support on x86, affecting PV guests as well as HVM/PVH ones
+ when they don't share page tables with the CPU (HAP / EPT / NPT).
+ * Support for VIRT_SSBD and MSR_SPEC_CTRL for HVM guests on AMD.
+ * Improved TSC, CPU, and APIC clock frequency calibration on x86.
+ * Support for Xen using x86 Control Flow Enforcement technology for its own
+ protection. Both Shadow Stacks (ROP protection) and Indirect Branch
+ Tracking (COP/JOP protection).
+ * Add mwait-idle support for SPR and ADL on x86.
+ * Extend security support for hosts to 12 TiB of memory on x86.
+ * Add command line option to set cpuid parameters for dom0 at boot time on
x86.
+ * Improved static configuration options on Arm.
+ * cpupools can be specified at boot using device tree on Arm.
+ * It is possible to use PV drivers with dom0less guests, allowing statically
+ booted dom0less guests with PV devices.
+ * On Arm, p2m structures are now allocated out of a pool of memory set aside
at
+ domain creation.
+ * Improved mitigations against Spectre-BHB on Arm.
+ * Support VirtIO-MMIO devices device-tree binding creation in toolstack on
Arm.
+ * Allow setting the number of CPUs to activate at runtime from command line
+ option on Arm.
+ * Grant-table support on Arm was improved and hardened by implementing
+ "simplified M2P-like approach for the xenheap pages"
+ * Add Renesas R-Car Gen4 IPMMU-VMSA support on Arm.
+ * Add i.MX lpuart and i.MX8QM support on Arm.
+ * Improved toolstack build system.
+ * Add Xue - console over USB 3 Debug Capability.
+ * gitlab-ci automation: Fixes and improvements together with new tests.
+ * dropped support for the (x86-only) "vesa-mtrr" and "vesa-remap" command
line options
+- Drop patches contained in new tarball or invalid
+ 62fde97e-tools-libxl-Replace-deprecated-soundhw-on-QEMU-command-line.patch
+ xsa410-01.patch
+ xsa410-02.patch
+ xsa410-03.patch
+ xsa410-04.patch
+ xsa410-05.patch
+ xsa410-06.patch
+ xsa410-07.patch
+ xsa410-08.patch
+ xsa410-09.patch
+ xsa410-10.patch
+ xsa411.patch
+
+-------------------------------------------------------------------
+Wed Sep 28 10:14:10 MDT 2022 - carn...@suse.com
+
+- bsc#1203806 - VUL-0: CVE-2022-33746: xen: P2M pool freeing may
+ take excessively long (XSA-410)
+ xsa410-01.patch
+ xsa410-02.patch
+ xsa410-03.patch
+ xsa410-04.patch
+ xsa410-05.patch
+ xsa410-06.patch
+ xsa410-07.patch
+ xsa410-08.patch
+ xsa410-09.patch
+ xsa410-10.patch
+- bsc#1203807 - VUL-0: CVE-2022-33748: xen: lock order inversion in
+ transitive grant copy handling (XSA-411)
+ xsa411.patch
+
+-------------------------------------------------------------------
@@ -23,0 +100 @@
+ * No upstream changelog found in sources or webpage
Old:
----
62fde97e-tools-libxl-Replace-deprecated-soundhw-on-QEMU-command-line.patch
xen-4.16.2-testing-src.tar.bz2
New:
----
xen-4.17.0-testing-src.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xen.spec ++++++
--- /var/tmp/diff_new_pack.y0ZhNI/_old 2022-12-10 21:18:09.125670071 +0100
+++ /var/tmp/diff_new_pack.y0ZhNI/_new 2022-12-10 21:18:09.129670094 +0100
@@ -28,7 +28,7 @@
Name: xen
ExclusiveArch: %ix86 x86_64 aarch64
-%define xen_build_dir xen-4.16.2-testing
+%define xen_build_dir xen-4.17.0-testing
#
%define with_gdbsx 0
%define with_dom0_support 0
@@ -119,12 +119,12 @@
%endif
Provides: installhint(reboot-needed)
-Version: 4.16.2_04
+Version: 4.17.0_02
Release: 0
Summary: Xen Virtualization: Hypervisor (aka VMM aka Microkernel)
License: GPL-2.0-only
Group: System/Kernel
-Source0: xen-4.16.2-testing-src.tar.bz2
+Source0: xen-4.17.0-testing-src.tar.bz2
Source1: stubdom.tar.bz2
Source2: mini-os.tar.bz2
Source3: xen-utils-0.1.tar.bz2
@@ -155,7 +155,6 @@
# For xen-libs
Source99: baselibs.conf
# Upstream patches
-Patch1:
62fde97e-tools-libxl-Replace-deprecated-soundhw-on-QEMU-command-line.patch
# EMBARGOED security fixes
# libxc
Patch301: libxc-bitmap-long.patch
++++++ aarch64-rename-PSR_MODE_ELxx-to-match-linux-headers.patch ++++++
--- /var/tmp/diff_new_pack.y0ZhNI/_old 2022-12-10 21:18:09.181670399 +0100
+++ /var/tmp/diff_new_pack.y0ZhNI/_new 2022-12-10 21:18:09.185670422 +0100
@@ -10,11 +10,11 @@
xen/include/public/arch-arm.h | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
-Index: xen-4.16.0-testing/xen/include/public/arch-arm.h
+Index: xen-4.17.0-testing/xen/include/public/arch-arm.h
===================================================================
---- xen-4.16.0-testing.orig/xen/include/public/arch-arm.h
-+++ xen-4.16.0-testing/xen/include/public/arch-arm.h
-@@ -375,13 +375,13 @@ typedef uint64_t xen_callback_t;
+--- xen-4.17.0-testing.orig/xen/include/public/arch-arm.h
++++ xen-4.17.0-testing/xen/include/public/arch-arm.h
+@@ -359,13 +359,13 @@ typedef uint64_t xen_callback_t;
/* 64 bit modes */
#define PSR_MODE_BIT 0x10 /* Set iff AArch32 */
@@ -33,6 +33,6 @@
+#define PSR_MODE_EL1t 0x00000004
+#define PSR_MODE_EL0t 0x00000000
- #define PSR_GUEST32_INIT
(PSR_ABT_MASK|PSR_FIQ_MASK|PSR_IRQ_MASK|PSR_MODE_SVC)
- #define PSR_GUEST64_INIT
(PSR_ABT_MASK|PSR_FIQ_MASK|PSR_IRQ_MASK|PSR_MODE_EL1h)
+ /*
+ * We set PSR_Z to be able to boot Linux kernel versions with an invalid
++++++ build-python3-conversion.patch ++++++
--- /var/tmp/diff_new_pack.y0ZhNI/_old 2022-12-10 21:18:09.253670820 +0100
+++ /var/tmp/diff_new_pack.y0ZhNI/_new 2022-12-10 21:18:09.257670843 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.16.0-testing/Config.mk
+Index: xen-4.17.0-testing/Config.mk
===================================================================
---- xen-4.16.0-testing.orig/Config.mk
-+++ xen-4.16.0-testing/Config.mk
+--- xen-4.17.0-testing.orig/Config.mk
++++ xen-4.17.0-testing/Config.mk
@@ -73,7 +73,7 @@ EXTRA_INCLUDES += $(EXTRA_PREFIX)/includ
EXTRA_LIB += $(EXTRA_PREFIX)/lib
endif
@@ -11,11 +11,11 @@
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.16.0-testing/tools/configure
+Index: xen-4.17.0-testing/tools/configure
===================================================================
---- xen-4.16.0-testing.orig/tools/configure
-+++ xen-4.16.0-testing/tools/configure
-@@ -7276,15 +7276,15 @@ if test x"${PYTHONPATH}" = x"no"
+--- xen-4.17.0-testing.orig/tools/configure
++++ xen-4.17.0-testing/tools/configure
+@@ -7343,15 +7343,15 @@ if test x"${PYTHONPATH}" = x"no"
then
as_fn_error $? "Unable to find $PYTHON, please install $PYTHON" "$LINENO"
5
fi
@@ -35,11 +35,11 @@
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
-Index: xen-4.16.0-testing/tools/configure.ac
+Index: xen-4.17.0-testing/tools/configure.ac
===================================================================
---- xen-4.16.0-testing.orig/tools/configure.ac
-+++ xen-4.16.0-testing/tools/configure.ac
-@@ -357,7 +357,7 @@ PYTHONPATH=$PYTHON
+--- xen-4.17.0-testing.orig/tools/configure.ac
++++ xen-4.17.0-testing/tools/configure.ac
+@@ -361,7 +361,7 @@ PYTHONPATH=$PYTHON
PYTHON=`basename $PYTHONPATH`
AX_PATH_PROG_OR_FAIL([PYTHONPATH], [$PYTHON])
@@ -48,10 +48,10 @@
AS_IF([test "$cross_compiling" != yes], [
AX_CHECK_PYTHON_DEVEL()
-Index: xen-4.16.0-testing/tools/libs/light/idl.py
+Index: xen-4.17.0-testing/tools/libs/light/idl.py
===================================================================
---- xen-4.16.0-testing.orig/tools/libs/light/idl.py
-+++ xen-4.16.0-testing/tools/libs/light/idl.py
+--- xen-4.17.0-testing.orig/tools/libs/light/idl.py
++++ xen-4.17.0-testing/tools/libs/light/idl.py
@@ -271,7 +271,7 @@ class KeyedUnion(Aggregate):
if not isinstance(keyvar_type, Enumeration):
raise ValueError
@@ -79,30 +79,30 @@
if isinstance(t, Type):
globs[n] = t
elif isinstance(t,type(object)) and issubclass(t, Type):
-Index: xen-4.16.0-testing/tools/libs/light/gentest.py
+Index: xen-4.17.0-testing/tools/libs/light/gentest.py
===================================================================
---- xen-4.16.0-testing.orig/tools/libs/light/gentest.py
-+++ xen-4.16.0-testing/tools/libs/light/gentest.py
+--- xen-4.17.0-testing.orig/tools/libs/light/gentest.py
++++ xen-4.17.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.16.0-testing/tools/libs/light/gentypes.py
+Index: xen-4.17.0-testing/tools/libs/light/gentypes.py
===================================================================
---- xen-4.16.0-testing.orig/tools/libs/light/gentypes.py
-+++ xen-4.16.0-testing/tools/libs/light/gentypes.py
+--- xen-4.17.0-testing.orig/tools/libs/light/gentypes.py
++++ xen-4.17.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.16.0-testing/tools/ocaml/libs/xentoollog/genlevels.py
+Index: xen-4.17.0-testing/tools/ocaml/libs/xentoollog/genlevels.py
===================================================================
---- xen-4.16.0-testing.orig/tools/ocaml/libs/xentoollog/genlevels.py
-+++ xen-4.16.0-testing/tools/ocaml/libs/xentoollog/genlevels.py
+--- xen-4.17.0-testing.orig/tools/ocaml/libs/xentoollog/genlevels.py
++++ xen-4.17.0-testing/tools/ocaml/libs/xentoollog/genlevels.py
@@ -89,7 +89,7 @@ def gen_c(level):
def autogen_header(open_comment, close_comment):
s = open_comment + " AUTO-GENERATED FILE DO NOT EDIT " + close_comment +
"\n"
@@ -112,60 +112,60 @@
s += "%s" % " ".join(sys.argv)
s += "\n " + close_comment + "\n\n"
return s
-Index: xen-4.16.0-testing/tools/include/xen-foreign/mkheader.py
+Index: xen-4.17.0-testing/tools/include/xen-foreign/mkheader.py
===================================================================
---- xen-4.16.0-testing.orig/tools/include/xen-foreign/mkheader.py
-+++ xen-4.16.0-testing/tools/include/xen-foreign/mkheader.py
+--- xen-4.17.0-testing.orig/tools/include/xen-foreign/mkheader.py
++++ xen-4.17.0-testing/tools/include/xen-foreign/mkheader.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
- import sys, re;
- from structs import unions, structs, defines;
-Index: xen-4.16.0-testing/tools/include/xen-foreign/mkchecker.py
+ from __future__ import print_function
+
+Index: xen-4.17.0-testing/tools/include/xen-foreign/mkchecker.py
===================================================================
---- xen-4.16.0-testing.orig/tools/include/xen-foreign/mkchecker.py
-+++ xen-4.16.0-testing/tools/include/xen-foreign/mkchecker.py
+--- xen-4.17.0-testing.orig/tools/include/xen-foreign/mkchecker.py
++++ xen-4.17.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.16.0-testing/xen/tools/gen-cpuid.py
+Index: xen-4.17.0-testing/xen/tools/gen-cpuid.py
===================================================================
---- xen-4.16.0-testing.orig/xen/tools/gen-cpuid.py
-+++ xen-4.16.0-testing/xen/tools/gen-cpuid.py
+--- xen-4.17.0-testing.orig/xen/tools/gen-cpuid.py
++++ xen-4.17.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.16.0-testing/xen/tools/compat-build-source.py
+Index: xen-4.17.0-testing/xen/tools/compat-build-source.py
===================================================================
---- xen-4.16.0-testing.orig/xen/tools/compat-build-source.py
-+++ xen-4.16.0-testing/xen/tools/compat-build-source.py
+--- xen-4.17.0-testing.orig/xen/tools/compat-build-source.py
++++ xen-4.17.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.16.0-testing/xen/tools/compat-build-header.py
+Index: xen-4.17.0-testing/xen/tools/compat-build-header.py
===================================================================
---- xen-4.16.0-testing.orig/xen/tools/compat-build-header.py
-+++ xen-4.16.0-testing/xen/tools/compat-build-header.py
+--- xen-4.17.0-testing.orig/xen/tools/compat-build-header.py
++++ xen-4.17.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.16.0-testing/tools/misc/xensymoops
+Index: xen-4.17.0-testing/tools/misc/xensymoops
===================================================================
---- xen-4.16.0-testing.orig/tools/misc/xensymoops
-+++ xen-4.16.0-testing/tools/misc/xensymoops
+--- xen-4.17.0-testing.orig/tools/misc/xensymoops
++++ xen-4.17.0-testing/tools/misc/xensymoops
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
++++++ libxc-bitmap-long.patch ++++++
--- /var/tmp/diff_new_pack.y0ZhNI/_old 2022-12-10 21:18:09.289671030 +0100
+++ /var/tmp/diff_new_pack.y0ZhNI/_new 2022-12-10 21:18:09.289671030 +0100
@@ -30,7 +30,7 @@
#include <stdlib.h>
#include <string.h>
-@@ -77,4 +78,31 @@ static inline void bitmap_or(void *_dst,
+@@ -81,4 +82,31 @@ static inline void bitmap_or(void *_dst,
dst[i] |= other[i];
}
++++++ libxc-sr-LIBXL_HAVE_DOMAIN_SUSPEND_PROPS.patch ++++++
--- /var/tmp/diff_new_pack.y0ZhNI/_old 2022-12-10 21:18:09.301671101 +0100
+++ /var/tmp/diff_new_pack.y0ZhNI/_new 2022-12-10 21:18:09.305671124 +0100
@@ -21,7 +21,7 @@
--- a/tools/include/libxl.h
+++ b/tools/include/libxl.h
-@@ -1750,13 +1750,28 @@ static inline int libxl_retrieve_domain_
+@@ -1765,13 +1765,28 @@ static inline int libxl_retrieve_domain_
libxl_retrieve_domain_configuration_0x041200
#endif
++++++ libxc-sr-abort_if_busy.patch ++++++
--- /var/tmp/diff_new_pack.y0ZhNI/_old 2022-12-10 21:18:09.313671171 +0100
+++ /var/tmp/diff_new_pack.y0ZhNI/_new 2022-12-10 21:18:09.317671194 +0100
@@ -36,7 +36,7 @@
--- a/docs/man/xl.1.pod.in
+++ b/docs/man/xl.1.pod.in
-@@ -508,6 +508,14 @@ low, the guest is suspended and the domU
+@@ -507,6 +507,14 @@ low, the guest is suspended and the domU
This allows the host admin to control for how long the domU will likely
be suspended during transit.
@@ -53,7 +53,7 @@
=item B<remus> [I<OPTIONS>] I<domain-id> I<host>
--- a/tools/include/libxl.h
+++ b/tools/include/libxl.h
-@@ -1763,6 +1763,7 @@ typedef struct {
+@@ -1778,6 +1778,7 @@ typedef struct {
} libxl_domain_suspend_suse_properties;
#define LIBXL_SUSPEND_DEBUG 1
#define LIBXL_SUSPEND_LIVE 2
@@ -93,7 +93,7 @@
dss->checkpointed_stream = LIBXL_CHECKPOINTED_STREAM_NONE;
--- a/tools/libs/light/libxl_internal.h
+++ b/tools/libs/light/libxl_internal.h
-@@ -3647,9 +3647,11 @@ struct libxl__domain_save_state {
+@@ -3653,9 +3653,11 @@ struct libxl__domain_save_state {
libxl_domain_type type;
int live;
int debug;
++++++ libxc-sr-max_iters.patch ++++++
--- /var/tmp/diff_new_pack.y0ZhNI/_old 2022-12-10 21:18:09.329671264 +0100
+++ /var/tmp/diff_new_pack.y0ZhNI/_new 2022-12-10 21:18:09.329671264 +0100
@@ -33,7 +33,7 @@
--- a/docs/man/xl.1.pod.in
+++ b/docs/man/xl.1.pod.in
-@@ -496,6 +496,10 @@ such that it will be identical on the de
+@@ -495,6 +495,10 @@ such that it will be identical on the de
configuration is overridden using the B<-C> option. Note that it is not
possible to use this option for a 'localhost' migration.
@@ -46,7 +46,7 @@
=item B<remus> [I<OPTIONS>] I<domain-id> I<host>
--- a/tools/include/libxl.h
+++ b/tools/include/libxl.h
-@@ -1758,6 +1758,7 @@ static inline int libxl_retrieve_domain_
+@@ -1773,6 +1773,7 @@ static inline int libxl_retrieve_domain_
typedef struct {
uint32_t flags; /* LIBXL_SUSPEND_* */
@@ -77,7 +77,7 @@
dss->checkpointed_stream = LIBXL_CHECKPOINTED_STREAM_NONE;
--- a/tools/libs/light/libxl_internal.h
+++ b/tools/libs/light/libxl_internal.h
-@@ -3648,6 +3648,7 @@ struct libxl__domain_save_state {
+@@ -3654,6 +3654,7 @@ struct libxl__domain_save_state {
int live;
int debug;
int checkpointed_stream;
++++++ libxc-sr-min_remaining.patch ++++++
--- /var/tmp/diff_new_pack.y0ZhNI/_old 2022-12-10 21:18:09.365671474 +0100
+++ /var/tmp/diff_new_pack.y0ZhNI/_new 2022-12-10 21:18:09.369671497 +0100
@@ -34,7 +34,7 @@
--- a/docs/man/xl.1.pod.in
+++ b/docs/man/xl.1.pod.in
-@@ -500,6 +500,14 @@ possible to use this option for a 'local
+@@ -499,6 +499,14 @@ possible to use this option for a 'local
Number of copy iterations before final suspend+move (default: 5)
@@ -51,7 +51,7 @@
=item B<remus> [I<OPTIONS>] I<domain-id> I<host>
--- a/tools/include/libxl.h
+++ b/tools/include/libxl.h
-@@ -1759,6 +1759,7 @@ static inline int libxl_retrieve_domain_
+@@ -1774,6 +1774,7 @@ static inline int libxl_retrieve_domain_
typedef struct {
uint32_t flags; /* LIBXL_SUSPEND_* */
uint32_t max_iters;
@@ -82,7 +82,7 @@
dss->checkpointed_stream = LIBXL_CHECKPOINTED_STREAM_NONE;
--- a/tools/libs/light/libxl_internal.h
+++ b/tools/libs/light/libxl_internal.h
-@@ -3649,6 +3649,7 @@ struct libxl__domain_save_state {
+@@ -3655,6 +3655,7 @@ struct libxl__domain_save_state {
int debug;
int checkpointed_stream;
uint32_t max_iters;
++++++ libxc-sr-number-of-iterations.patch ++++++
--- /var/tmp/diff_new_pack.y0ZhNI/_old 2022-12-10 21:18:09.381671568 +0100
+++ /var/tmp/diff_new_pack.y0ZhNI/_new 2022-12-10 21:18:09.385671592 +0100
@@ -13,7 +13,7 @@
--- a/tools/libs/light/libxl_internal.h
+++ b/tools/libs/light/libxl_internal.h
-@@ -124,7 +124,7 @@
+@@ -123,7 +123,7 @@
#define DOMID_XS_PATH "domid"
#define PVSHIM_BASENAME "xen-shim"
#define PVSHIM_CMDLINE "pv-shim console=xen,pv"
++++++ libxc-sr-precopy_policy.patch ++++++
--- /var/tmp/diff_new_pack.y0ZhNI/_old 2022-12-10 21:18:09.393671638 +0100
+++ /var/tmp/diff_new_pack.y0ZhNI/_new 2022-12-10 21:18:09.397671662 +0100
@@ -60,7 +60,7 @@
dss->sws.dss = dss;
--- a/tools/libs/light/libxl_internal.h
+++ b/tools/libs/light/libxl_internal.h
-@@ -124,6 +124,8 @@
+@@ -123,6 +123,8 @@
#define DOMID_XS_PATH "domid"
#define PVSHIM_BASENAME "xen-shim"
#define PVSHIM_CMDLINE "pv-shim console=xen,pv"
++++++ libxc-sr-readv_exact.patch ++++++
--- /var/tmp/diff_new_pack.y0ZhNI/_old 2022-12-10 21:18:09.409671732 +0100
+++ /var/tmp/diff_new_pack.y0ZhNI/_new 2022-12-10 21:18:09.413671755 +0100
@@ -93,7 +93,7 @@
struct iovec *local_iov = NULL;
--- a/tools/libs/ctrl/xc_private.h
+++ b/tools/libs/ctrl/xc_private.h
-@@ -408,6 +408,7 @@ int xc_flush_mmu_updates(xc_interface *x
+@@ -394,6 +394,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 */
++++++ libxc-sr-restore-hvm-legacy-superpage.patch ++++++
--- /var/tmp/diff_new_pack.y0ZhNI/_old 2022-12-10 21:18:09.425671825 +0100
+++ /var/tmp/diff_new_pack.y0ZhNI/_new 2022-12-10 21:18:09.429671849 +0100
@@ -44,7 +44,7 @@
--- a/tools/libs/guest/xg_private.h
+++ b/tools/libs/guest/xg_private.h
-@@ -179,4 +179,9 @@ struct xc_cpu_policy {
+@@ -180,4 +180,9 @@ struct xc_cpu_policy {
};
#endif /* x86 */
++++++ libxc-sr-track-migration-time.patch ++++++
--- /var/tmp/diff_new_pack.y0ZhNI/_old 2022-12-10 21:18:09.473672106 +0100
+++ /var/tmp/diff_new_pack.y0ZhNI/_new 2022-12-10 21:18:09.477672130 +0100
@@ -62,7 +62,7 @@
--- a/tools/libs/ctrl/xc_private.h
+++ b/tools/libs/ctrl/xc_private.h
-@@ -43,6 +43,15 @@
+@@ -41,6 +41,15 @@
#include <xen-tools/libs.h>
++++++ libxc-sr-xl-migration-debug.patch ++++++
--- /var/tmp/diff_new_pack.y0ZhNI/_old 2022-12-10 21:18:09.489672200 +0100
+++ /var/tmp/diff_new_pack.y0ZhNI/_new 2022-12-10 21:18:09.493672223 +0100
@@ -22,7 +22,7 @@
--- a/docs/man/xl.1.pod.in
+++ b/docs/man/xl.1.pod.in
-@@ -481,7 +481,9 @@ domain.
+@@ -480,7 +480,9 @@ domain.
=item B<--debug>
++++++ libxl.LIBXL_HOTPLUG_TIMEOUT.patch ++++++
--- /var/tmp/diff_new_pack.y0ZhNI/_old 2022-12-10 21:18:09.505672293 +0100
+++ /var/tmp/diff_new_pack.y0ZhNI/_new 2022-12-10 21:18:09.509672316 +0100
@@ -52,10 +52,10 @@
The change for libxl which handles this xenstore value will enable
additional logging if the key is found. That extra logging will show how
the execution time of each script.
-Index: xen-4.16.0-testing/tools/libs/light/libxl_aoutils.c
+Index: xen-4.17.0-testing/tools/libs/light/libxl_aoutils.c
===================================================================
---- xen-4.16.0-testing.orig/tools/libs/light/libxl_aoutils.c
-+++ xen-4.16.0-testing/tools/libs/light/libxl_aoutils.c
+--- xen-4.17.0-testing.orig/tools/libs/light/libxl_aoutils.c
++++ xen-4.17.0-testing/tools/libs/light/libxl_aoutils.c
@@ -529,6 +529,8 @@ static void async_exec_timeout(libxl__eg
{
libxl__async_exec_state *aes = CONTAINER_OF(ev, *aes, time);
@@ -85,11 +85,11 @@
libxl__ev_time_deregister(gc, &aes->time);
-Index: xen-4.16.0-testing/tools/libs/light/libxl_create.c
+Index: xen-4.17.0-testing/tools/libs/light/libxl_create.c
===================================================================
---- xen-4.16.0-testing.orig/tools/libs/light/libxl_create.c
-+++ xen-4.16.0-testing/tools/libs/light/libxl_create.c
-@@ -1281,6 +1281,7 @@ static void initiate_domain_create(libxl
+--- xen-4.17.0-testing.orig/tools/libs/light/libxl_create.c
++++ xen-4.17.0-testing/tools/libs/light/libxl_create.c
+@@ -1308,6 +1308,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);
@@ -97,11 +97,11 @@
for (i = 0; i < d_config->num_disks; i++) {
ret = libxl__disk_devtype.set_default(gc, domid, &d_config->disks[i],
-Index: xen-4.16.0-testing/tools/libs/light/libxl_device.c
+Index: xen-4.17.0-testing/tools/libs/light/libxl_device.c
===================================================================
---- xen-4.16.0-testing.orig/tools/libs/light/libxl_device.c
-+++ xen-4.16.0-testing/tools/libs/light/libxl_device.c
-@@ -1218,7 +1218,7 @@ static void device_hotplug(libxl__egc *e
+--- xen-4.17.0-testing.orig/tools/libs/light/libxl_device.c
++++ xen-4.17.0-testing/tools/libs/light/libxl_device.c
+@@ -1277,7 +1277,7 @@ static void device_hotplug(libxl__egc *e
}
aes->ao = ao;
@@ -110,7 +110,7 @@
aes->env = env;
aes->args = args;
aes->callback = device_hotplug_child_death_cb;
-@@ -1227,6 +1227,15 @@ static void device_hotplug(libxl__egc *e
+@@ -1286,6 +1286,15 @@ static void device_hotplug(libxl__egc *e
aes->stdfds[1] = 2;
aes->stdfds[2] = -1;
@@ -126,11 +126,11 @@
rc = libxl__async_exec_start(aes);
if (rc)
goto out;
-Index: xen-4.16.0-testing/tools/libs/light/libxl_event.c
+Index: xen-4.17.0-testing/tools/libs/light/libxl_event.c
===================================================================
---- xen-4.16.0-testing.orig/tools/libs/light/libxl_event.c
-+++ xen-4.16.0-testing/tools/libs/light/libxl_event.c
-@@ -1033,27 +1033,29 @@ static void devstate_callback(libxl__egc
+--- xen-4.17.0-testing.orig/tools/libs/light/libxl_event.c
++++ xen-4.17.0-testing/tools/libs/light/libxl_event.c
+@@ -1032,27 +1032,29 @@ static void devstate_callback(libxl__egc
{
EGC_GC;
libxl__ev_devstate *ds = CONTAINER_OF(xsw, *ds, w);
@@ -167,7 +167,7 @@
return;
}
-@@ -1079,6 +1081,8 @@ int libxl__ev_devstate_wait(libxl__ao *a
+@@ -1078,6 +1080,8 @@ int libxl__ev_devstate_wait(libxl__ao *a
ds->w.path = state_path;
ds->w.timeout_ms = milliseconds;
ds->w.callback = devstate_callback;
@@ -176,10 +176,10 @@
rc = libxl__xswait_start(gc, &ds->w);
if (rc) goto out;
-Index: xen-4.16.0-testing/tools/libs/light/libxl_internal.c
+Index: xen-4.17.0-testing/tools/libs/light/libxl_internal.c
===================================================================
---- xen-4.16.0-testing.orig/tools/libs/light/libxl_internal.c
-+++ xen-4.16.0-testing/tools/libs/light/libxl_internal.c
+--- xen-4.17.0-testing.orig/tools/libs/light/libxl_internal.c
++++ xen-4.17.0-testing/tools/libs/light/libxl_internal.c
@@ -18,6 +18,97 @@
#include "libxl_internal.h"
#include "libxl_arch.h"
@@ -278,10 +278,10 @@
void libxl__alloc_failed(libxl_ctx *ctx, const char *func,
size_t nmemb, size_t size) {
#define M "libxl: FATAL ERROR: memory allocation failure"
-Index: xen-4.16.0-testing/tools/libs/light/libxl_internal.h
+Index: xen-4.17.0-testing/tools/libs/light/libxl_internal.h
===================================================================
---- xen-4.16.0-testing.orig/tools/libs/light/libxl_internal.h
-+++ xen-4.16.0-testing/tools/libs/light/libxl_internal.h
+--- xen-4.17.0-testing.orig/tools/libs/light/libxl_internal.h
++++ xen-4.17.0-testing/tools/libs/light/libxl_internal.h
@@ -50,6 +50,7 @@
#include <sys/un.h>
#include <sys/file.h>
@@ -290,7 +290,7 @@
#include <xenevtchn.h>
#include <xenstore.h>
-@@ -1621,6 +1622,7 @@ struct libxl__xswait_state {
+@@ -1627,6 +1628,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) */
@@ -298,7 +298,7 @@
libxl__xswait_callback *callback;
/* remaining fields are private to xswait */
libxl__ev_time time_ev;
-@@ -2699,6 +2701,7 @@ struct libxl__async_exec_state {
+@@ -2705,6 +2707,7 @@ struct libxl__async_exec_state {
char **args; /* execution arguments */
char **env; /* execution environment */
@@ -306,7 +306,7 @@
/* private */
libxl__ev_time time;
libxl__ev_child child;
-@@ -4871,6 +4874,9 @@ int libxl__setresuid(uid_t ruid, uid_t e
+@@ -4880,6 +4883,9 @@ _hidden int libxl__domain_set_paging_mem
#endif
++++++ libxl.add-option-to-disable-disk-cache-flushes-in-qdisk.patch ++++++
--- /var/tmp/diff_new_pack.y0ZhNI/_old 2022-12-10 21:18:09.517672363 +0100
+++ /var/tmp/diff_new_pack.y0ZhNI/_new 2022-12-10 21:18:09.521672387 +0100
@@ -7,13 +7,13 @@
tools/libxl/libxlu_disk_l.l | 1 +
5 files changed, 18 insertions(+), 1 deletion(-)
-Index: xen-4.16.2-testing/docs/man/xl-disk-configuration.5.pod.in
+Index: xen-4.17.0-testing/docs/man/xl-disk-configuration.5.pod.in
===================================================================
---- xen-4.16.2-testing.orig/docs/man/xl-disk-configuration.5.pod.in
-+++ xen-4.16.2-testing/docs/man/xl-disk-configuration.5.pod.in
-@@ -344,6 +344,32 @@ can be used to disable "hole punching" f
- were intentionally created non-sparse to avoid fragmentation of the
- file.
+--- xen-4.17.0-testing.orig/docs/man/xl-disk-configuration.5.pod.in
++++ xen-4.17.0-testing/docs/man/xl-disk-configuration.5.pod.in
+@@ -337,6 +337,32 @@ No
+
+ discard
+=item B<suse-diskcache-disable-flush>
+
@@ -43,13 +43,13 @@
+
=back
-
-Index: xen-4.16.2-testing/tools/include/libxl.h
+ An advisory setting for the backend driver, specifying whether to
+Index: xen-4.17.0-testing/tools/include/libxl.h
===================================================================
---- xen-4.16.2-testing.orig/tools/include/libxl.h
-+++ xen-4.16.2-testing/tools/include/libxl.h
-@@ -528,6 +528,21 @@
- #define LIBXL_HAVE_MAX_GRANT_VERSION 1
+--- xen-4.17.0-testing.orig/tools/include/libxl.h
++++ xen-4.17.0-testing/tools/include/libxl.h
+@@ -543,6 +543,21 @@
+ #define LIBXL_HAVE_DEVICE_DISK_SPECIFICATION 1
/*
+ * The libxl_device_disk has no way to indicate that cache=unsafe is
@@ -70,23 +70,23 @@
* libxl ABI compatibility
*
* The only guarantee which libxl makes regarding ABI compatibility
-Index: xen-4.16.2-testing/tools/libs/light/libxl_disk.c
+Index: xen-4.17.0-testing/tools/libs/light/libxl_disk.c
===================================================================
---- xen-4.16.2-testing.orig/tools/libs/light/libxl_disk.c
-+++ xen-4.16.2-testing/tools/libs/light/libxl_disk.c
-@@ -387,6 +387,8 @@ static void device_disk_add(libxl__egc *
+--- xen-4.17.0-testing.orig/tools/libs/light/libxl_disk.c
++++ xen-4.17.0-testing/tools/libs/light/libxl_disk.c
+@@ -422,6 +422,8 @@ static void device_disk_add(libxl__egc *
flexarray_append_pair(back, "discard-enable",
libxl_defbool_val(disk->discard_enable) ?
"1" : "0");
+ if (LIBXL_SUSE_IS_CACHE_UNSAFE(disk->readwrite))
+ flexarray_append_pair(back, "suse-diskcache-disable-flush", "1");
-
- flexarray_append(front, "backend-id");
- flexarray_append(front, GCSPRINTF("%d", disk->backend_domid));
-Index: xen-4.16.2-testing/tools/libs/light/libxl_dm.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.17.0-testing/tools/libs/light/libxl_dm.c
===================================================================
---- xen-4.16.2-testing.orig/tools/libs/light/libxl_dm.c
-+++ xen-4.16.2-testing/tools/libs/light/libxl_dm.c
+--- xen-4.17.0-testing.orig/tools/libs/light/libxl_dm.c
++++ xen-4.17.0-testing/tools/libs/light/libxl_dm.c
@@ -1019,14 +1019,27 @@ enum {
LIBXL__COLO_SECONDARY,
};
@@ -164,7 +164,7 @@
break;
default:
abort();
-@@ -1981,8 +1996,8 @@ static int libxl__build_device_model_arg
+@@ -1998,8 +2013,8 @@ static int libxl__build_device_model_arg
return ERROR_INVAL;
}
flexarray_vappend(dm_args, "-drive",
@@ -175,10 +175,10 @@
"-device",
GCSPRINTF("ide-hd,bus=ahci0.%d,unit=0,drive=ahcidisk-%d",
disk, disk), NULL);
continue;
-Index: xen-4.16.2-testing/tools/libs/util/libxlu_disk.c
+Index: xen-4.17.0-testing/tools/libs/util/libxlu_disk.c
===================================================================
---- xen-4.16.2-testing.orig/tools/libs/util/libxlu_disk.c
-+++ xen-4.16.2-testing/tools/libs/util/libxlu_disk.c
+--- xen-4.17.0-testing.orig/tools/libs/util/libxlu_disk.c
++++ xen-4.17.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 @@
if (!disk->vdev) {
xlu__disk_err(&dpc,0, "no vdev specified");
-Index: xen-4.16.2-testing/tools/libs/util/libxlu_disk_i.h
+Index: xen-4.17.0-testing/tools/libs/util/libxlu_disk_i.h
===================================================================
---- xen-4.16.2-testing.orig/tools/libs/util/libxlu_disk_i.h
-+++ xen-4.16.2-testing/tools/libs/util/libxlu_disk_i.h
+--- xen-4.17.0-testing.orig/tools/libs/util/libxlu_disk_i.h
++++ xen-4.17.0-testing/tools/libs/util/libxlu_disk_i.h
@@ -10,7 +10,7 @@ typedef struct {
void *scanner;
YY_BUFFER_STATE buf;
@@ -201,16 +201,16 @@
const char *spec;
} DiskParseContext;
-Index: xen-4.16.2-testing/tools/libs/util/libxlu_disk_l.l
+Index: xen-4.17.0-testing/tools/libs/util/libxlu_disk_l.l
===================================================================
---- xen-4.16.2-testing.orig/tools/libs/util/libxlu_disk_l.l
-+++ xen-4.16.2-testing/tools/libs/util/libxlu_disk_l.l
-@@ -207,6 +207,7 @@ colo-port=[^,]*,? { STRIP(','); setcolop
+--- xen-4.17.0-testing.orig/tools/libs/util/libxlu_disk_l.l
++++ xen-4.17.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); }
hidden-disk=[^,]*,? { STRIP(','); SAVESTRING("hidden-disk", hidden_disk,
FROMEQUALS); }
+suse-diskcache-disable-flush,? { DPC->suse_diskcache_disable_flush = 1; }
- /* the target magic parameter, eats the rest of the string */
-
+ trusted,? { libxl_defbool_set(&DPC->disk->trusted, true); }
+ untrusted,? { libxl_defbool_set(&DPC->disk->trusted, false); }
++++++ libxl.max_event_channels.patch ++++++
--- /var/tmp/diff_new_pack.y0ZhNI/_old 2022-12-10 21:18:09.533672456 +0100
+++ /var/tmp/diff_new_pack.y0ZhNI/_new 2022-12-10 21:18:09.537672481 +0100
@@ -8,17 +8,17 @@
Therefore, just let the built-in default depend on the number of vcpus.
-Index: xen-4.16.0-testing/tools/libs/light/libxl_create.c
+Index: xen-4.17.0-testing/tools/libs/light/libxl_create.c
===================================================================
---- xen-4.16.0-testing.orig/tools/libs/light/libxl_create.c
-+++ xen-4.16.0-testing/tools/libs/light/libxl_create.c
-@@ -262,7 +262,7 @@ int libxl__domain_build_info_setdefault(
+--- xen-4.17.0-testing.orig/tools/libs/light/libxl_create.c
++++ xen-4.17.0-testing/tools/libs/light/libxl_create.c
+@@ -263,7 +263,7 @@ int libxl__domain_build_info_setdefault(
b_info->iomem[i].gfn = b_info->iomem[i].start;
if (!b_info->event_channels)
- b_info->event_channels = 1023;
+ b_info->event_channels = max(1023, 8 * b_info->max_vcpus + 511);
- libxl__arch_domain_build_info_setdefault(gc, b_info);
- libxl_defbool_setdefault(&b_info->dm_restrict, false);
+ rc = libxl_get_physinfo(CTX, &info);
+ if (rc) {
++++++ libxl.pvscsi.patch ++++++
--- /var/tmp/diff_new_pack.y0ZhNI/_old 2022-12-10 21:18:09.545672527 +0100
+++ /var/tmp/diff_new_pack.y0ZhNI/_new 2022-12-10 21:18:09.549672551 +0100
@@ -34,10 +34,10 @@
tools/libxl/xl_cmdtable.c | 15
16 files changed, 2326 insertions(+), 4 deletions(-)
-Index: xen-4.16.1-testing/docs/man/xl.cfg.5.pod.in
+Index: xen-4.17.0-testing/docs/man/xl.cfg.5.pod.in
===================================================================
---- xen-4.16.1-testing.orig/docs/man/xl.cfg.5.pod.in
-+++ xen-4.16.1-testing/docs/man/xl.cfg.5.pod.in
+--- xen-4.17.0-testing.orig/docs/man/xl.cfg.5.pod.in
++++ xen-4.17.0-testing/docs/man/xl.cfg.5.pod.in
@@ -800,6 +800,62 @@ frontend to backend. It can be used as a
For more information about the protocol, see
https://xenbits.xenproject.org/docs/unstable/misc/pvcalls.html.
@@ -101,11 +101,11 @@
=item B<vfb=[ "VFB_SPEC_STRING", "VFB_SPEC_STRING", ...]>
Specifies the paravirtual framebuffer devices which should be supplied
-Index: xen-4.16.1-testing/docs/man/xl.1.pod.in
+Index: xen-4.17.0-testing/docs/man/xl.1.pod.in
===================================================================
---- xen-4.16.1-testing.orig/docs/man/xl.1.pod.in
-+++ xen-4.16.1-testing/docs/man/xl.1.pod.in
-@@ -1610,6 +1610,24 @@ List virtual network interfaces for a do
+--- xen-4.17.0-testing.orig/docs/man/xl.1.pod.in
++++ xen-4.17.0-testing/docs/man/xl.1.pod.in
+@@ -1609,6 +1609,24 @@ List virtual network interfaces for a do
=back
@@ -130,35 +130,35 @@
=head1 PCI PASS-THROUGH
=over 4
-Index: xen-4.16.1-testing/tools/libs/light/Makefile
+Index: xen-4.17.0-testing/tools/libs/light/Makefile
===================================================================
---- xen-4.16.1-testing.orig/tools/libs/light/Makefile
-+++ xen-4.16.1-testing/tools/libs/light/Makefile
-@@ -78,6 +78,7 @@ SRCS-y += libxl.c
- SRCS-y += libxl_create.c
- SRCS-y += libxl_dm.c
- SRCS-y += libxl_pci.c
-+SRCS-y += libxl_vscsi.c
- SRCS-y += libxl_dom.c
- SRCS-y += libxl_exec.c
- SRCS-y += libxl_xshelp.c
-Index: xen-4.16.1-testing/tools/libs/util/Makefile
+--- xen-4.17.0-testing.orig/tools/libs/light/Makefile
++++ xen-4.17.0-testing/tools/libs/light/Makefile
+@@ -71,6 +71,7 @@ OBJS-y += libxl.o
+ OBJS-y += libxl_create.o
+ OBJS-y += libxl_dm.o
+ OBJS-y += libxl_pci.o
++OBJS-y += libxl_vscsi.o
+ OBJS-y += libxl_dom.o
+ OBJS-y += libxl_exec.o
+ OBJS-y += libxl_xshelp.o
+Index: xen-4.17.0-testing/tools/libs/util/Makefile
===================================================================
---- xen-4.16.1-testing.orig/tools/libs/util/Makefile
-+++ xen-4.16.1-testing/tools/libs/util/Makefile
-@@ -8,6 +8,7 @@ SRCS-y += libxlu_disk_l.c
- SRCS-y += libxlu_disk.c
- SRCS-y += libxlu_vif.c
- SRCS-y += libxlu_pci.c
-+SRCS-y += libxlu_vscsi.c
+--- xen-4.17.0-testing.orig/tools/libs/util/Makefile
++++ xen-4.17.0-testing/tools/libs/util/Makefile
+@@ -8,6 +8,7 @@ OBJS-y += libxlu_disk_l.o
+ OBJS-y += libxlu_disk.o
+ OBJS-y += libxlu_vif.o
+ OBJS-y += libxlu_pci.o
++OBJS-y += libxlu_vscsi.o
CFLAGS += -Wno-format-zero-length -Wmissing-declarations \
-Wno-declaration-after-statement -Wformat-nonliteral
-Index: xen-4.16.1-testing/tools/include/libxl.h
+Index: xen-4.17.0-testing/tools/include/libxl.h
===================================================================
---- xen-4.16.1-testing.orig/tools/include/libxl.h
-+++ xen-4.16.1-testing/tools/include/libxl.h
-@@ -1243,6 +1243,13 @@ void libxl_mac_copy(libxl_ctx *ctx, libx
+--- xen-4.17.0-testing.orig/tools/include/libxl.h
++++ xen-4.17.0-testing/tools/include/libxl.h
+@@ -1258,6 +1258,13 @@ void libxl_mac_copy(libxl_ctx *ctx, libx
#define LIBXL_HAVE_PCITOPOLOGY 1
/*
@@ -172,7 +172,7 @@
* LIBXL_HAVE_SOCKET_BITMAP
*
* If this is defined, then libxl_socket_bitmap_alloc and
-@@ -2308,6 +2315,41 @@ int libxl_device_channel_getinfo(libxl_c
+@@ -2323,6 +2330,41 @@ int libxl_device_channel_getinfo(libxl_c
const libxl_device_channel *channel,
libxl_channelinfo *channelinfo);
@@ -214,11 +214,11 @@
/* Virtual TPMs */
int libxl_device_vtpm_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vtpm
*vtpm,
const libxl_asyncop_how *ao_how)
-Index: xen-4.16.1-testing/tools/libs/light/libxl_create.c
+Index: xen-4.17.0-testing/tools/libs/light/libxl_create.c
===================================================================
---- xen-4.16.1-testing.orig/tools/libs/light/libxl_create.c
-+++ xen-4.16.1-testing/tools/libs/light/libxl_create.c
-@@ -1846,6 +1846,7 @@ const libxl__device_type *device_type_tb
+--- xen-4.17.0-testing.orig/tools/libs/light/libxl_create.c
++++ xen-4.17.0-testing/tools/libs/light/libxl_create.c
+@@ -1873,6 +1873,7 @@ const libxl__device_type *device_type_tb
&libxl__disk_devtype,
&libxl__nic_devtype,
&libxl__vtpm_devtype,
@@ -226,11 +226,11 @@
&libxl__usbctrl_devtype,
&libxl__usbdev_devtype,
&libxl__pci_devtype,
-Index: xen-4.16.1-testing/tools/libs/light/libxl_internal.h
+Index: xen-4.17.0-testing/tools/libs/light/libxl_internal.h
===================================================================
---- xen-4.16.1-testing.orig/tools/libs/light/libxl_internal.h
-+++ xen-4.16.1-testing/tools/libs/light/libxl_internal.h
-@@ -4006,6 +4006,7 @@ extern const libxl__device_type libxl__v
+--- xen-4.17.0-testing.orig/tools/libs/light/libxl_internal.h
++++ xen-4.17.0-testing/tools/libs/light/libxl_internal.h
+@@ -4012,6 +4012,7 @@ extern const libxl__device_type libxl__v
extern const libxl__device_type libxl__disk_devtype;
extern const libxl__device_type libxl__nic_devtype;
extern const libxl__device_type libxl__vtpm_devtype;
@@ -238,11 +238,11 @@
extern const libxl__device_type libxl__usbctrl_devtype;
extern const libxl__device_type libxl__usbdev_devtype;
extern const libxl__device_type libxl__pci_devtype;
-Index: xen-4.16.1-testing/tools/libs/light/libxl_types.idl
+Index: xen-4.17.0-testing/tools/libs/light/libxl_types.idl
===================================================================
---- xen-4.16.1-testing.orig/tools/libs/light/libxl_types.idl
-+++ xen-4.16.1-testing/tools/libs/light/libxl_types.idl
-@@ -950,6 +950,43 @@ libxl_device_vsnd = Struct("device_vsnd"
+--- xen-4.17.0-testing.orig/tools/libs/light/libxl_types.idl
++++ xen-4.17.0-testing/tools/libs/light/libxl_types.idl
+@@ -970,6 +970,43 @@ libxl_device_vsnd = Struct("device_vsnd"
("pcms", Array(libxl_vsnd_pcm, "num_vsnd_pcms"))
])
@@ -286,7 +286,7 @@
libxl_domain_config = Struct("domain_config", [
("c_info", libxl_domain_create_info),
("b_info", libxl_domain_build_info),
-@@ -961,6 +998,7 @@ libxl_domain_config = Struct("domain_con
+@@ -981,6 +1018,7 @@ libxl_domain_config = Struct("domain_con
("dtdevs", Array(libxl_device_dtdev, "num_dtdevs")),
("vfbs", Array(libxl_device_vfb, "num_vfbs")),
("vkbs", Array(libxl_device_vkb, "num_vkbs")),
@@ -294,7 +294,7 @@
("vtpms", Array(libxl_device_vtpm, "num_vtpms")),
("p9s", Array(libxl_device_p9, "num_p9s")),
("pvcallsifs", Array(libxl_device_pvcallsif, "num_pvcallsifs")),
-@@ -1002,6 +1040,21 @@ libxl_nicinfo = Struct("nicinfo", [
+@@ -1022,6 +1060,21 @@ libxl_nicinfo = Struct("nicinfo", [
("rref_rx", integer),
], dir=DIR_OUT)
@@ -316,22 +316,22 @@
libxl_vtpminfo = Struct("vtpminfo", [
("backend", string),
("backend_id", uint32),
-Index: xen-4.16.1-testing/tools/libs/light/libxl_types_internal.idl
+Index: xen-4.17.0-testing/tools/libs/light/libxl_types_internal.idl
===================================================================
---- xen-4.16.1-testing.orig/tools/libs/light/libxl_types_internal.idl
-+++ xen-4.16.1-testing/tools/libs/light/libxl_types_internal.idl
-@@ -32,6 +32,7 @@ libxl__device_kind = Enumeration("device
- (14, "PVCALLS"),
+--- xen-4.17.0-testing.orig/tools/libs/light/libxl_types_internal.idl
++++ xen-4.17.0-testing/tools/libs/light/libxl_types_internal.idl
+@@ -33,6 +33,7 @@ libxl__device_kind = Enumeration("device
(15, "VSND"),
(16, "VINPUT"),
-+ (17, "VSCSI"),
+ (17, "VIRTIO_DISK"),
++ (18, "VSCSI"),
])
libxl__console_backend = Enumeration("console_backend", [
-Index: xen-4.16.1-testing/tools/libs/light/libxl_vscsi.c
+Index: xen-4.17.0-testing/tools/libs/light/libxl_vscsi.c
===================================================================
--- /dev/null
-+++ xen-4.16.1-testing/tools/libs/light/libxl_vscsi.c
++++ xen-4.17.0-testing/tools/libs/light/libxl_vscsi.c
@@ -0,0 +1,1185 @@
+/*
+ * Copyright (C) 2016 SUSE Linux GmbH
@@ -1518,10 +1518,10 @@
+ * indent-tabs-mode: nil
+ * End:
+ */
-Index: xen-4.16.1-testing/tools/libs/util/libxlu_vscsi.c
+Index: xen-4.17.0-testing/tools/libs/util/libxlu_vscsi.c
===================================================================
--- /dev/null
-+++ xen-4.16.1-testing/tools/libs/util/libxlu_vscsi.c
++++ xen-4.17.0-testing/tools/libs/util/libxlu_vscsi.c
@@ -0,0 +1,669 @@
+/*
+ * libxlu_vscsi.c - xl configuration file parsing: setup and helper functions
@@ -2192,10 +2192,10 @@
+ return ERROR_INVAL;
+}
+#endif
-Index: xen-4.16.1-testing/tools/include/libxlutil.h
+Index: xen-4.17.0-testing/tools/include/libxlutil.h
===================================================================
---- xen-4.16.1-testing.orig/tools/include/libxlutil.h
-+++ xen-4.16.1-testing/tools/include/libxlutil.h
+--- xen-4.17.0-testing.orig/tools/include/libxlutil.h
++++ xen-4.17.0-testing/tools/include/libxlutil.h
@@ -131,6 +131,25 @@ int xlu_rdm_parse(XLU_Config *cfg, libxl
int xlu_vif_parse_rate(XLU_Config *cfg, const char *rate,
libxl_device_nic *nic);
@@ -2222,10 +2222,10 @@
#endif /* LIBXLUTIL_H */
/*
-Index: xen-4.16.1-testing/tools/xl/Makefile
+Index: xen-4.17.0-testing/tools/xl/Makefile
===================================================================
---- xen-4.16.1-testing.orig/tools/xl/Makefile
-+++ xen-4.16.1-testing/tools/xl/Makefile
+--- xen-4.17.0-testing.orig/tools/xl/Makefile
++++ xen-4.17.0-testing/tools/xl/Makefile
@@ -19,7 +19,7 @@ CFLAGS_XL += -Wshadow
XL_OBJS-$(CONFIG_X86) = xl_psr.o
XL_OBJS = xl.o xl_cmdtable.o xl_sxp.o xl_utils.o $(XL_OBJS-y)
@@ -2235,11 +2235,11 @@
XL_OBJS += xl_sched.o xl_pci.o xl_vcpu.o xl_cdrom.o xl_mem.o
XL_OBJS += xl_info.o xl_console.o xl_misc.o
XL_OBJS += xl_vmcontrol.o xl_saverestore.o xl_migrate.o
-Index: xen-4.16.1-testing/tools/xl/xl.h
+Index: xen-4.17.0-testing/tools/xl/xl.h
===================================================================
---- xen-4.16.1-testing.orig/tools/xl/xl.h
-+++ xen-4.16.1-testing/tools/xl/xl.h
-@@ -166,6 +166,9 @@ int main_channellist(int argc, char **ar
+--- xen-4.17.0-testing.orig/tools/xl/xl.h
++++ xen-4.17.0-testing/tools/xl/xl.h
+@@ -164,6 +164,9 @@ int main_channellist(int argc, char **ar
int main_blockattach(int argc, char **argv);
int main_blocklist(int argc, char **argv);
int main_blockdetach(int argc, char **argv);
@@ -2249,11 +2249,11 @@
int main_vtpmattach(int argc, char **argv);
int main_vtpmlist(int argc, char **argv);
int main_vtpmdetach(int argc, char **argv);
-Index: xen-4.16.1-testing/tools/xl/xl_parse.c
+Index: xen-4.17.0-testing/tools/xl/xl_parse.c
===================================================================
---- xen-4.16.1-testing.orig/tools/xl/xl_parse.c
-+++ xen-4.16.1-testing/tools/xl/xl_parse.c
-@@ -1214,7 +1214,8 @@ void parse_config_data(const char *confi
+--- xen-4.17.0-testing.orig/tools/xl/xl_parse.c
++++ xen-4.17.0-testing/tools/xl/xl_parse.c
+@@ -1218,7 +1218,8 @@ void parse_config_data(const char *confi
long l, vcpus = 0;
XLU_Config *config;
XLU_ConfigList *cpus, *vbds, *nics, *pcis, *cvfbs, *cpuids, *vtpms,
@@ -2263,7 +2263,7 @@
XLU_ConfigList *channels, *ioports, *irqs, *iomem, *viridian, *dtdevs,
*mca_caps;
int num_ioports, num_irqs, num_iomem, num_cpus, num_viridian,
num_mca_caps;
-@@ -2086,6 +2087,17 @@ void parse_config_data(const char *confi
+@@ -2090,6 +2091,17 @@ void parse_config_data(const char *confi
}
}
@@ -2281,10 +2281,10 @@
if (!xlu_cfg_get_list(config, "vtpm", &vtpms, 0, 0)) {
d_config->num_vtpms = 0;
d_config->vtpms = NULL;
-Index: xen-4.16.1-testing/tools/xl/xl_vscsi.c
+Index: xen-4.17.0-testing/tools/xl/xl_vscsi.c
===================================================================
--- /dev/null
-+++ xen-4.16.1-testing/tools/xl/xl_vscsi.c
++++ xen-4.17.0-testing/tools/xl/xl_vscsi.c
@@ -0,0 +1,229 @@
+/*
+ * Copyright 2009-2017 Citrix Ltd and other contributors
@@ -2515,10 +2515,10 @@
+ return !!rc;
+}
+
-Index: xen-4.16.1-testing/tools/xl/xl_cmdtable.c
+Index: xen-4.17.0-testing/tools/xl/xl_cmdtable.c
===================================================================
---- xen-4.16.1-testing.orig/tools/xl/xl_cmdtable.c
-+++ xen-4.16.1-testing/tools/xl/xl_cmdtable.c
+--- xen-4.17.0-testing.orig/tools/xl/xl_cmdtable.c
++++ xen-4.17.0-testing/tools/xl/xl_cmdtable.c
@@ -382,6 +382,21 @@ const struct cmd_spec cmd_table[] = {
"[option] <Domain> <DevId>",
"-f, --force do not wait for the domain to release the device"
++++++ mini-os.tar.bz2 ++++++
++++ 7122 lines of diff (skipped)
++++++ replace-obsolete-network-configuration-commands-in-s.patch ++++++
--- /var/tmp/diff_new_pack.y0ZhNI/_old 2022-12-10 21:18:09.865674398 +0100
+++ /var/tmp/diff_new_pack.y0ZhNI/_new 2022-12-10 21:18:09.869674422 +0100
@@ -16,11 +16,11 @@
.../i386-dm/qemu-ifup-Linux | 5 +++--
9 files changed, 26 insertions(+), 26 deletions(-)
-Index: xen-4.16.0-testing/README
+Index: xen-4.17.0-testing/README
===================================================================
---- xen-4.16.0-testing.orig/README
-+++ xen-4.16.0-testing/README
-@@ -60,8 +60,7 @@ provided by your OS distributor:
+--- xen-4.17.0-testing.orig/README
++++ xen-4.17.0-testing/README
+@@ -61,8 +61,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 @@
* GNU bison and GNU flex
* ACPI ASL compiler (iasl)
-Index: xen-4.16.0-testing/tools/hotplug/Linux/remus-netbuf-setup
+Index: xen-4.17.0-testing/tools/hotplug/Linux/remus-netbuf-setup
===================================================================
---- xen-4.16.0-testing.orig/tools/hotplug/Linux/remus-netbuf-setup
-+++ xen-4.16.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
@@ -76,6 +76,7 @@
#specific setup code such as renaming.
dir=$(dirname "$0")
@@ -60,10 +60,10 @@
check_ifb "$ifb" || continue
REMUS_IFB="$ifb"
break
-Index: xen-4.16.0-testing/tools/hotplug/Linux/vif-bridge
+Index: xen-4.17.0-testing/tools/hotplug/Linux/vif-bridge
===================================================================
---- xen-4.16.0-testing.orig/tools/hotplug/Linux/vif-bridge
-+++ xen-4.16.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
@@ -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 @@
fi
if [ -z "$bridge" ]
then
-Index: xen-4.16.0-testing/tools/hotplug/Linux/vif-nat
+Index: xen-4.17.0-testing/tools/hotplug/Linux/vif-nat
===================================================================
---- xen-4.16.0-testing.orig/tools/hotplug/Linux/vif-nat
-+++ xen-4.16.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
@@ -172,7 +172,11 @@ case "$command" in
;;
offline)
@@ -91,10 +91,10 @@
;;
esac
-Index: xen-4.16.0-testing/tools/hotplug/Linux/vif-route
+Index: xen-4.17.0-testing/tools/hotplug/Linux/vif-route
===================================================================
---- xen-4.16.0-testing.orig/tools/hotplug/Linux/vif-route
-+++ xen-4.16.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
@@ -23,13 +23,23 @@ main_ip=$(dom0_ip)
case "${command}" in
@@ -121,10 +121,10 @@
ipcmd='del'
cmdprefix='do_without_error'
;;
-Index: xen-4.16.0-testing/tools/hotplug/Linux/xen-network-common.sh
+Index: xen-4.17.0-testing/tools/hotplug/Linux/xen-network-common.sh
===================================================================
---- xen-4.16.0-testing.orig/tools/hotplug/Linux/xen-network-common.sh
-+++ xen-4.16.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
@@ -15,6 +15,12 @@
#
++++++ stubdom.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/xen/stubdom.tar.bz2
/work/SRC/openSUSE:Factory/.xen.new.1835/stubdom.tar.bz2 differ: char 11, line 1
++++++ x86-ioapic-ack-default.patch ++++++
--- /var/tmp/diff_new_pack.y0ZhNI/_old 2022-12-10 21:18:09.925674749 +0100
+++ /var/tmp/diff_new_pack.y0ZhNI/_new 2022-12-10 21:18:09.929674772 +0100
@@ -2,7 +2,7 @@
--- a/xen/arch/x86/io_apic.c
+++ b/xen/arch/x86/io_apic.c
-@@ -2061,7 +2061,10 @@ void __init setup_IO_APIC(void)
+@@ -2075,7 +2075,10 @@ void __init setup_IO_APIC(void)
io_apic_irqs = ~PIC_IRQS;
printk("ENABLING IO-APIC IRQs\n");
++++++ xen-4.16.2-testing-src.tar.bz2 -> xen-4.17.0-testing-src.tar.bz2 ++++++
++++ 184748 lines of diff (skipped)
++++++ xen-destdir.patch ++++++
--- /var/tmp/diff_new_pack.y0ZhNI/_old 2022-12-10 21:18:13.397695050 +0100
+++ /var/tmp/diff_new_pack.y0ZhNI/_new 2022-12-10 21:18:13.397695050 +0100
@@ -1,19 +1,19 @@
-Index: xen-4.16.0-testing/tools/xenstore/Makefile
+Index: xen-4.17.0-testing/tools/xenstore/Makefile
===================================================================
---- xen-4.16.0-testing.orig/tools/xenstore/Makefile
-+++ xen-4.16.0-testing/tools/xenstore/Makefile
-@@ -76,7 +76,7 @@ xenstored.a: $(XENSTORED_OBJS)
- $(AR) cr $@ $^
+--- xen-4.17.0-testing.orig/tools/xenstore/Makefile
++++ xen-4.17.0-testing/tools/xenstore/Makefile
+@@ -42,7 +42,7 @@ xenstored: $(XENSTORED_OBJS-y)
+ $(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@ $(APPEND_LDFLAGS)
$(CLIENTS): xenstore
- ln -f xenstore $@
+ ln -sf xenstore $@
xenstore: xenstore_client.o xs_lib.o
- $(CC) $^ $(LDFLAGS) $(LDLIBS_libxenstore) $(LDLIBS_libxentoolcore)
$(SOCKET_LIBS) -o $@ $(APPEND_LDFLAGS)
-@@ -113,11 +113,12 @@ ifeq ($(XENSTORE_XENSTORED),y)
+ $(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@ $(APPEND_LDFLAGS)
+@@ -70,11 +70,12 @@ install: all
+ ifeq ($(XENSTORE_XENSTORED),y)
$(INSTALL_DIR) $(DESTDIR)$(sbindir)
- $(INSTALL_DIR) $(DESTDIR)$(XEN_LIB_STORED)
$(INSTALL_PROG) xenstored $(DESTDIR)$(sbindir)
+ $(INSTALL_DIR) $(DESTDIR)$(bindir)
endif
++++++ xen-utils-0.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tools/xen-utils-0.1/xen-destroy.c
new/tools/xen-utils-0.1/xen-destroy.c
--- old/tools/xen-utils-0.1/xen-destroy.c 2014-07-08 01:33:19.760000000
+0200
+++ new/tools/xen-utils-0.1/xen-destroy.c 2022-10-28 16:45:06.170464561
+0200
@@ -34,23 +34,23 @@
int main(int argc, char **argv)
{
int ret = -1;
- struct xs_handle *xsh;
+ struct xs_handle *xsh;
FILE *log_file;
xentoollog_logger *logger;
libxl_ctx *ctx = NULL;
libxl_dominfo *dominfo = NULL;
int i, num_doms;
- if (argc != 2) {
- fprintf(stderr, "Usage: xen-destroy <domain-name>\n");
- exit(1);
- }
+ if (argc != 2) {
+ fprintf(stderr, "Usage: xen-destroy <domain-name>\n");
+ exit(1);
+ }
- xsh = xs_daemon_open();
- if (!xsh) {
- fprintf(stderr, "Failed to open xenstore connection\n");
- exit(1);
- }
+ xsh = xs_daemon_open();
+ if (!xsh) {
+ fprintf(stderr, "Failed to open xenstore connection\n");
+ exit(1);
+ }
if ((log_file = fopen("/dev/null", "a")) == NULL) {
printf("Failed to create null logger\n");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tools/xen-utils-0.1/xen-list.c
new/tools/xen-utils-0.1/xen-list.c
--- old/tools/xen-utils-0.1/xen-list.c 2014-07-08 01:33:20.140000000 +0200
+++ new/tools/xen-utils-0.1/xen-list.c 2022-10-28 16:44:17.902462787 +0200
@@ -31,7 +31,7 @@
int main(int argc, char **argv)
{
- int rcode = 1;
- rcode = xlist(argc, argv);
- return rcode;
+ int rcode = 1;
+ rcode = xlist(argc, argv);
+ return rcode;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tools/xen-utils-0.1/xen-utils.c
new/tools/xen-utils-0.1/xen-utils.c
--- old/tools/xen-utils-0.1/xen-utils.c 2014-07-08 01:33:20.912000000 +0200
+++ new/tools/xen-utils-0.1/xen-utils.c 2022-10-28 16:43:46.174461621 +0200
@@ -37,29 +37,29 @@
static char *get_vncport(struct xs_handle *xsh, uint32_t domid)
{
- unsigned int len;
- char *path;
- char *s;
+ unsigned int len;
+ char *path;
+ char *s;
if (asprintf(&path, "/local/domain/%u/console/vnc-port", domid) < 0)
return NULL;
-
- s = xs_read(xsh, XBT_NULL, path, &len);
+
+ s = xs_read(xsh, XBT_NULL, path, &len);
free(path);
-
- return s;
+
+ return s;
}
char *domid_to_domname(struct xs_handle *xsh, uint32_t domid)
{
- unsigned int len;
- char *path;
- char *s;
-
+ unsigned int len;
+ char *path;
+ char *s;
+
if (asprintf(&path, "/local/domain/%u/vm", domid) < 0)
return NULL;
- s = xs_read(xsh, XBT_NULL, path, &len);
+ s = xs_read(xsh, XBT_NULL, path, &len);
free(path);
if (asprintf(&path, "%s/name", s) < 0) {
@@ -71,7 +71,7 @@
s = xs_read(xsh, XBT_NULL, path, &len);
free(path);
- return s;
+ return s;
}
static void print_dom_expanded(struct xs_handle *xsh,
@@ -145,31 +145,31 @@
char *domid_to_vm_uuid(struct xs_handle *xsh, uint32_t domid)
{
- unsigned int len;
- char *path;
- char *s;
-
+ unsigned int len;
+ char *path;
+ char *s;
+
if (asprintf(&path, "/local/domain/%u/vm", domid) < 0)
return NULL;
- s = xs_read(xsh, XBT_NULL, path, &len);
+ s = xs_read(xsh, XBT_NULL, path, &len);
free(path);
- return s;
+ return s;
}
int xlist(int argc, char **argv)
{
- int rcode = 1;
- xc_dominfo_t *info = NULL;
- uint32_t first_dom = 0;
- int max_doms = 1024, nr_doms, i;
+ int rcode = 1;
+ xc_dominfo_t *info = NULL;
+ uint32_t first_dom = 0;
+ int max_doms = 1024, nr_doms, i;
#ifdef XENCTRL_HAS_XC_INTERFACE
libxc_handle xc_handle = NULL;
#else
libxc_handle xc_handle = 0;
#endif
- struct xs_handle *xsh = NULL;
+ struct xs_handle *xsh = NULL;
char *domname;
char *req_domname = NULL;
int show_long = 0;
@@ -180,73 +180,73 @@
};
while ((c = getopt_long(argc, argv, "l", longopts, NULL)) != -1) {
- switch (c) {
+ switch (c) {
case 'l':
show_long = 1;
break;
default:
usage(argv[0]);
goto out;
- }
+ }
}
if (optind < argc)
req_domname = argv[optind];
#ifdef XENCTRL_HAS_XC_INTERFACE
- xc_handle = xc_interface_open(NULL, NULL, 0);
- if (xc_handle == NULL) {
+ xc_handle = xc_interface_open(NULL, NULL, 0);
+ if (xc_handle == NULL) {
#else
- xc_handle = xc_interface_open();
+ xc_handle = xc_interface_open();
if (xc_handle < 0) {
#endif
- perror("Unable to open libxc handle.");
- goto out;
- }
-
- xsh = xs_daemon_open();
- if (!xsh) {
- perror("Unable to open libxenstore handle.");
- goto out;
- }
-
- info = calloc(max_doms, sizeof(xc_dominfo_t));
- if (info == NULL) {
- perror("Unable to allocate memory.");
- goto out;
- }
-
- nr_doms = xc_domain_getinfo(xc_handle, first_dom, max_doms, info);
- if (nr_doms < 0) {
- perror("xc_domain_getinfo() failed.");
- goto out;
- }
+ perror("Unable to open libxc handle.");
+ goto out;
+ }
+
+ xsh = xs_daemon_open();
+ if (!xsh) {
+ perror("Unable to open libxenstore handle.");
+ goto out;
+ }
+
+ info = calloc(max_doms, sizeof(xc_dominfo_t));
+ if (info == NULL) {
+ perror("Unable to allocate memory.");
+ goto out;
+ }
+
+ nr_doms = xc_domain_getinfo(xc_handle, first_dom, max_doms, info);
+ if (nr_doms < 0) {
+ perror("xc_domain_getinfo() failed.");
+ goto out;
+ }
/* Find requested domain and print its info */
if (req_domname) {
- for (i = 0; i < nr_doms; i++) {
- domname = domid_to_domname(xsh, info[i].domid);
+ for (i = 0; i < nr_doms; i++) {
+ domname = domid_to_domname(xsh, info[i].domid);
if (domname == NULL)
continue;
- if (strncmp(req_domname, domname,
strlen(req_domname)+1) == 0) {
+ if (strncmp(req_domname, domname, strlen(req_domname)+1) == 0) {
print_dom_expanded(xsh, info[i], domname, show_long);
- free(domname);
- rcode = 0;
- goto out;
- }
+ free(domname);
+ rcode = 0;
+ goto out;
+ }
free(domname);
- }
+ }
fprintf(stderr, "Unable to find domain '%s'\n", req_domname);
usage(argv[0]);
goto out;
}
-
+
/* Not a specific domain requested so print info on all domains */
if (show_long)
- printf("Name ID Mem
VCPUs\tState\tTime(s)\tVnc-port\tUUID\n");
- else
- printf("Name ID Mem
VCPUs\tState\tTime(s)\t\n");
+ printf("Name ID Mem
VCPUs\tState\tTime(s)\tVnc-port\tUUID\n");
+ else
+ printf("Name ID Mem
VCPUs\tState\tTime(s)\t\n");
for (i = 0; i < nr_doms; i++) {
domname = domid_to_domname(xsh, info[i].domid);
@@ -259,11 +259,11 @@
rcode = 0;
out:
- if (xsh)
- xs_daemon_close(xsh);
- if (info)
- free(info);
- if (xc_handle)
- xc_interface_close(xc_handle);
- return rcode;
+ if (xsh)
+ xs_daemon_close(xsh);
+ if (info)
+ free(info);
+ if (xc_handle)
+ xc_interface_close(xc_handle);
+ return rcode;
}
++++++ xen.bug1026236.suse_vtsc_tolerance.patch ++++++
--- /var/tmp/diff_new_pack.y0ZhNI/_old 2022-12-10 21:18:13.497695635 +0100
+++ /var/tmp/diff_new_pack.y0ZhNI/_new 2022-12-10 21:18:13.501695659 +0100
@@ -8,11 +8,11 @@
the hostadmin to decide how much tolerance all running domUs can
actually handle. The default is zero tolerance.
-Index: xen-4.16.0-testing/xen/arch/x86/time.c
+Index: xen-4.17.0-testing/xen/arch/x86/time.c
===================================================================
---- xen-4.16.0-testing.orig/xen/arch/x86/time.c
-+++ xen-4.16.0-testing/xen/arch/x86/time.c
-@@ -46,6 +46,9 @@
+--- xen-4.17.0-testing.orig/xen/arch/x86/time.c
++++ xen-4.17.0-testing/xen/arch/x86/time.c
+@@ -47,6 +47,9 @@
static char __initdata opt_clocksource[10];
string_param("clocksource", opt_clocksource);
@@ -22,7 +22,7 @@
unsigned long __read_mostly cpu_khz; /* CPU clock frequency in kHz. */
DEFINE_SPINLOCK(rtc_lock);
unsigned long pit0_ticks;
-@@ -2486,6 +2489,7 @@ int tsc_set_info(struct domain *d,
+@@ -2581,6 +2584,7 @@ int tsc_set_info(struct domain *d,
switch ( tsc_mode )
{
@@ -30,7 +30,7 @@
case TSC_MODE_DEFAULT:
case TSC_MODE_ALWAYS_EMULATE:
d->arch.vtsc_offset = get_s_time() - elapsed_nsec;
-@@ -2499,8 +2503,26 @@ int tsc_set_info(struct domain *d,
+@@ -2594,8 +2598,26 @@ 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.
*/
++++++ xen.libxl.dmmd.patch ++++++
--- /var/tmp/diff_new_pack.y0ZhNI/_old 2022-12-10 21:18:13.521695775 +0100
+++ /var/tmp/diff_new_pack.y0ZhNI/_new 2022-12-10 21:18:13.525695799 +0100
@@ -7,11 +7,11 @@
tools/libxl/libxlu_disk_l.l | 2 ++
4 files changed, 37 insertions(+), 6 deletions(-)
-Index: xen-4.16.2-testing/tools/libs/light/libxl_disk.c
+Index: xen-4.17.0-testing/tools/libs/light/libxl_disk.c
===================================================================
---- xen-4.16.2-testing.orig/tools/libs/light/libxl_disk.c
-+++ xen-4.16.2-testing/tools/libs/light/libxl_disk.c
-@@ -178,7 +178,7 @@ static int libxl__device_disk_setdefault
+--- xen-4.17.0-testing.orig/tools/libs/light/libxl_disk.c
++++ xen-4.17.0-testing/tools/libs/light/libxl_disk.c
+@@ -203,7 +203,7 @@ static int libxl__device_disk_setdefault
return rc;
}
@@ -20,7 +20,7 @@
const libxl_device_disk *disk,
libxl__device *device)
{
-@@ -337,6 +337,10 @@ static void device_disk_add(libxl__egc *
+@@ -372,6 +372,10 @@ static void device_disk_add(libxl__egc *
rc = ERROR_FAIL;
goto out;
case LIBXL_DISK_BACKEND_QDISK:
@@ -31,11 +31,11 @@
flexarray_append(back, "params");
flexarray_append(back, GCSPRINTF("%s:%s",
libxl__device_disk_string_of_format(disk->format),
-Index: xen-4.16.2-testing/tools/libs/light/libxl_device.c
+Index: xen-4.17.0-testing/tools/libs/light/libxl_device.c
===================================================================
---- xen-4.16.2-testing.orig/tools/libs/light/libxl_device.c
-+++ xen-4.16.2-testing/tools/libs/light/libxl_device.c
-@@ -326,7 +326,8 @@ static int disk_try_backend(disk_try_bac
+--- xen-4.17.0-testing.orig/tools/libs/light/libxl_device.c
++++ xen-4.17.0-testing/tools/libs/light/libxl_device.c
+@@ -333,7 +333,8 @@ static int disk_try_backend(disk_try_bac
return 0;
case LIBXL_DISK_BACKEND_QDISK:
@@ -44,23 +44,11 @@
+ a->disk->vdev, a->disk->script,
libxl_disk_backend_to_string(backend));
return backend;
- default:
-@@ -343,11 +344,6 @@ static int disk_try_backend(disk_try_bac
- libxl_disk_format_to_string(a->disk->format));
- return 0;
-
-- bad_script:
-- LOG(DEBUG, "Disk vdev=%s, backend %s not compatible with script=...",
-- a->disk->vdev, libxl_disk_backend_to_string(backend));
-- return 0;
--
- bad_colo:
- LOG(DEBUG, "Disk vdev=%s, backend %s not compatible with colo",
- a->disk->vdev, libxl_disk_backend_to_string(backend));
-Index: xen-4.16.2-testing/tools/libs/light/libxl_dm.c
+ case LIBXL_DISK_BACKEND_STANDALONE:
+Index: xen-4.17.0-testing/tools/libs/light/libxl_dm.c
===================================================================
---- xen-4.16.2-testing.orig/tools/libs/light/libxl_dm.c
-+++ xen-4.16.2-testing/tools/libs/light/libxl_dm.c
+--- xen-4.17.0-testing.orig/tools/libs/light/libxl_dm.c
++++ xen-4.17.0-testing/tools/libs/light/libxl_dm.c
@@ -1197,6 +1197,30 @@ out:
return rc;
}
@@ -92,7 +80,7 @@
static int libxl__build_device_model_args_new(libxl__gc *gc,
const char *dm, int guest_domid,
const libxl_domain_config
*guest_config,
-@@ -1868,9 +1892,11 @@ static int libxl__build_device_model_arg
+@@ -1885,9 +1909,11 @@ static int libxl__build_device_model_arg
libxl__device_disk_dev_number(disks[i].vdev, &disk, &part);
const char *format;
char *drive;
@@ -105,11 +93,11 @@
if (dev_number == -1) {
LOGD(WARN, guest_domid, "unable to determine"" disk number
for %s",
disks[i].vdev);
-Index: xen-4.16.2-testing/tools/libs/util/libxlu_disk_l.l
+Index: xen-4.17.0-testing/tools/libs/util/libxlu_disk_l.l
===================================================================
---- xen-4.16.2-testing.orig/tools/libs/util/libxlu_disk_l.l
-+++ xen-4.16.2-testing/tools/libs/util/libxlu_disk_l.l
-@@ -241,6 +241,8 @@ target=.* { STRIP(','); SAVESTRING("targ
+--- xen-4.17.0-testing.orig/tools/libs/util/libxlu_disk_l.l
++++ xen-4.17.0-testing/tools/libs/util/libxlu_disk_l.l
+@@ -253,6 +253,8 @@ target=.* { STRIP(','); SAVESTRING("targ
free(newscript);
}
@@ -118,11 +106,11 @@
tapdisk:/.* { DPC->had_depr_prefix=1; DEPRECATE(0); }
tap2?:/.* { DPC->had_depr_prefix=1; DEPRECATE(0); }
aio:/.* { DPC->had_depr_prefix=1; DEPRECATE(0); }
-Index: xen-4.16.2-testing/tools/libs/light/libxl_internal.h
+Index: xen-4.17.0-testing/tools/libs/light/libxl_internal.h
===================================================================
---- xen-4.16.2-testing.orig/tools/libs/light/libxl_internal.h
-+++ xen-4.16.2-testing/tools/libs/light/libxl_internal.h
-@@ -2065,6 +2065,10 @@ _hidden char *libxl__object_to_json(libx
+--- xen-4.17.0-testing.orig/tools/libs/light/libxl_internal.h
++++ xen-4.17.0-testing/tools/libs/light/libxl_internal.h
+@@ -2071,6 +2071,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);
++++++ xenconsole-no-multiple-connections.patch ++++++
--- /var/tmp/diff_new_pack.y0ZhNI/_old 2022-12-10 21:18:13.581696126 +0100
+++ /var/tmp/diff_new_pack.y0ZhNI/_new 2022-12-10 21:18:13.585696150 +0100
@@ -1,16 +1,16 @@
-Index: xen-4.8.0-testing/tools/console/client/main.c
+Index: xen-4.17.0-testing/tools/console/client/main.c
===================================================================
---- xen-4.8.0-testing.orig/tools/console/client/main.c
-+++ xen-4.8.0-testing/tools/console/client/main.c
-@@ -101,6 +101,7 @@ static int get_pty_fd(struct xs_handle *
+--- xen-4.17.0-testing.orig/tools/console/client/main.c
++++ xen-4.17.0-testing/tools/console/client/main.c
+@@ -100,6 +100,7 @@ static int get_pty_fd(struct xs_handle *
* Assumes there is already a watch set in the store for this path. */
{
struct timeval tv;
+ struct flock lock;
fd_set watch_fdset;
int xs_fd = xs_fileno(xs), pty_fd = -1;
- int start, now;
-@@ -124,6 +125,14 @@ static int get_pty_fd(struct xs_handle *
+ time_t start, now;
+@@ -123,6 +124,14 @@ static int get_pty_fd(struct xs_handle *
pty_fd = open(pty_path, O_RDWR | O_NOCTTY);
if (pty_fd == -1)
warn("Could not open tty `%s'",
pty_path);
++++++ xl-save-pc.patch ++++++
--- /var/tmp/diff_new_pack.y0ZhNI/_old 2022-12-10 21:18:13.653696547 +0100
+++ /var/tmp/diff_new_pack.y0ZhNI/_new 2022-12-10 21:18:13.657696570 +0100
@@ -29,7 +29,7 @@
$(XL_OBJS): CFLAGS += $(CFLAGS_XL)
$(XL_OBJS): CFLAGS += -include $(XEN_ROOT)/tools/config.h # libxl_json.h
needs it.
-@@ -38,7 +39,7 @@ $(XL_OBJS): _paths.h
+@@ -33,7 +34,7 @@ $(XL_OBJS): CFLAGS += -include $(XEN_ROO
all: xl
xl: $(XL_OBJS)
@@ -40,7 +40,7 @@
install: all
--- a/tools/xl/xl.h
+++ b/tools/xl/xl.h
-@@ -301,6 +301,7 @@ typedef enum {
+@@ -299,6 +299,7 @@ typedef enum {
DOMAIN_RESTART_SOFT_RESET, /* Soft reset should be performed */
} domain_restart_type;
