Fix patch-xen-gcc10-fixes.patch context, apply recent patches to deb too

.gitlab-ci.yml

@@ -0,0 +1,20 @@
+include:
+  - project: 'QubesOS/qubes-continuous-integration'
+    file: '/r4.0/gitlab-base.yml'
+  - project: 'QubesOS/qubes-continuous-integration'
+    file: '/r4.0/gitlab-dom0.yml'
+  - project: 'QubesOS/qubes-continuous-integration'
+    file: '/r4.0/gitlab-vm-debian.yml'
+  - project: 'QubesOS/qubes-continuous-integration'
+    file: '/r4.0/gitlab-vm-centos.yml'
+  - project: 'QubesOS/qubes-continuous-integration'
+    file: '/r4.0/gitlab-vm-archlinux.yml'
+
+default:
+  tags:
+    - docker
+    - long-living-job
+
+variables:
+  TRAVIS_INSTALL_EXCLUDE_DOM0: "xen-qubes-vm xen-qubes-debug xen-qubes-debuginfo"
+  TRAVIS_INSTALL_EXCLUDE: "xen xen-hypervisor-common xen-system-amd64"

archlinux/PKGBUILD

@@ -46,7 +46,7 @@ build() {
   export PYTHON=/usr/bin/python2
   unset LDFLAGS
 
-  autoreconf
+  autoreconf --install
   ./configure --prefix=/usr \
               --sbindir=/usr/bin \
               --disable-ocamltools \

debian-vm/debian/compat

@@ -1 +1 @@
-9
+10

debian-vm/debian/control

@@ -10,7 +10,6 @@ Build-Depends:
     debhelper (>= 9), 
     dh-autoreconf,
     dh-python,
-    dh-systemd,
     e2fslibs-dev,
     file,
     iasl,

debian-vm/debian/libxenstore3.0.symbols

@@ -4,6 +4,7 @@ libxenstore.so.3.0 libxenstore3.0 #MINVER#
  unsanitise_value@Base 3.2.0
  xs_check_watch@Base 4.2~
  xs_close@Base 4.1.0~rc6
+ xs_control_command@Base 2001:4.8.5-28
  xs_count_strings@Base 3.2.0
  xs_daemon_close@Base 3.2.0
  xs_daemon_destroy_postfork@Base 4.0.1~rc4
@@ -30,7 +31,6 @@ libxenstore.so.3.0 libxenstore3.0 #MINVER#
  xs_read@Base 3.2.0
  xs_read_watch@Base 3.2.0
  xs_release_domain@Base 3.2.0
- xs_restrict@Base 4.1.0~rc6
  xs_resume_domain@Base 3.2.0
  xs_rm@Base 3.2.0
  xs_set_permissions@Base 3.2.0

patch-xen-gcc10-fixes-vm.patch

@@ -0,0 +1,69 @@
+From e88857506d1acfe131b520790e20eca68762f932 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?=
+ <[email protected]>
+Date: Tue, 21 Apr 2020 13:46:39 +0200
+Subject: [PATCH] Fix for gcc-10 based on Fedora upstream
+
+---
+ tools/debugger/kdd/kdd.h        | 2 +-
+ tools/libxl/libxlu_pci.c        | 2 +-
+ tools/xenpmd/Makefile           | 1 +
+ tools/xenstore/utils.h          | 2 +-
+ tools/xenstore/xenstored_core.h | 2 +-
+ 5 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/tools/debugger/kdd/kdd.h b/tools/debugger/kdd/kdd.h
+index bfb00ba5c5..6d6ef35e0c 100644
+--- a/tools/debugger/kdd/kdd.h
++++ b/tools/debugger/kdd/kdd.h
+@@ -323,7 +323,7 @@ typedef struct {
+         kdd_msg msg;
+         kdd_reg reg;
+         kdd_stc stc;
+-        uint8_t payload[0];
++        uint8_t payload[65535];
+     };
+ } PACKED kdd_pkt;
+
+diff --git a/tools/libxl/libxlu_pci.c b/tools/libxl/libxlu_pci.c
+index 2cd793d223..993e128b39 100644
+--- a/tools/libxl/libxlu_pci.c
++++ b/tools/libxl/libxlu_pci.c
+@@ -48,7 +48,7 @@ static int pcidev_struct_fill(libxl_device_pci *pcidev, unsigned int domain,
+ int xlu_pci_parse_bdf(XLU_Config *cfg, libxl_device_pci *pcidev, const char *str)
+ {
+     unsigned state = STATE_DOMAIN;
+-    unsigned dom, bus, dev, func, vslot = 0;
++    unsigned dom = 0, bus = 0, dev = 0, func = 0, vslot = 0;
+     char *buf2, *tok, *ptr, *end, *optkey = NULL;
+
+     if ( NULL == (buf2 = ptr = strdup(str)) )
+diff --git a/tools/xenstore/utils.h b/tools/xenstore/utils.h
+index 2effd17b61..8732ea36f0 100644
+--- a/tools/xenstore/utils.h
++++ b/tools/xenstore/utils.h
+@@ -26,7 +26,7 @@ static inline bool strends(const char *a, const char *b)
+ void barf(const char *fmt, ...) __attribute__((noreturn));
+ void barf_perror(const char *fmt, ...) __attribute__((noreturn));
+
+-void (*xprintf)(const char *fmt, ...);
++extern void (*xprintf)(const char *fmt, ...);
+
+ #define eprintf(_fmt, _args...) xprintf("[ERR] %s" _fmt, __FUNCTION__, ##_args)
+
+diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h
+index 9e9d960247..11aeabbbda 100644
+--- a/tools/xenstore/xenstored_core.h
++++ b/tools/xenstore/xenstored_core.h
+@@ -209,7 +209,7 @@ void finish_daemonize(void);
+ /* Open a pipe for signal handling */
+ void init_pipe(int reopen_log_pipe[2]);
+
+-xengnttab_handle **xgt_handle;
++extern xengnttab_handle **xgt_handle;
+
+ #endif /* _XENSTORED_CORE_H */
+
+-- 
+2.25.2
+

series-debian-vm.conf

@@ -9,11 +9,61 @@ patch-0001-EFI-early-Add-noexit-to-inhibit-calling-ExitBootServices.patch
 patch-0002-efi-Ensure-incorrectly-typed-runtime-services-get-ma.patch
 patch-0001-Add-xen.cfg-options-for-mapbs-and-noexitboot.patch
 
-# backports
+# Backports
 patch-0001-libxl-add-more-cpuid-flags-handling.patch
 patch-libxc-panic-when-trying-to-create-a-PVH-guest-withou.patch
+patch-b4f98dc0-tools-fix-typo-in-tools-Rules.mk.patch
+patch-448c03b3-tools-xenstore-try-to-get-minimum-thread-stack-size-.patch
+patch-c9bd8a73-tools-xenstore-add-libdl-dependency-to-libxenstore.patch
+patch-1a373194-tools-xenstore-fix-linking-libxenstore-with-ldl.patch
+patch-xen-AMD-IOMMU-Support-IOAPIC-IDs-larger-than-128.patch
 patch-0001-libxl-devd-fix-a-race-with-concurrent-device-additio.patch
 patch-0002-libxl-devd-correctly-manipulate-the-dguest-list.patch
+patch-0011-x86-vmx-fix-vmentry-failure-with-TSX-bits-in-LBR.patch
+patch-0012-x86-vmx-Fix-vmentry-failure-because-of-invalid-LER-o.patch
+patch-0013-x86-vtx-Corrections-to-BDF93-errata-workaround.patch
+patch-0014-x86-vtx-Fixes-to-Haswell-Broadwell-LBR-TSX-errata.patch
+patch-0015-VT-x-extend-LBR-Broadwell-errata-coverage.patch
+patch-0001-x86-hvm-make-io.h-self-contained.patch
+patch-0002-passthrough-don-t-migrate-pirq-when-it-is-delivered-.patch
+patch-0003-VT-d-introduce-new-fields-in-msi_desc-to-track-bindi.patch
+patch-0004-VT-d-some-cleanups.patch
+patch-0005-VT-d-introduce-update_irte-to-update-irte-safely.patch
+patch-0001-xen-sched-call-cpu_disable_scheduler-via-cpu-notifie.patch
+patch-0002-xen-add-helper-for-calling-notifier_call_chain-to-co.patch
+patch-0003-xen-add-new-cpu-notifier-action-CPU_RESUME_FAILED.patch
+patch-0004-xen-don-t-free-percpu-areas-during-suspend.patch
+patch-0005-xen-cpupool-simplify-suspend-resume-handling.patch
+patch-0006-x86-ACPI-re-park-previously-parked-CPUs-upon-resume-.patch
+patch-0007-sched-populate-cpupool0-only-after-all-cpus-are-up.patch
+patch-0008-x86-clear-per-cpu-stub-page-information-in-cpu_smpbo.patch
+patch-0009-x86-S3-put-data-segment-registers-into-known-state-u.patch
+patch-0001-tools-xenstore-fix-a-use-after-free-problem-in-xenst.patch
+patch-0001-xenstore-modify-add_change_node-parameter-types.patch
+patch-0002-xenstore-call-add_change_node-directly-when-writing-.patch
+patch-0003-xenstore-use-common-tdb-record-header-in-xenstore.patch
+patch-0004-xenstore-add-per-node-generation-counter.patch
+patch-0005-xenstore-add-support-for-reading-directory-with-many.patch
+patch-0006-xenstore-support-XS_DIRECTORY_PART-in-libxenstore.patch
+patch-0007-xenstore-use-array-for-xenstore-wire-command-handlin.patch
+patch-0008-xenstore-let-command-functions-return-error-or-succe.patch
+patch-0009-xenstore-make-functions-static.patch
+patch-0010-xenstore-add-helper-functions-for-wire-argument-pars.patch
+patch-0011-xenstore-add-small-default-data-buffer-to-internal-s.patch
+patch-0012-xenstore-handle-memory-allocation-failures-in-xensto.patch
+patch-0013-tools-xenstore-avoid-unterminated-string-in-xs_direc.patch
+patch-0014-xenstore-set-correct-error-code-when-violating-quota.patch
+patch-0015-xenstore-remove-XS_RESTRICT-support.patch
+patch-0016-xenstore-correct-test-for-opened-logfile-in-reopen_l.patch
+patch-0017-xenstore-rename-XS_DEBUG-wire-command.patch
+patch-0018-xenstore-Split-out-XS_CONTROL-action-to-dedicated-so.patch
+patch-0019-tools-xenstore-start-with-empty-data-base.patch
+patch-0020-xenstored-remove-L-option.patch
+patch-0021-xenstore-remove-memory-report-command-line-support.patch
+patch-0022-xenstore-add-missing-checks-for-allocation-failure.patch
+patch-0023-xenstore-let-write_node-and-some-callers-return-errn.patch
+patch-0024-xenstore-undo-function-rename.patch
+patch-0025-xenstore-rework-of-transaction-handling.patch
 
 # PVH backports
 patch-88e43f9a-acpi-make-pmtimer-optional-in-FADT.patch

series-vm.conf

@@ -1,7 +1,7 @@
 patch-xen-no-downloads.patch
 patch-xen-hotplug-external-store.patch
 patch-xen-tools-qubes-vm.patch
-patch-xen-gcc10-fixes.patch
+patch-xen-gcc10-fixes-vm.patch
 patch-vm-0001-hotplug-do-not-attempt-to-remove-containing-xenstore.patch
 patch-libxc-fix-xc_gntshr_munmap-semantic.patch
 patch-libvchan-Fix-cleanup-when-xc_gntshr_open-failed.patch