Compare commits
13 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Cole Robinson
|
dbe2f2a9fe | ||
|
Cole Robinson
|
2f8d71e670 | ||
|
Cole Robinson
|
9464680689 | ||
|
Jens Petersen
|
aaed945b61 | ||
|
Daniel P. Berrangé
|
83def04a25 | ||
|
Cole Robinson
|
535bbcdd91 | ||
|
Cole Robinson
|
417e4c9cf7 | ||
|
Cole Robinson
|
24d349fa37 | ||
|
Cole Robinson
|
9f3b22fec4 | ||
|
Cole Robinson
|
7285a57f5c | ||
|
Cole Robinson
|
9944fa190c | ||
|
Cole Robinson
|
1a44dca7d4 | ||
|
Cole Robinson
|
0c2262d602 |
@@ -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
|
||||
@@ -1,48 +0,0 @@
|
||||
From 823a62ec8aac4fb75e6e281164f3eb56ae47597c Mon Sep 17 00:00:00 2001
|
||||
From: Boris Fiuczynski <fiuczy@linux.ibm.com>
|
||||
Date: Tue, 1 Mar 2022 18:47:59 +0100
|
||||
Subject: [PATCH] qemu: segmentation fault in virtqemud executing
|
||||
qemuDomainUndefineFlags
|
||||
|
||||
Commit 5adfb3472342741c443ac91dee0abb18b5a3d038 causes a segmentation fault.
|
||||
|
||||
Stack trace of thread 664419:
|
||||
#0 0x000003ff62ec553c in qemuDomainUndefineFlags (dom=0x3ff6c002810, flags=<optimized out>) at ../src/qemu/qemu_driver.c:6618
|
||||
#1 0x000003ff876a7e5c in virDomainUndefineFlags (domain=domain@entry=0x3ff6c002810, flags=<optimized out>) at ../src/libvirt-domain.c:6519
|
||||
#2 0x000002aa2b64a808 in remoteDispatchDomainUndefineFlags (server=0x2aa2c3d7880, msg=0x2aa2c3d2770, args=<optimized out>, rerr=0x3ff8287b950, client=<optimized out>)
|
||||
at src/remote/remote_daemon_dispatch_stubs.h:13080
|
||||
#3 remoteDispatchDomainUndefineFlagsHelper (server=0x2aa2c3d7880, client=<optimized out>, msg=0x2aa2c3d2770, rerr=0x3ff8287b950, args=<optimized out>, ret=0x0)
|
||||
at src/remote/remote_daemon_dispatch_stubs.h:13059
|
||||
#4 0x000003ff8758bbf4 in virNetServerProgramDispatchCall (msg=0x2aa2c3d2770, client=0x2aa2c3e3050, server=0x2aa2c3d7880, prog=0x2aa2c3d8010)
|
||||
at ../src/rpc/virnetserverprogram.c:428
|
||||
#5 virNetServerProgramDispatch (prog=0x2aa2c3d8010, server=server@entry=0x2aa2c3d7880, client=0x2aa2c3e3050, msg=0x2aa2c3d2770) at ../src/rpc/virnetserverprogram.c:302
|
||||
#6 0x000003ff8758c260 in virNetServerProcessMsg (msg=<optimized out>, prog=<optimized out>, client=<optimized out>, srv=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:140
|
||||
#7 virNetServerHandleJob (jobOpaque=0x2aa2c3e2d30, opaque=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:160
|
||||
#8 0x000003ff874c49aa in virThreadPoolWorker (opaque=<optimized out>) at ../src/util/virthreadpool.c:164
|
||||
#9 0x000003ff874c3f62 in virThreadHelper (data=<optimized out>) at ../src/util/virthread.c:256
|
||||
#10 0x000003ff86c1cf8c in start_thread () from /lib64/libc.so.6
|
||||
#11 0x000003ff86c9650e in thread_start () from /lib64/libc.so.6
|
||||
|
||||
Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
|
||||
Reviewed-by: Jim Fehlig <jfehlig@suse.com>
|
||||
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
||||
---
|
||||
src/qemu/qemu_driver.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
|
||||
index bcd9bdb436..8337eed510 100644
|
||||
--- a/src/qemu/qemu_driver.c
|
||||
+++ b/src/qemu/qemu_driver.c
|
||||
@@ -6615,7 +6615,7 @@ qemuDomainUndefineFlags(virDomainPtr dom,
|
||||
}
|
||||
}
|
||||
|
||||
- if (vm->def->os.loader->nvram) {
|
||||
+ if (vm->def->os.loader && vm->def->os.loader->nvram) {
|
||||
nvram_path = g_strdup(vm->def->os.loader->nvram);
|
||||
} else if (vm->def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_EFI) {
|
||||
qemuDomainNVRAMPathFormat(cfg, vm->def, &nvram_path);
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
+329
-6
@@ -22,7 +22,7 @@
|
||||
%define arches_dmidecode %{arches_x86}
|
||||
%define arches_xen %{arches_x86} aarch64
|
||||
%if 0%{?fedora} >= 36
|
||||
%define arches_xen x86_64 aarch64
|
||||
%define arches_xen x86_64 aarch64
|
||||
%endif
|
||||
%define arches_vbox %{arches_x86}
|
||||
%define arches_ceph %{arches_64bit}
|
||||
@@ -197,6 +197,10 @@
|
||||
%define qemu_moddir %{_libdir}/qemu
|
||||
%define qemu_datadir %{_datadir}/qemu
|
||||
|
||||
%define with_mingw 0
|
||||
%if 0%{?fedora}
|
||||
%define with_mingw 0%{!?_without_mingw:1}
|
||||
%endif
|
||||
|
||||
# RHEL releases provide stable tool chains and so it is safe to turn
|
||||
# compiler warning into errors without being worried about frequent
|
||||
@@ -230,8 +234,8 @@
|
||||
|
||||
Summary: Library providing a simple virtualization API
|
||||
Name: libvirt
|
||||
Version: 8.1.0
|
||||
Release: 3%{?dist}
|
||||
Version: 8.6.0
|
||||
Release: 5%{?dist}
|
||||
License: LGPLv2+
|
||||
URL: https://libvirt.org/
|
||||
|
||||
@@ -239,7 +243,11 @@ URL: https://libvirt.org/
|
||||
%define mainturl stable_updates/
|
||||
%endif
|
||||
Source: https://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.xz
|
||||
Patch: 0001-qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch
|
||||
Patch: 0001-tests-Fix-libxlxml2domconfigtest-with-latest-xen.patch
|
||||
|
||||
# Fix build with glibc 2.36
|
||||
Patch0001: 0001-lxc-containter-fix-build-with-glibc-2.36.patch
|
||||
Patch0002: 0002-virfile-Fix-build-with-glibc-2.36.patch
|
||||
|
||||
Requires: libvirt-daemon = %{version}-%{release}
|
||||
Requires: libvirt-daemon-config-network = %{version}-%{release}
|
||||
@@ -394,6 +402,36 @@ BuildRequires: libtirpc-devel
|
||||
BuildRequires: firewalld-filesystem
|
||||
%endif
|
||||
|
||||
%if %{with_mingw}
|
||||
BuildRequires: mingw32-filesystem
|
||||
BuildRequires: mingw32-gcc
|
||||
BuildRequires: mingw32-binutils
|
||||
BuildRequires: mingw32-glib2 >= 2.48
|
||||
BuildRequires: mingw32-libgpg-error
|
||||
BuildRequires: mingw32-libgcrypt
|
||||
BuildRequires: mingw32-gnutls
|
||||
BuildRequires: mingw32-gettext
|
||||
BuildRequires: mingw32-libxml2
|
||||
BuildRequires: mingw32-portablexdr
|
||||
BuildRequires: mingw32-dlfcn
|
||||
BuildRequires: mingw32-libssh2
|
||||
BuildRequires: mingw32-curl
|
||||
|
||||
BuildRequires: mingw64-filesystem
|
||||
BuildRequires: mingw64-gcc
|
||||
BuildRequires: mingw64-binutils
|
||||
BuildRequires: mingw64-glib2 >= 2.48
|
||||
BuildRequires: mingw64-libgpg-error
|
||||
BuildRequires: mingw64-libgcrypt
|
||||
BuildRequires: mingw64-gnutls
|
||||
BuildRequires: mingw64-gettext
|
||||
BuildRequires: mingw64-libxml2
|
||||
BuildRequires: mingw64-portablexdr
|
||||
BuildRequires: mingw64-dlfcn
|
||||
BuildRequires: mingw64-libssh2
|
||||
BuildRequires: mingw64-curl
|
||||
%endif
|
||||
|
||||
%description
|
||||
Libvirt is a C toolkit to interact with the virtualization capabilities
|
||||
of recent versions of Linux (and other OSes). The main package includes
|
||||
@@ -445,7 +483,11 @@ Requires: dbus
|
||||
# For uid creation during pre
|
||||
Requires(pre): shadow-utils
|
||||
# Needed by /usr/libexec/libvirt-guests.sh script.
|
||||
%if 0%{?fedora} >= 37
|
||||
Requires: gettext-runtime
|
||||
%else
|
||||
Requires: gettext
|
||||
%endif
|
||||
|
||||
# Ensure smooth upgrades
|
||||
Obsoletes: libvirt-admin < 7.3.0
|
||||
@@ -949,6 +991,25 @@ Requires: libvirt-daemon-driver-network = %{version}-%{release}
|
||||
%description nss
|
||||
Libvirt plugin for NSS for translating domain names into IP addresses.
|
||||
|
||||
%if %{with_mingw}
|
||||
%package -n mingw32-libvirt
|
||||
Summary: %{summary}
|
||||
Obsoletes: mingw32-libvirt-static < 7.0.0
|
||||
BuildArch: noarch
|
||||
|
||||
%description -n mingw32-libvirt
|
||||
MinGW Windows libvirt virtualization library.
|
||||
|
||||
%package -n mingw64-libvirt
|
||||
Summary: %{summary}
|
||||
Obsoletes: mingw64-libvirt-static < 7.0.0
|
||||
BuildArch: noarch
|
||||
|
||||
%description -n mingw64-libvirt
|
||||
MinGW Windows libvirt virtualization library.
|
||||
|
||||
%{?mingw_debug_package}
|
||||
%endif
|
||||
|
||||
%prep
|
||||
|
||||
@@ -1192,6 +1253,84 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec)
|
||||
|
||||
%meson_build
|
||||
|
||||
%if %{with_mingw}
|
||||
%mingw_meson \
|
||||
--auto-features=enabled \
|
||||
-Ddriver_remote=enabled \
|
||||
-Ddriver_test=enabled \
|
||||
-Ddriver_esx=enabled \
|
||||
-Dcurl=enabled \
|
||||
-Ddocs=enabled \
|
||||
-Dapparmor=disabled \
|
||||
-Dapparmor_profiles=disabled \
|
||||
-Dattr=disabled \
|
||||
-Daudit=disabled \
|
||||
-Dbash_completion=disabled \
|
||||
-Dblkid=disabled \
|
||||
-Dcapng=disabled \
|
||||
-Ddriver_bhyve=disabled \
|
||||
-Ddriver_hyperv=disabled \
|
||||
-Ddriver_interface=disabled \
|
||||
-Ddriver_libvirtd=disabled \
|
||||
-Ddriver_libxl=disabled \
|
||||
-Ddriver_lxc=disabled \
|
||||
-Ddriver_network=disabled \
|
||||
-Ddriver_openvz=disabled \
|
||||
-Ddriver_qemu=disabled \
|
||||
-Ddriver_secrets=disabled \
|
||||
-Ddriver_vbox=disabled \
|
||||
-Ddriver_vmware=disabled \
|
||||
-Ddriver_vz=disabled \
|
||||
-Ddtrace=disabled \
|
||||
-Dexpensive_tests=enabled \
|
||||
-Dfirewalld=disabled \
|
||||
-Dfirewalld_zone=disabled \
|
||||
-Dfuse=disabled \
|
||||
-Dglusterfs=disabled \
|
||||
-Dhost_validate=disabled \
|
||||
-Dlibiscsi=disabled \
|
||||
-Dlibnl=disabled \
|
||||
-Dlibpcap=disabled \
|
||||
-Dlibssh2=disabled \
|
||||
-Dlibssh=disabled \
|
||||
-Dlogin_shell=disabled \
|
||||
-Dnetcf=disabled \
|
||||
-Dnls=disabled \
|
||||
-Dnss=disabled \
|
||||
-Dnumactl=disabled \
|
||||
-Dnumad=disabled \
|
||||
-Dopenwsman=disabled \
|
||||
-Dpciaccess=disabled \
|
||||
-Dpm_utils=disabled \
|
||||
-Dpolkit=disabled \
|
||||
-Dreadline=disabled \
|
||||
-Drpath=disabled \
|
||||
-Dsanlock=disabled \
|
||||
-Dsasl=disabled \
|
||||
-Dsecdriver_apparmor=disabled \
|
||||
-Dsecdriver_selinux=disabled \
|
||||
-Dselinux=disabled \
|
||||
-Dstorage_dir=disabled \
|
||||
-Dstorage_disk=disabled \
|
||||
-Dstorage_fs=disabled \
|
||||
-Dstorage_gluster=disabled \
|
||||
-Dstorage_iscsi_direct=disabled \
|
||||
-Dstorage_iscsi=disabled \
|
||||
-Dstorage_lvm=disabled \
|
||||
-Dstorage_mpath=disabled \
|
||||
-Dstorage_rbd=disabled \
|
||||
-Dstorage_scsi=disabled \
|
||||
-Dstorage_sheepdog=disabled \
|
||||
-Dstorage_vstorage=disabled \
|
||||
-Dstorage_zfs=disabled \
|
||||
-Dsysctl_config=disabled \
|
||||
-Dtests=disabled \
|
||||
-Dudev=disabled \
|
||||
-Dwireshark_dissector=disabled \
|
||||
-Dyajl=disabled
|
||||
%mingw_ninja
|
||||
%endif
|
||||
|
||||
%install
|
||||
rm -fr %{buildroot}
|
||||
|
||||
@@ -1260,6 +1399,26 @@ mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp \
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if %{with_mingw}
|
||||
%mingw_ninja_install
|
||||
|
||||
rm -rf $RPM_BUILD_ROOT%{mingw32_sysconfdir}/libvirt/nwfilter
|
||||
rm -rf $RPM_BUILD_ROOT%{mingw64_sysconfdir}/libvirt/nwfilter
|
||||
rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/doc/*
|
||||
rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/doc/*
|
||||
rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/gtk-doc/*
|
||||
rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc/*
|
||||
|
||||
rm -rf $RPM_BUILD_ROOT%{mingw32_libexecdir}/libvirt_iohelper.exe
|
||||
rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt_iohelper.exe
|
||||
rm -rf $RPM_BUILD_ROOT%{mingw32_libexecdir}/libvirt-guests.sh
|
||||
rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh
|
||||
|
||||
%mingw_debug_install_post
|
||||
|
||||
%endif
|
||||
|
||||
|
||||
%check
|
||||
# Building on slow archs, like emulated s390x in Fedora copr, requires
|
||||
# raising the test timeout
|
||||
@@ -1737,7 +1896,6 @@ exit 0
|
||||
%{_mandir}/man8/virtlogd.8*
|
||||
%{_mandir}/man8/virtlockd.8*
|
||||
%{_mandir}/man8/virtproxyd.8*
|
||||
%{_mandir}/man7/virkey*.7*
|
||||
|
||||
%{_bindir}/virt-host-validate
|
||||
%{_bindir}/virt-admin
|
||||
@@ -2043,6 +2201,7 @@ exit 0
|
||||
%{_mandir}/man1/virt-xml-validate.1*
|
||||
%{_mandir}/man1/virt-pki-query-dn.1*
|
||||
%{_mandir}/man1/virt-pki-validate.1*
|
||||
%{_mandir}/man7/virkey*.7*
|
||||
%{_bindir}/virsh
|
||||
%{_bindir}/virt-xml-validate
|
||||
%{_bindir}/virt-pki-query-dn
|
||||
@@ -2126,11 +2285,175 @@ exit 0
|
||||
%{_datadir}/libvirt/api/libvirt-qemu-api.xml
|
||||
%{_datadir}/libvirt/api/libvirt-lxc-api.xml
|
||||
|
||||
%if %{with_mingw}
|
||||
%files -n mingw32-libvirt
|
||||
%dir %{mingw32_sysconfdir}/libvirt/
|
||||
%config(noreplace) %{mingw32_sysconfdir}/libvirt/libvirt.conf
|
||||
%config(noreplace) %{mingw32_sysconfdir}/libvirt/libvirt-admin.conf
|
||||
|
||||
%{mingw32_bindir}/libvirt-0.dll
|
||||
%{mingw32_bindir}/virsh.exe
|
||||
%{mingw32_bindir}/virt-admin.exe
|
||||
%{mingw32_bindir}/virt-xml-validate
|
||||
%{mingw32_bindir}/virt-pki-query-dn.exe
|
||||
%{mingw32_bindir}/virt-pki-validate
|
||||
%{mingw32_bindir}/libvirt-lxc-0.dll
|
||||
%{mingw32_bindir}/libvirt-qemu-0.dll
|
||||
%{mingw32_bindir}/libvirt-admin-0.dll
|
||||
|
||||
%{mingw32_libdir}/libvirt.dll.a
|
||||
%{mingw32_libdir}/pkgconfig/libvirt.pc
|
||||
%{mingw32_libdir}/pkgconfig/libvirt-qemu.pc
|
||||
%{mingw32_libdir}/pkgconfig/libvirt-lxc.pc
|
||||
%{mingw32_libdir}/pkgconfig/libvirt-admin.pc
|
||||
%{mingw32_libdir}/libvirt-lxc.dll.a
|
||||
%{mingw32_libdir}/libvirt-qemu.dll.a
|
||||
%{mingw32_libdir}/libvirt-admin.dll.a
|
||||
|
||||
%dir %{mingw32_datadir}/libvirt/
|
||||
%dir %{mingw32_datadir}/libvirt/schemas/
|
||||
%{mingw32_datadir}/libvirt/schemas/*.rng
|
||||
|
||||
%dir %{mingw32_datadir}/libvirt/api/
|
||||
%{mingw32_datadir}/libvirt/api/libvirt-api.xml
|
||||
%{mingw32_datadir}/libvirt/api/libvirt-lxc-api.xml
|
||||
%{mingw32_datadir}/libvirt/api/libvirt-qemu-api.xml
|
||||
%{mingw32_datadir}/libvirt/api/libvirt-admin-api.xml
|
||||
|
||||
%{mingw32_datadir}/libvirt/cpu_map/*.xml
|
||||
|
||||
%{mingw32_datadir}/libvirt/test-screenshot.png
|
||||
|
||||
%{mingw32_datadir}/locale/*/LC_MESSAGES/libvirt.mo
|
||||
|
||||
%dir %{mingw32_includedir}/libvirt
|
||||
%{mingw32_includedir}/libvirt/libvirt.h
|
||||
%{mingw32_includedir}/libvirt/libvirt-common.h
|
||||
%{mingw32_includedir}/libvirt/libvirt-domain.h
|
||||
%{mingw32_includedir}/libvirt/libvirt-domain-checkpoint.h
|
||||
%{mingw32_includedir}/libvirt/libvirt-domain-snapshot.h
|
||||
%{mingw32_includedir}/libvirt/libvirt-event.h
|
||||
%{mingw32_includedir}/libvirt/libvirt-host.h
|
||||
%{mingw32_includedir}/libvirt/libvirt-interface.h
|
||||
%{mingw32_includedir}/libvirt/libvirt-network.h
|
||||
%{mingw32_includedir}/libvirt/libvirt-nodedev.h
|
||||
%{mingw32_includedir}/libvirt/libvirt-nwfilter.h
|
||||
%{mingw32_includedir}/libvirt/libvirt-secret.h
|
||||
%{mingw32_includedir}/libvirt/libvirt-storage.h
|
||||
%{mingw32_includedir}/libvirt/libvirt-stream.h
|
||||
%{mingw32_includedir}/libvirt/virterror.h
|
||||
%{mingw32_includedir}/libvirt/libvirt-lxc.h
|
||||
%{mingw32_includedir}/libvirt/libvirt-qemu.h
|
||||
%{mingw32_includedir}/libvirt/libvirt-admin.h
|
||||
|
||||
%{mingw32_mandir}/man1/virsh.1*
|
||||
%{mingw32_mandir}/man1/virt-admin.1*
|
||||
%{mingw32_mandir}/man1/virt-xml-validate.1*
|
||||
%{mingw32_mandir}/man1/virt-pki-query-dn.1*
|
||||
%{mingw32_mandir}/man1/virt-pki-validate.1*
|
||||
%{mingw32_mandir}/man7/virkey*.7*
|
||||
|
||||
|
||||
%files -n mingw64-libvirt
|
||||
%dir %{mingw64_sysconfdir}/libvirt/
|
||||
%config(noreplace) %{mingw64_sysconfdir}/libvirt/libvirt.conf
|
||||
%config(noreplace) %{mingw64_sysconfdir}/libvirt/libvirt-admin.conf
|
||||
|
||||
%{mingw64_bindir}/libvirt-0.dll
|
||||
%{mingw64_bindir}/virsh.exe
|
||||
%{mingw64_bindir}/virt-admin.exe
|
||||
%{mingw64_bindir}/virt-xml-validate
|
||||
%{mingw64_bindir}/virt-pki-query-dn.exe
|
||||
%{mingw64_bindir}/virt-pki-validate
|
||||
%{mingw64_bindir}/libvirt-lxc-0.dll
|
||||
%{mingw64_bindir}/libvirt-qemu-0.dll
|
||||
%{mingw64_bindir}/libvirt-admin-0.dll
|
||||
|
||||
%{mingw64_libdir}/libvirt.dll.a
|
||||
%{mingw64_libdir}/pkgconfig/libvirt.pc
|
||||
%{mingw64_libdir}/pkgconfig/libvirt-qemu.pc
|
||||
%{mingw64_libdir}/pkgconfig/libvirt-lxc.pc
|
||||
%{mingw64_libdir}/pkgconfig/libvirt-admin.pc
|
||||
%{mingw64_libdir}/libvirt-lxc.dll.a
|
||||
%{mingw64_libdir}/libvirt-qemu.dll.a
|
||||
%{mingw64_libdir}/libvirt-admin.dll.a
|
||||
|
||||
%dir %{mingw64_datadir}/libvirt/
|
||||
%dir %{mingw64_datadir}/libvirt/schemas/
|
||||
%{mingw64_datadir}/libvirt/schemas/*.rng
|
||||
|
||||
%dir %{mingw64_datadir}/libvirt/api/
|
||||
%{mingw64_datadir}/libvirt/api/libvirt-api.xml
|
||||
%{mingw64_datadir}/libvirt/api/libvirt-lxc-api.xml
|
||||
%{mingw64_datadir}/libvirt/api/libvirt-qemu-api.xml
|
||||
%{mingw64_datadir}/libvirt/api/libvirt-admin-api.xml
|
||||
|
||||
%{mingw64_datadir}/libvirt/cpu_map/*.xml
|
||||
|
||||
%{mingw64_datadir}/libvirt/test-screenshot.png
|
||||
|
||||
%{mingw64_datadir}/locale/*/LC_MESSAGES/libvirt.mo
|
||||
|
||||
%dir %{mingw64_includedir}/libvirt
|
||||
%{mingw64_includedir}/libvirt/libvirt.h
|
||||
%{mingw64_includedir}/libvirt/libvirt-common.h
|
||||
%{mingw64_includedir}/libvirt/libvirt-domain.h
|
||||
%{mingw64_includedir}/libvirt/libvirt-domain-checkpoint.h
|
||||
%{mingw64_includedir}/libvirt/libvirt-domain-snapshot.h
|
||||
%{mingw64_includedir}/libvirt/libvirt-event.h
|
||||
%{mingw64_includedir}/libvirt/libvirt-host.h
|
||||
%{mingw64_includedir}/libvirt/libvirt-interface.h
|
||||
%{mingw64_includedir}/libvirt/libvirt-network.h
|
||||
%{mingw64_includedir}/libvirt/libvirt-nodedev.h
|
||||
%{mingw64_includedir}/libvirt/libvirt-nwfilter.h
|
||||
%{mingw64_includedir}/libvirt/libvirt-secret.h
|
||||
%{mingw64_includedir}/libvirt/libvirt-storage.h
|
||||
%{mingw64_includedir}/libvirt/libvirt-stream.h
|
||||
%{mingw64_includedir}/libvirt/virterror.h
|
||||
%{mingw64_includedir}/libvirt/libvirt-lxc.h
|
||||
%{mingw64_includedir}/libvirt/libvirt-qemu.h
|
||||
%{mingw64_includedir}/libvirt/libvirt-admin.h
|
||||
|
||||
%{mingw64_mandir}/man1/virsh.1*
|
||||
%{mingw64_mandir}/man1/virt-admin.1*
|
||||
%{mingw64_mandir}/man1/virt-xml-validate.1*
|
||||
%{mingw64_mandir}/man1/virt-pki-query-dn.1*
|
||||
%{mingw64_mandir}/man1/virt-pki-validate.1*
|
||||
%{mingw64_mandir}/man7/virkey*.7*
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Sat Jun 11 2022 Cole Robinson <crobinso@redhat.com> - 8.1.0-3
|
||||
* Sun Nov 20 2022 Cole Robinson <crobinso@redhat.com> - 8.6.0-5
|
||||
- Rebuild for wireshark soname bump
|
||||
- Fix libxl tests on aarch64
|
||||
|
||||
* Mon Oct 17 2022 Jens Petersen <petersen@redhat.com> - 8.6.0-4
|
||||
- F37 libvirt-daemon: depend on gettext-runtime instead of gettext (#2117209)
|
||||
|
||||
* Tue Aug 9 2022 Daniel P. Berrangé <berrange@redhat.com> - 8.1.0-3
|
||||
- Pull in mingw sub-packages
|
||||
|
||||
* Thu Aug 04 2022 Cole Robinson <crobinso@redhat.com> - 8.6.0-2
|
||||
- Use upstream 'glibc fix' commits
|
||||
|
||||
* Mon Aug 01 2022 Cole Robinson <crobinso@redhat.com> - 8.6.0-1
|
||||
- Update to version 8.6.0
|
||||
|
||||
* Thu Jul 21 2022 Cole Robinson <crobinso@redhat.com> - 8.5.0-1
|
||||
- Update to version 8.5.0
|
||||
|
||||
* Sat Jun 11 2022 Cole Robinson <crobinso@redhat.com> - 8.4.0-2
|
||||
- Adjust for Xen dropping 32bit arches
|
||||
|
||||
* Thu Jun 02 2022 Cole Robinson <crobinso@redhat.com> - 8.4.0-1
|
||||
- Update to version 8.4.0
|
||||
|
||||
* Mon May 02 2022 Cole Robinson <crobinso@redhat.com> - 8.3.0-1
|
||||
- Update to version 8.3.0
|
||||
|
||||
* Fri Apr 01 2022 Cole Robinson <crobinso@redhat.com> - 8.2.0-1
|
||||
- Update to version 8.2.0
|
||||
|
||||
* Thu Mar 3 2022 Daniel P. Berrangé <berrange@redhat.com> - 8.1.0-2
|
||||
- Fix crash undefining VM without loader (rhbz#2060412)
|
||||
|
||||
|
||||
@@ -1 +1 @@
|
||||
SHA512 (libvirt-8.1.0.tar.xz) = 5db227b78f48e35f917030eeb45ce9d0f7e868c5ce75da496ca06fad175ad6b026173b2fb78415c0103a61af24aec78d89bcebdf60b817d8ff6e84dc926faa97
|
||||
SHA512 (libvirt-8.6.0.tar.xz) = 6198ac33ea718045bfd12a2740d5a7fa70c754b1ecda7c0cad5791fbdf7311091587056254fde88ebe3c2f927a8fb56909fe4c3a115595854b18d3a704db73de
|
||||
|
||||
Reference in New Issue
Block a user