Add missing patch

Signed-off-by: Cole Robinson <crobinso@redhat.com>

.abignore

@@ -0,0 +1,31 @@
+[suppress_function]
+symbol_version_regexp = LIBVIRT_PRIVATE.*
+soname_regexp = libvirt\\.so.*
+
+[suppress_function]
+symbol_version_regexp = LIBVIRT_ADMIN_PRIVATE.*
+soname_regexp = libvirt-admin\\.so.*
+
+[suppress_variable]
+symbol_version_regexp = LIBVIRT_PRIVATE.*
+soname_regexp = libvirt\\.so.*
+
+[suppress_variable]
+symbol_version_regexp = LIBVIRT_ADMIN_PRIVATE.*
+soname_regexp = libvirt-admin\\.so.*
+
+[suppress_function]
+symbol_version_regexp = .*
+soname_regexp = libvirt_storage_.*\\.so.*
+
+[suppress_variable]
+symbol_version_regexp = .*
+soname_regexp = libvirt_storage_.*\\.so.*
+
+[suppress_function]
+symbol_version_regexp = .*
+soname_regexp = libvirt_driver_.*\\.so.*
+
+[suppress_variable]
+symbol_version_regexp = .*
+soname_regexp = libvirt_driver_.*\\.so.*

.gitignore

@@ -2,4 +2,4 @@
 *.rpm
 i686
 x86_64
-libvirt-*.tar.gz
+libvirt-*.tar.xz

0001-lxc-containter-fix-build-with-glibc-2.36.patch

@@ -0,0 +1,35 @@
+From 9493c9b79dc541ec9e0fd73c6d87bdf8d30aaa90 Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso@redhat.com>
+Date: Mon, 1 Aug 2022 15:20:38 -0400
+Subject: [PATCH] lxc: containter: fix build with glibc 2.36
+Content-type: text/plain
+
+With glibc 2.36, sys/mount.h and linux/mount.h conflict:
+https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
+
+lxc_container.c imports sys/mount.h and linux/fs.h, which pulls in
+linux/mount.h.
+
+linux/fs.h isn't required here though. glibc sys/mount.h has had
+MS_MOVE since 2.12 in 2010
+
+Reviewed-by: Erik Skultety <eskultet@redhat.com>
+Signed-off-by: Cole Robinson <crobinso@redhat.com>
+---
+ src/lxc/lxc_container.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
+index b5278831da..a5401c2186 100644
+--- a/src/lxc/lxc_container.c
++++ b/src/lxc/lxc_container.c
+@@ -33,9 +33,6 @@
+ /* Yes, we want linux private one, for _syscall2() macro */
+ #include <linux/unistd.h>
+ 
+-/* For MS_MOVE */
+-#include <linux/fs.h>
+-
+ #if WITH_CAPNG
+ # include <cap-ng.h>
+ #endif

0001-tests-Fix-libxlxml2domconfigtest-with-latest-xen.patch

@@ -0,0 +1,239 @@
+From 99b40587e8cd83a136d94e208d32a80be76dc22a Mon Sep 17 00:00:00 2001
+Message-Id: <99b40587e8cd83a136d94e208d32a80be76dc22a.1666875466.git.crobinso@redhat.com>
+From: Cole Robinson <crobinso@redhat.com>
+Date: Thu, 27 Oct 2022 08:51:25 -0400
+Subject: [PATCH] tests: Fix libxlxml2domconfigtest with latest xen
+Content-type: text/plain
+
+shadow_memkb is populated from a libxl API call, and the value can
+change. For example:
+https://xenbits.xen.org/gitweb/?p=xen.git;a=commit;h=2c992810854a15b41be920519ce83a4a328d5168
+
+Mock libxl_get_required_shadow_memory to give consistent output
+
+Signed-off-by: Cole Robinson <crobinso@redhat.com>
+---
+ tests/libxlmock.c                                     | 11 +++++++++++
+ tests/libxlxml2domconfigdata/basic-hvm.json           |  2 +-
+ tests/libxlxml2domconfigdata/basic-pv.json            |  2 +-
+ tests/libxlxml2domconfigdata/basic-pvh.json           |  2 +-
+ tests/libxlxml2domconfigdata/cpu-shares-hvm.json      |  2 +-
+ tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json  |  2 +-
+ .../fullvirt-cpuid-legacy-nest.json                   |  2 +-
+ tests/libxlxml2domconfigdata/fullvirt-cpuid.json      |  2 +-
+ .../libxlxml2domconfigdata/max-eventchannels-hvm.json |  2 +-
+ tests/libxlxml2domconfigdata/max-gntframes-hvm.json   |  2 +-
+ tests/libxlxml2domconfigdata/moredevs-hvm.json        |  2 +-
+ tests/libxlxml2domconfigdata/multiple-ip.json         |  2 +-
+ tests/libxlxml2domconfigdata/variable-clock-hvm.json  |  2 +-
+ .../libxlxml2domconfigdata/vnuma-hvm-legacy-nest.json |  2 +-
+ tests/libxlxml2domconfigdata/vnuma-hvm.json           |  2 +-
+ 15 files changed, 25 insertions(+), 14 deletions(-)
+
+diff --git a/tests/libxlmock.c b/tests/libxlmock.c
+index 0e4bf7df52..4754597e5b 100644
+--- a/tests/libxlmock.c
++++ b/tests/libxlmock.c
+@@ -109,6 +109,17 @@ VIR_MOCK_STUB_RET_ARGS(bind,
+                        const struct sockaddr *, addr,
+                        socklen_t, addrlen)
+ 
++VIR_MOCK_IMPL_RET_ARGS(libxl_get_required_shadow_memory,
++                       unsigned long,
++                       unsigned long, maxmem_kb,
++                       unsigned int, smp_cpus)
++{
++    /* silence gcc warning about unused function */
++    if (0)
++        real_libxl_get_required_shadow_memory(maxmem_kb, smp_cpus);
++    return 1234;
++}
++
+ VIR_MOCK_IMPL_RET_ARGS(__xstat, int,
+                        int, ver,
+                        const char *, path,
+diff --git a/tests/libxlxml2domconfigdata/basic-hvm.json b/tests/libxlxml2domconfigdata/basic-hvm.json
+index 87f8cb7d8a..d30875420d 100644
+--- a/tests/libxlxml2domconfigdata/basic-hvm.json
++++ b/tests/libxlxml2domconfigdata/basic-hvm.json
+@@ -15,7 +15,7 @@
+         "max_memkb": 1048576,
+         "target_memkb": 1048576,
+         "video_memkb": 8192,
+-        "shadow_memkb": 12288,
++        "shadow_memkb": 1234,
+         "device_model_version": "qemu_xen",
+         "device_model": "/bin/true",
+         "sched_params": {
+diff --git a/tests/libxlxml2domconfigdata/basic-pv.json b/tests/libxlxml2domconfigdata/basic-pv.json
+index b71c3b0f49..32d188fabd 100644
+--- a/tests/libxlxml2domconfigdata/basic-pv.json
++++ b/tests/libxlxml2domconfigdata/basic-pv.json
+@@ -14,7 +14,7 @@
+         ],
+         "max_memkb": 524288,
+         "target_memkb": 524288,
+-        "shadow_memkb": 8192,
++        "shadow_memkb": 1234,
+         "sched_params": {
+ 
+         },
+diff --git a/tests/libxlxml2domconfigdata/basic-pvh.json b/tests/libxlxml2domconfigdata/basic-pvh.json
+index 48365c9026..f51957aa85 100644
+--- a/tests/libxlxml2domconfigdata/basic-pvh.json
++++ b/tests/libxlxml2domconfigdata/basic-pvh.json
+@@ -14,7 +14,7 @@
+         ],
+         "max_memkb": 524288,
+         "target_memkb": 524288,
+-        "shadow_memkb": 8192,
++        "shadow_memkb": 1234,
+         "sched_params": {
+ 
+         },
+diff --git a/tests/libxlxml2domconfigdata/cpu-shares-hvm.json b/tests/libxlxml2domconfigdata/cpu-shares-hvm.json
+index 2aa97e88c5..15105c83ad 100644
+--- a/tests/libxlxml2domconfigdata/cpu-shares-hvm.json
++++ b/tests/libxlxml2domconfigdata/cpu-shares-hvm.json
+@@ -15,7 +15,7 @@
+         "max_memkb": 1048576,
+         "target_memkb": 1048576,
+         "video_memkb": 8192,
+-        "shadow_memkb": 12288,
++        "shadow_memkb": 1234,
+         "device_model_version": "qemu_xen",
+         "device_model": "/bin/true",
+         "sched_params": {
+diff --git a/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json b/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json
+index a2d46797aa..26f5abefee 100644
+--- a/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json
++++ b/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json
+@@ -11,7 +11,7 @@
+         ],
+         "max_memkb": 592896,
+         "target_memkb": 403456,
+-        "shadow_memkb": 5656,
++        "shadow_memkb": 1234,
+         "sched_params": {
+         },
+         "apic": "True",
+diff --git a/tests/libxlxml2domconfigdata/fullvirt-cpuid-legacy-nest.json b/tests/libxlxml2domconfigdata/fullvirt-cpuid-legacy-nest.json
+index 6290655c20..740b82d2e6 100644
+--- a/tests/libxlxml2domconfigdata/fullvirt-cpuid-legacy-nest.json
++++ b/tests/libxlxml2domconfigdata/fullvirt-cpuid-legacy-nest.json
+@@ -11,7 +11,7 @@
+         ],
+         "max_memkb": 592896,
+         "target_memkb": 403456,
+-        "shadow_memkb": 5656,
++        "shadow_memkb": 1234,
+         "cpuid": [
+             {
+                 "leaf": 1,
+diff --git a/tests/libxlxml2domconfigdata/fullvirt-cpuid.json b/tests/libxlxml2domconfigdata/fullvirt-cpuid.json
+index 811a4f0ac7..8bf41894a5 100644
+--- a/tests/libxlxml2domconfigdata/fullvirt-cpuid.json
++++ b/tests/libxlxml2domconfigdata/fullvirt-cpuid.json
+@@ -11,7 +11,7 @@
+         ],
+         "max_memkb": 592896,
+         "target_memkb": 403456,
+-        "shadow_memkb": 5656,
++        "shadow_memkb": 1234,
+         "cpuid": [
+             {
+                 "leaf": 1,
+diff --git a/tests/libxlxml2domconfigdata/max-eventchannels-hvm.json b/tests/libxlxml2domconfigdata/max-eventchannels-hvm.json
+index 4a5b0ca65f..6f0daa065f 100644
+--- a/tests/libxlxml2domconfigdata/max-eventchannels-hvm.json
++++ b/tests/libxlxml2domconfigdata/max-eventchannels-hvm.json
+@@ -15,7 +15,7 @@
+         "max_memkb": 1048576,
+         "target_memkb": 1048576,
+         "video_memkb": 8192,
+-        "shadow_memkb": 12288,
++        "shadow_memkb": 1234,
+         "event_channels": 2047,
+         "device_model_version": "qemu_xen",
+         "device_model": "/bin/true",
+diff --git a/tests/libxlxml2domconfigdata/max-gntframes-hvm.json b/tests/libxlxml2domconfigdata/max-gntframes-hvm.json
+index 2883d057ff..35de588abc 100644
+--- a/tests/libxlxml2domconfigdata/max-gntframes-hvm.json
++++ b/tests/libxlxml2domconfigdata/max-gntframes-hvm.json
+@@ -15,7 +15,7 @@
+         "max_memkb": 1048576,
+         "target_memkb": 1048576,
+         "video_memkb": 8192,
+-        "shadow_memkb": 12288,
++        "shadow_memkb": 1234,
+         "max_grant_frames": 64,
+         "device_model_version": "qemu_xen",
+         "device_model": "/bin/true",
+diff --git a/tests/libxlxml2domconfigdata/moredevs-hvm.json b/tests/libxlxml2domconfigdata/moredevs-hvm.json
+index 58cf32a8d4..bdc9afc29b 100644
+--- a/tests/libxlxml2domconfigdata/moredevs-hvm.json
++++ b/tests/libxlxml2domconfigdata/moredevs-hvm.json
+@@ -17,7 +17,7 @@
+         "max_memkb": 1048576,
+         "target_memkb": 1048576,
+         "video_memkb": 8192,
+-        "shadow_memkb": 12288,
++        "shadow_memkb": 1234,
+         "device_model_version": "qemu_xen",
+         "device_model": "/bin/true",
+         "sched_params": {
+diff --git a/tests/libxlxml2domconfigdata/multiple-ip.json b/tests/libxlxml2domconfigdata/multiple-ip.json
+index 2db98b82f6..e0b37aa795 100644
+--- a/tests/libxlxml2domconfigdata/multiple-ip.json
++++ b/tests/libxlxml2domconfigdata/multiple-ip.json
+@@ -14,7 +14,7 @@
+         ],
+         "max_memkb": 524288,
+         "target_memkb": 524288,
+-        "shadow_memkb": 8192,
++        "shadow_memkb": 1234,
+         "sched_params": {
+ 
+         },
+diff --git a/tests/libxlxml2domconfigdata/variable-clock-hvm.json b/tests/libxlxml2domconfigdata/variable-clock-hvm.json
+index 9a25d51da2..3c131c603c 100644
+--- a/tests/libxlxml2domconfigdata/variable-clock-hvm.json
++++ b/tests/libxlxml2domconfigdata/variable-clock-hvm.json
+@@ -15,7 +15,7 @@
+         "max_memkb": 1048576,
+         "target_memkb": 1048576,
+         "video_memkb": 8192,
+-        "shadow_memkb": 12288,
++        "shadow_memkb": 1234,
+         "rtc_timeoffset": 3600,
+         "localtime": "True",
+         "device_model_version": "qemu_xen",
+diff --git a/tests/libxlxml2domconfigdata/vnuma-hvm-legacy-nest.json b/tests/libxlxml2domconfigdata/vnuma-hvm-legacy-nest.json
+index 6cda8d0252..6725df9112 100644
+--- a/tests/libxlxml2domconfigdata/vnuma-hvm-legacy-nest.json
++++ b/tests/libxlxml2domconfigdata/vnuma-hvm-legacy-nest.json
+@@ -103,7 +103,7 @@
+         "max_memkb": 1048576,
+         "target_memkb": 1048576,
+         "video_memkb": 8192,
+-        "shadow_memkb": 14336,
++        "shadow_memkb": 1234,
+         "device_model_version": "qemu_xen",
+         "device_model": "/bin/true",
+         "sched_params": {
+diff --git a/tests/libxlxml2domconfigdata/vnuma-hvm.json b/tests/libxlxml2domconfigdata/vnuma-hvm.json
+index f578ccd3d3..2556c82d5f 100644
+--- a/tests/libxlxml2domconfigdata/vnuma-hvm.json
++++ b/tests/libxlxml2domconfigdata/vnuma-hvm.json
+@@ -103,7 +103,7 @@
+         "max_memkb": 1048576,
+         "target_memkb": 1048576,
+         "video_memkb": 8192,
+-        "shadow_memkb": 14336,
++        "shadow_memkb": 1234,
+         "device_model_version": "qemu_xen",
+         "device_model": "/bin/true",
+         "sched_params": {
+-- 
+2.37.3
+

0002-virfile-Fix-build-with-glibc-2.36.patch

@@ -0,0 +1,40 @@
+From c0d9adf220dc0d223330a7bac37b174132d330ba Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso@redhat.com>
+Date: Mon, 1 Aug 2022 15:24:01 -0400
+Subject: [PATCH] virfile: Fix build with glibc 2.36
+Content-type: text/plain
+
+With glibc 2.36, sys/mount.h and linux/mount.h conflict:
+https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
+
+virfile.c imports sys/mount.h and linux/fs.h, which pulls in
+linux/mount.h.
+
+Manually define the constants we need from linux/fs.h, like was
+done in llvm:
+
+https://reviews.llvm.org/rGb379129c4beb3f26223288627a1291739f33af02
+
+Reviewed-by: Erik Skultety <eskultet@redhat.com>
+Signed-off-by: Cole Robinson <crobinso@redhat.com>
+---
+ src/util/virfile.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/util/virfile.c b/src/util/virfile.c
+index 99da058db3..ce541b8946 100644
+--- a/src/util/virfile.c
++++ b/src/util/virfile.c
+@@ -71,7 +71,11 @@
+ # endif
+ # include <sys/ioctl.h>
+ # include <linux/cdrom.h>
+-# include <linux/fs.h>
++/* These come from linux/fs.h, but that header conflicts with
++ * sys/mount.h on glibc 2.36+ */
++# define FS_IOC_GETFLAGS _IOR('f', 1, long)
++# define FS_IOC_SETFLAGS _IOW('f', 2, long)
++# define FS_NOCOW_FL 0x00800000
+ #endif
+ 
+ #if WITH_LIBATTR

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: libvirt
-# $Id$
-NAME := libvirt
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

sources

@@ -1 +1 @@
-8a027dfdde5fb36059e4d7e069708a56  libvirt-1.2.18.4.tar.gz
+SHA512 (libvirt-8.6.0.tar.xz) = 6198ac33ea718045bfd12a2740d5a7fa70c754b1ecda7c0cad5791fbdf7311091587056254fde88ebe3c2f927a8fb56909fe4c3a115595854b18d3a704db73de