[libvirt] [PATCH] tests: Fix MinGW build for domaincapstest
by Andrea Bolognani
Commit 5b9819eedc71 started using the virFileWrapper APIs in
the test program, and correctly called them only in the section
of code guarded by WITH_QEMU; however, a single call to the
virFileWrapperClearPrefixes() function ended up in the
hypervisor-agnostic section, causing a build failure on MinGW.
Move the call to the QEMU-only section; while at it, also drop
the virFileWrapperRemovePrefix() calls, which are entirely
redundant since we'd drop all prefixes immediately afterwards
anyway.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
Another approach would be to simply drop the call to
virFileWrapperClearPrefixes(), but there really is no point
in removing prefixes one by one when we can just clear all of
them in one fell swoop.
tests/domaincapstest.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c
index 3ee95a4b58..a9922e1edb 100644
--- a/tests/domaincapstest.c
+++ b/tests/domaincapstest.c
@@ -451,9 +451,7 @@ mymain(void)
"x86_64", VIR_DOMAIN_VIRT_KVM);
virObjectUnref(cfg);
- virFileWrapperRemovePrefix(SYSCONFDIR "/qemu/firmware");
- virFileWrapperRemovePrefix(PREFIX "/share/qemu/firmware");
- virFileWrapperRemovePrefix("/home/user/.config/qemu/firmware");
+ virFileWrapperClearPrefixes();
#endif /* WITH_QEMU */
@@ -476,8 +474,6 @@ mymain(void)
DO_TEST_BHYVE("fbuf", "/usr/sbin/bhyve", &bhyve_caps, VIR_DOMAIN_VIRT_BHYVE);
#endif /* WITH_BHYVE */
- virFileWrapperClearPrefixes();
-
return ret;
}
--
2.20.1
6 years
[libvirt] [PATCH 0/4] qemu: Honor memory mode='strict'
by Michal Privoznik
If there's a domain configured as:
<currentMemory unit='MiB'>4096</currentMemory>
<numatune>
<memory mode='strict' nodeset='1'/>
</numatune>
but there is not enough memory on NUMA node 1 the domain will start
successfully because we allow it to allocate memory from other nodes.
This is a result of some previous fix (v1.2.7-rc1~91). However, I've
tested my fix successfully on a NUMA machine with F29 and recent kernel.
So the kernel bug I'm mentioning in 4/4 is probably fixed then and we
can drop the workaround.
Michal Prívozník (4):
qemuSetupCpusetMems: Use VIR_AUTOFREE()
qemuSetupCpusetMems: Create EMULATOR thread upfront
qemu_cgroup: Make qemuSetupCpusetMems static
qemuSetupCpusetCgroup: Set up cpuset.mems before execing qemu
src/qemu/qemu_cgroup.c | 12 +++++++-----
src/qemu/qemu_cgroup.h | 1 -
2 files changed, 7 insertions(+), 6 deletions(-)
--
2.21.0
6 years
[libvirt] [PATCH v2 0/4] domain capabilities: Expose firmware auto selection feature
by Michal Privoznik
v2 of:
https://www.redhat.com/archives/libvir-list/2019-April/msg00460.html
diff to v1:
- Expose 'secure' too
- Switch to uint64_t for qemuFirmwareGetSupported()
Michal Prívozník (4):
qemu_firmware: Separate firmware loading into a function
qemu_firmware: Separate machine and arch matching into a function
qemu_firmware: Introduce qemuFirmwareGetSupported
domain capabilities: Expose firmware auto selection feature
docs/formatdomaincaps.html.in | 23 +++
docs/schemas/domaincaps.rng | 1 +
src/conf/domain_capabilities.c | 3 +
src/conf/domain_capabilities.h | 2 +
src/qemu/qemu_capabilities.c | 35 +++-
src/qemu/qemu_capabilities.h | 1 +
src/qemu/qemu_driver.c | 1 +
src/qemu/qemu_firmware.c | 169 ++++++++++++++----
src/qemu/qemu_firmware.h | 10 ++
tests/Makefile.am | 4 +-
.../qemu_1.7.0.x86_64.xml | 7 +
.../qemu_2.12.0-virt.aarch64.xml | 6 +
.../qemu_2.12.0.ppc64.xml | 4 +
.../qemu_2.12.0.s390x.xml | 4 +
.../qemu_2.12.0.x86_64.xml | 7 +
.../qemu_2.6.0-virt.aarch64.xml | 6 +
.../qemu_2.6.0.aarch64.xml | 4 +
.../domaincapsschemadata/qemu_2.6.0.ppc64.xml | 4 +
.../qemu_2.6.0.x86_64.xml | 7 +
.../domaincapsschemadata/qemu_2.7.0.s390x.xml | 4 +
.../qemu_2.8.0-tcg.x86_64.xml | 7 +
.../domaincapsschemadata/qemu_2.8.0.s390x.xml | 4 +
.../qemu_2.8.0.x86_64.xml | 7 +
.../qemu_2.9.0-q35.x86_64.xml | 8 +
.../qemu_2.9.0-tcg.x86_64.xml | 7 +
.../qemu_2.9.0.x86_64.xml | 7 +
.../domaincapsschemadata/qemu_3.0.0.s390x.xml | 4 +
.../qemu_3.1.0.x86_64.xml | 7 +
.../qemu_4.0.0.x86_64.xml | 7 +
tests/domaincapstest.c | 16 ++
tests/qemufirmwaretest.c | 72 ++++++++
31 files changed, 412 insertions(+), 36 deletions(-)
--
2.21.0
6 years
[libvirt] [PATCH] Revert "Include unistd.h directly by files using it"
by Peter Krempa
This reverts commit a5e16020907e91bca1b0ab6c4ee5dbbdcccf6a54.
Getting rid of unistd.h from our headers will require more work than
just fixing the broken mingw build. Revert it until I have a more
complete proposal.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
Pushed under the build-breaker rule.
src/conf/virnwfilterbindingobj.c | 2 --
src/libxl/libxl_domain.c | 1 -
src/locking/lock_daemon_config.c | 2 --
src/locking/lock_driver_lockd.c | 2 --
src/logging/log_daemon_config.c | 2 --
src/lxc/lxc_conf.c | 2 --
src/lxc/lxc_fuse.c | 1 -
src/network/leaseshelper.c | 1 -
src/nwfilter/nwfilter_ebiptables_driver.c | 1 -
src/qemu/qemu_domain.c | 1 -
src/remote/remote_daemon_config.c | 2 --
src/security/security_dac.c | 1 -
src/security/security_manager.c | 1 -
src/storage/storage_file_fs.c | 1 -
src/util/vircgroupv1.c | 1 -
src/util/vircgroupv2.c | 1 -
src/util/virnetdev.c | 1 -
src/util/virnetdevip.c | 1 -
src/util/virnetdevmacvlan.c | 2 --
src/util/virnetdevvportprofile.c | 2 --
src/util/virperf.c | 1 -
src/util/virpidfile.c | 1 -
src/util/virpolkit.c | 1 -
src/util/virresctrl.c | 1 -
src/util/virutil.h | 1 +
tests/eventtest.c | 1 -
tests/objecteventtest.c | 2 --
tests/scsihosttest.c | 1 -
tests/vboxsnapshotxmltest.c | 1 -
tests/virfiletest.c | 1 -
tests/virfilewrapper.c | 1 -
tests/virlockspacetest.c | 1 -
tests/virnetdaemontest.c | 2 --
tests/virnetsockettest.c | 1 -
tests/virnettlscontexttest.c | 1 -
tests/virnettlshelpers.c | 1 -
tests/virnettlssessiontest.c | 1 -
tests/virscsitest.c | 1 -
tests/virstoragetest.c | 1 -
39 files changed, 1 insertion(+), 48 deletions(-)
diff --git a/src/conf/virnwfilterbindingobj.c b/src/conf/virnwfilterbindingobj.c
index 56a9022fc5..68afb9c434 100644
--- a/src/conf/virnwfilterbindingobj.c
+++ b/src/conf/virnwfilterbindingobj.c
@@ -20,8 +20,6 @@
#include <config.h>
-#include <unistd.h>
-
#include "viralloc.h"
#include "virerror.h"
#include "virstring.h"
diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
index 935d3d86b9..287406d323 100644
--- a/src/libxl/libxl_domain.c
+++ b/src/libxl/libxl_domain.c
@@ -21,7 +21,6 @@
#include <config.h>
#include <fcntl.h>
-#include <unistd.h>
#include "libxl_domain.h"
#include "libxl_capabilities.h"
diff --git a/src/locking/lock_daemon_config.c b/src/locking/lock_daemon_config.c
index 9dc3d6e409..03feeb02a5 100644
--- a/src/locking/lock_daemon_config.c
+++ b/src/locking/lock_daemon_config.c
@@ -21,8 +21,6 @@
#include <config.h>
-#include <unistd.h>
-
#include "lock_daemon_config.h"
#include "virconf.h"
#include "viralloc.h"
diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c
index 335180dafa..f6371f3050 100644
--- a/src/locking/lock_driver_lockd.c
+++ b/src/locking/lock_driver_lockd.c
@@ -21,8 +21,6 @@
#include <config.h>
-#include <unistd.h>
-
#include "lock_driver.h"
#include "virconf.h"
#include "viralloc.h"
diff --git a/src/logging/log_daemon_config.c b/src/logging/log_daemon_config.c
index 626ef15403..ec6d0686f4 100644
--- a/src/logging/log_daemon_config.c
+++ b/src/logging/log_daemon_config.c
@@ -21,8 +21,6 @@
#include <config.h>
-#include <unistd.h>
-
#include "log_daemon_config.h"
#include "virconf.h"
#include "viralloc.h"
diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c
index a6be352b22..2e4cc4f51a 100644
--- a/src/lxc/lxc_conf.c
+++ b/src/lxc/lxc_conf.c
@@ -23,8 +23,6 @@
/* includes */
#include <config.h>
-#include "unistd.h"
-
#include "lxc_conf.h"
#include "lxc_domain.h"
#include "virerror.h"
diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c
index b647743206..4137d1b04f 100644
--- a/src/lxc/lxc_fuse.c
+++ b/src/lxc/lxc_fuse.c
@@ -23,7 +23,6 @@
#include <fcntl.h>
#include <sys/mount.h>
#include <mntent.h>
-#include <unistd.h>
#include "lxc_fuse.h"
#include "lxc_cgroup.h"
diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c
index af71e32499..4c23a55326 100644
--- a/src/network/leaseshelper.c
+++ b/src/network/leaseshelper.c
@@ -23,7 +23,6 @@
#include <config.h>
-#include <unistd.h>
#include "virthread.h"
#include "virfile.h"
diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c
index 424daeb3c7..32bbf6d05c 100644
--- a/src/nwfilter/nwfilter_ebiptables_driver.c
+++ b/src/nwfilter/nwfilter_ebiptables_driver.c
@@ -25,7 +25,6 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/utsname.h>
-#include <unistd.h>
#include "internal.h"
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 58029ab20c..f0bf1aa4fe 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -64,7 +64,6 @@
#endif
#include <sys/time.h>
#include <fcntl.h>
-#include <unistd.h>
#if defined(HAVE_SYS_MOUNT_H)
# include <sys/mount.h>
#endif
diff --git a/src/remote/remote_daemon_config.c b/src/remote/remote_daemon_config.c
index 59f14bdbdc..a56aa9065a 100644
--- a/src/remote/remote_daemon_config.c
+++ b/src/remote/remote_daemon_config.c
@@ -21,8 +21,6 @@
#include <config.h>
-#include <unistd.h>
-
#include "remote_daemon_config.h"
#include "virconf.h"
#include "viralloc.h"
diff --git a/src/security/security_dac.c b/src/security/security_dac.c
index 5718557411..6f8ca8cd54 100644
--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
@@ -22,7 +22,6 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include <unistd.h>
#ifdef __FreeBSD__
# include <sys/sysctl.h>
diff --git a/src/security/security_manager.c b/src/security/security_manager.c
index 9bcd8f85ab..74ab0d0dd3 100644
--- a/src/security/security_manager.c
+++ b/src/security/security_manager.c
@@ -22,7 +22,6 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include <unistd.h>
#include "security_driver.h"
#include "security_stack.h"
diff --git a/src/storage/storage_file_fs.c b/src/storage/storage_file_fs.c
index 1570170d0e..8817970f44 100644
--- a/src/storage/storage_file_fs.c
+++ b/src/storage/storage_file_fs.c
@@ -23,7 +23,6 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include <unistd.h>
#include "virerror.h"
#include "storage_file_fs.h"
diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
index 7482b96a27..6224072db0 100644
--- a/src/util/vircgroupv1.c
+++ b/src/util/vircgroupv1.c
@@ -21,7 +21,6 @@
#include <config.h>
#ifdef __linux__
-# include <unistd.h>
# include <mntent.h>
# include <sys/stat.h>
# include <sys/mount.h>
diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
index 3264bff014..940ee58528 100644
--- a/src/util/vircgroupv2.c
+++ b/src/util/vircgroupv2.c
@@ -20,7 +20,6 @@
#include <config.h>
#ifdef __linux__
-# include <unistd.h>
# include <mntent.h>
# include <sys/mount.h>
#endif /* __linux__ */
diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
index 8e098b3634..5c0e9723b9 100644
--- a/src/util/virnetdev.c
+++ b/src/util/virnetdev.c
@@ -35,7 +35,6 @@
#include <sys/ioctl.h>
#include <net/if.h>
#include <fcntl.h>
-#include <unistd.h>
#ifdef __linux__
# include <linux/sockios.h>
diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c
index 7fc500007f..e2009fd829 100644
--- a/src/util/virnetdevip.c
+++ b/src/util/virnetdevip.c
@@ -36,7 +36,6 @@
#include <sys/ioctl.h>
#include <net/if.h>
#include <fcntl.h>
-#include <unistd.h>
#ifdef __linux__
# include <linux/sockios.h>
diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c
index e916ba0a0a..c80a3a381f 100644
--- a/src/util/virnetdevmacvlan.c
+++ b/src/util/virnetdevmacvlan.c
@@ -24,8 +24,6 @@
#include <config.h>
-#include <unistd.h>
-
#include "virnetdevmacvlan.h"
#include "virmacaddr.h"
#include "virerror.h"
diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c
index b30204fe7f..fb05190c02 100644
--- a/src/util/virnetdevvportprofile.c
+++ b/src/util/virnetdevvportprofile.c
@@ -18,8 +18,6 @@
#include <config.h>
-#include <unistd.h>
-
#include "virnetdevvportprofile.h"
#include "virerror.h"
#include "viralloc.h"
diff --git a/src/util/virperf.c b/src/util/virperf.c
index 9bde5c1246..6ecfc29cb2 100644
--- a/src/util/virperf.c
+++ b/src/util/virperf.c
@@ -17,7 +17,6 @@
*/
#include <config.h>
-#include <unistd.h>
#include <sys/ioctl.h>
#if defined HAVE_SYS_SYSCALL_H
# include <sys/syscall.h>
diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c
index a6ee6e1f4b..999bccbee4 100644
--- a/src/util/virpidfile.c
+++ b/src/util/virpidfile.c
@@ -26,7 +26,6 @@
#include <fcntl.h>
#include <signal.h>
#include <sys/stat.h>
-#include <unistd.h>
#include "virpidfile.h"
#include "virfile.h"
diff --git a/src/util/virpolkit.c b/src/util/virpolkit.c
index 5c94ae346b..198439cea2 100644
--- a/src/util/virpolkit.c
+++ b/src/util/virpolkit.c
@@ -21,7 +21,6 @@
#include <config.h>
#include <poll.h>
-#include <unistd.h>
#include "virpolkit.h"
#include "virerror.h"
diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c
index e495233110..9e477fc064 100644
--- a/src/util/virresctrl.c
+++ b/src/util/virresctrl.c
@@ -22,7 +22,6 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include <unistd.h>
#define LIBVIRT_VIRRESCTRLPRIV_H_ALLOW
#include "virresctrlpriv.h"
diff --git a/src/util/virutil.h b/src/util/virutil.h
index 477d70554b..ded9b039e5 100644
--- a/src/util/virutil.h
+++ b/src/util/virutil.h
@@ -24,6 +24,7 @@
# define LIBVIRT_VIRUTIL_H
# include "internal.h"
+# include <unistd.h>
# include <sys/types.h>
# ifndef MIN
diff --git a/tests/eventtest.c b/tests/eventtest.c
index 37166253cc..df7570bac6 100644
--- a/tests/eventtest.c
+++ b/tests/eventtest.c
@@ -22,7 +22,6 @@
#include <signal.h>
#include <time.h>
-#include <unistd.h>
#if HAVE_MACH_CLOCK_ROUTINES
# include <mach/clock.h>
diff --git a/tests/objecteventtest.c b/tests/objecteventtest.c
index b53763bc1d..9ba082d353 100644
--- a/tests/objecteventtest.c
+++ b/tests/objecteventtest.c
@@ -19,8 +19,6 @@
#include <config.h>
-#include <unistd.h>
-
#include "testutils.h"
#include "virerror.h"
diff --git a/tests/scsihosttest.c b/tests/scsihosttest.c
index 01cd77462b..6989e4fc4a 100644
--- a/tests/scsihosttest.c
+++ b/tests/scsihosttest.c
@@ -25,7 +25,6 @@
# include <fcntl.h>
# include <sys/stat.h>
-# include <unistd.h>
# include "virstring.h"
# include "virerror.h"
# include "virlog.h"
diff --git a/tests/vboxsnapshotxmltest.c b/tests/vboxsnapshotxmltest.c
index 2f815a2bca..c70d7ab100 100644
--- a/tests/vboxsnapshotxmltest.c
+++ b/tests/vboxsnapshotxmltest.c
@@ -5,7 +5,6 @@
#ifdef WITH_VBOX
# include <regex.h>
-# include <unistd.h>
# include "vbox/vbox_snapshot_conf.h"
# define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/virfiletest.c b/tests/virfiletest.c
index 6e4805b42d..e2bd4953ed 100644
--- a/tests/virfiletest.c
+++ b/tests/virfiletest.c
@@ -19,7 +19,6 @@
#include <config.h>
#include <fcntl.h>
-#include <unistd.h>
#include "testutils.h"
#include "virfile.h"
diff --git a/tests/virfilewrapper.c b/tests/virfilewrapper.c
index f4d077d608..067cb30657 100644
--- a/tests/virfilewrapper.c
+++ b/tests/virfilewrapper.c
@@ -21,7 +21,6 @@
#ifndef WIN32
# include <fcntl.h>
-# include <unistd.h>
# include "viralloc.h"
# include "virfile.h"
diff --git a/tests/virlockspacetest.c b/tests/virlockspacetest.c
index 4dd485bc0e..991e587db6 100644
--- a/tests/virlockspacetest.c
+++ b/tests/virlockspacetest.c
@@ -20,7 +20,6 @@
#include <signal.h>
#include <sys/stat.h>
-#include <unistd.h>
#include "testutils.h"
#include "virutil.h"
diff --git a/tests/virnetdaemontest.c b/tests/virnetdaemontest.c
index d7b9db6641..3e9b007d9b 100644
--- a/tests/virnetdaemontest.c
+++ b/tests/virnetdaemontest.c
@@ -18,8 +18,6 @@
#include <config.h>
-#include <unistd.h>
-
#include "testutils.h"
#include "virerror.h"
#include "rpc/virnetdaemon.h"
diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
index a7990ee5f3..9c14989287 100644
--- a/tests/virnetsockettest.c
+++ b/tests/virnetsockettest.c
@@ -23,7 +23,6 @@
# include <ifaddrs.h>
#endif
#include <netdb.h>
-#include <unistd.h>
#include "testutils.h"
#include "virutil.h"
diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c
index b94275b943..07910c2749 100644
--- a/tests/virnettlscontexttest.c
+++ b/tests/virnettlscontexttest.c
@@ -20,7 +20,6 @@
#include <fcntl.h>
#include <sys/socket.h>
-#include <unistd.h>
#include "testutils.h"
#include "virnettlshelpers.h"
diff --git a/tests/virnettlshelpers.c b/tests/virnettlshelpers.c
index dfb747b45d..a6aacf4cc3 100644
--- a/tests/virnettlshelpers.c
+++ b/tests/virnettlshelpers.c
@@ -20,7 +20,6 @@
#include <fcntl.h>
#include <sys/socket.h>
-#include <unistd.h>
#include "virnettlshelpers.h"
#include "viralloc.h"
diff --git a/tests/virnettlssessiontest.c b/tests/virnettlssessiontest.c
index 153c8929ed..41abbe7eaf 100644
--- a/tests/virnettlssessiontest.c
+++ b/tests/virnettlssessiontest.c
@@ -20,7 +20,6 @@
#include <fcntl.h>
#include <sys/socket.h>
-#include <unistd.h>
#include "testutils.h"
#include "virnettlshelpers.h"
diff --git a/tests/virscsitest.c b/tests/virscsitest.c
index 75c7be5822..be3ef6234e 100644
--- a/tests/virscsitest.c
+++ b/tests/virscsitest.c
@@ -19,7 +19,6 @@
#include <config.h>
-#include <unistd.h>
#include "virscsi.h"
#include "testutils.h"
diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
index d20559a636..4f23511240 100644
--- a/tests/virstoragetest.c
+++ b/tests/virstoragetest.c
@@ -18,7 +18,6 @@
#include <config.h>
-#include <unistd.h>
#include "testutils.h"
#include "vircommand.h"
--
2.20.1
6 years
[libvirt] [jenkins-ci PATCH] Fix host list for osinfo-db-tools-check
by Andrea Bolognani
Commit e423182b4528 updated the host list for the job, but got
things slightly wrong in that it included libvirt-debian-sid,
libvirt-freebsd-current and libvirt-ubuntu-18 in the Jenkins
configuration rather than the Ansible one.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
Pushed as a trivial fix.
guests/playbooks/build/projects/osinfo-db-tools.yml | 3 +++
jenkins/projects/osinfo-db-tools.yaml | 3 ---
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/guests/playbooks/build/projects/osinfo-db-tools.yml b/guests/playbooks/build/projects/osinfo-db-tools.yml
index e33ea7a..27f6cc4 100644
--- a/guests/playbooks/build/projects/osinfo-db-tools.yml
+++ b/guests/playbooks/build/projects/osinfo-db-tools.yml
@@ -14,11 +14,14 @@
# CentOS 7;
machines:
- libvirt-debian-9
+ - libvirt-debian-sid
- libvirt-fedora-28
- libvirt-fedora-29
- libvirt-fedora-rawhide
- libvirt-freebsd-11
- libvirt-freebsd-12
+ - libvirt-freebsd-current
+ - libvirt-ubuntu-18
- include: '{{ playbook_base }}/jobs/autotools-rpm-job.yml'
vars:
machines: '{{ rpm_machines }}'
diff --git a/jenkins/projects/osinfo-db-tools.yaml b/jenkins/projects/osinfo-db-tools.yaml
index 9f738b6..de96bb5 100644
--- a/jenkins/projects/osinfo-db-tools.yaml
+++ b/jenkins/projects/osinfo-db-tools.yaml
@@ -16,14 +16,11 @@
# CentOS 7;
machines:
- libvirt-debian-9
- - libvirt-debian-sid
- libvirt-fedora-28
- libvirt-fedora-29
- libvirt-fedora-rawhide
- libvirt-freebsd-11
- libvirt-freebsd-12
- - libvirt-freebsd-current
- - libvirt-ubuntu-18
- autotools-rpm-job:
parent_jobs: 'osinfo-db-tools-check'
machines: '{rpm_machines}'
--
2.20.1
6 years
[libvirt] [PATCH 0/2] drop QEMU_CAPS*KQEMU
by Ján Tomko
Ján Tomko (2):
Delete QEMU_CAPS_KQEMU and QEMU_CAPS_ENABLE_KQEMU
fixup: regroup QEMU capabilities
src/qemu/qemu_capabilities.c | 248 +++++++++++++++++------------------
src/qemu/qemu_capabilities.h | 248 +++++++++++++++++------------------
2 files changed, 246 insertions(+), 250 deletions(-)
--
2.19.2
6 years
[libvirt] [jenkins-ci PATCH 0/7] Update libosinfo/osinfo-db-tools dependencies
by Fabiano Fidêncio
This patch set updates both libosinfo and osinfo-db-tools deps. The
changes done are, basically:
libosinfo:
- drop gnome-common
- drop intltool
osinfo-db-tools:
- drop gnome-common
- drop intltool
- add python3
- add python3-pytest
- add python3-requests
Together with those changes:
- gnome-common has been dropped from the mappings as the only consumers
were libosinfo and osinfo-db-tools.
- `make check` is not ran for CentOS 7 anymore, as the osinfo-db-tools
testes depend on python3.
Fabiano Fidêncio (7):
guests: Drop gnome-common libosinfo's dependency
guests: Drop gnome-common osinfo-db-tools' dependency
guests: Remove unused "gnome-common" mapping
guests: Drop intltool libosinfo's dependency
guests: Drop intltool osinfo-db-tools' dependency
guests: Update test dependencies for osinfo-db-tools
Stop running `make check` against osinfo-db-tools on CentOS 7
guests/playbooks/build/projects/osinfo-db-tools.yml | 10 ++++++++++
guests/vars/mappings.yml | 3 ---
guests/vars/projects/libosinfo.yml | 2 --
guests/vars/projects/osinfo-db-tools.yml | 5 +++--
jenkins/projects/osinfo-db-tools.yaml | 12 ++++++++++++
5 files changed, 25 insertions(+), 7 deletions(-)
--
2.20.1
6 years
[libvirt] [PATCH] vmx: Define VMX_CONFIG_FORMAT_ARGV to replace vmware/esx argv str
by Han Han
Signed-off-by: Han Han <hhan(a)redhat.com>
---
src/esx/esx_driver.c | 4 ++--
src/vmware/vmware_driver.c | 2 +-
src/vmx/vmx.h | 2 ++
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
index 08d33b6f3b..d80fef0a58 100644
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -2710,7 +2710,7 @@ esxConnectDomainXMLFromNative(virConnectPtr conn, const char *nativeFormat,
memset(&data, 0, sizeof(data));
- if (STRNEQ(nativeFormat, "vmware-vmx")) {
+ if (STRNEQ(nativeFormat, VMX_CONFIG_FORMAT_ARGV)) {
virReportError(VIR_ERR_INVALID_ARG,
_("Unsupported config format '%s'"), nativeFormat);
return NULL;
@@ -2755,7 +2755,7 @@ esxConnectDomainXMLToNative(virConnectPtr conn, const char *nativeFormat,
memset(&data, 0, sizeof(data));
- if (STRNEQ(nativeFormat, "vmware-vmx")) {
+ if (STRNEQ(nativeFormat, VMX_CONFIG_FORMAT_ARGV)) {
virReportError(VIR_ERR_INVALID_ARG,
_("Unsupported config format '%s'"), nativeFormat);
return NULL;
diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c
index f4b0989afd..1bc8a06c39 100644
--- a/src/vmware/vmware_driver.c
+++ b/src/vmware/vmware_driver.c
@@ -956,7 +956,7 @@ vmwareConnectDomainXMLFromNative(virConnectPtr conn, const char *nativeFormat,
virCheckFlags(0, NULL);
- if (STRNEQ(nativeFormat, "vmware-vmx")) {
+ if (STRNEQ(nativeFormat, VMX_CONFIG_FORMAT_ARGV)) {
virReportError(VIR_ERR_INVALID_ARG,
_("Unsupported config format '%s'"), nativeFormat);
return NULL;
diff --git a/src/vmx/vmx.h b/src/vmx/vmx.h
index cb99e84d18..8c068b4cb2 100644
--- a/src/vmx/vmx.h
+++ b/src/vmx/vmx.h
@@ -26,6 +26,8 @@
# include "virconf.h"
# include "domain_conf.h"
+# define VMX_CONFIG_FORMAT_ARGV "vmware-vmx"
+
typedef struct _virVMXContext virVMXContext;
virDomainXMLOptionPtr virVMXDomainXMLConfInit(void);
--
2.20.1
6 years
[libvirt] [PATCH] build-aux: ensure all scripts are included in EXTRA_DIST
by Daniel P. Berrangé
Few of the scripts in build-aux are included in EXTRA_DIST. This is not
a serious problem since they are primarily tools intended for developers
upstream, and downstream builds won't need them. Having them missing,
however, complicates downstream patching because it means patches that
are auto-exported from git will fail to apply if they include a change
to a file in build-aux/. By bundling all these scripts in the dist we
make patching more straightforward.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
Makefile.am | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index 621e9b4f89..eba5916352 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,7 +40,17 @@ EXTRA_DIST = \
cfg.mk \
run.in \
README.md \
- AUTHORS.in
+ AUTHORS.in \
+ build-aux/augeas-gentest.pl \
+ build-aux/check-spacing.pl \
+ build-aux/gitlog-to-changelog \
+ build-aux/header-ifdef.pl \
+ build-aux/minimize-po.pl \
+ build-aux/mock-noinline.pl \
+ build-aux/prohibit-duplicate-header.pl \
+ build-aux/useless-if-before-free \
+ build-aux/vc-list-files \
+ $(NULL)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libvirt.pc libvirt-qemu.pc libvirt-lxc.pc libvirt-admin.pc
--
2.20.1
6 years
[libvirt] [PATCH v1 0/4] domain capabilities: Expose firmware auto selection feature
by Michal Privoznik
Motivated by discussion with Pino and others.
Michal Prívozník (4):
qemu_firmware: Separate firmware loading into a function
qemu_firmware: Separate machine and arch matching into a function
qemu_firmware: Introduce qemuFirmwareGetSupported
domain capabilities: Expose firmware auto selection feature
docs/formatdomaincaps.html.in | 14 ++
docs/schemas/domaincaps.rng | 3 +
src/conf/domain_capabilities.c | 2 +
src/conf/domain_capabilities.h | 1 +
src/qemu/qemu_capabilities.c | 23 ++-
src/qemu/qemu_capabilities.h | 1 +
src/qemu/qemu_driver.c | 1 +
src/qemu/qemu_firmware.c | 149 ++++++++++++++----
src/qemu/qemu_firmware.h | 9 ++
tests/Makefile.am | 4 +-
.../qemu_1.7.0.x86_64.xml | 4 +
.../qemu_2.12.0-virt.aarch64.xml | 3 +
.../qemu_2.12.0.ppc64.xml | 1 +
.../qemu_2.12.0.s390x.xml | 1 +
.../qemu_2.12.0.x86_64.xml | 4 +
.../qemu_2.6.0-virt.aarch64.xml | 3 +
.../qemu_2.6.0.aarch64.xml | 1 +
.../domaincapsschemadata/qemu_2.6.0.ppc64.xml | 1 +
.../qemu_2.6.0.x86_64.xml | 4 +
.../domaincapsschemadata/qemu_2.7.0.s390x.xml | 1 +
.../qemu_2.8.0-tcg.x86_64.xml | 4 +
.../domaincapsschemadata/qemu_2.8.0.s390x.xml | 1 +
.../qemu_2.8.0.x86_64.xml | 4 +
.../qemu_2.9.0-q35.x86_64.xml | 4 +
.../qemu_2.9.0-tcg.x86_64.xml | 4 +
.../qemu_2.9.0.x86_64.xml | 4 +
.../domaincapsschemadata/qemu_3.0.0.s390x.xml | 1 +
.../qemu_4.0.0.x86_64.xml | 4 +
tests/domaincapstest.c | 16 ++
tests/qemufirmwaretest.c | 58 +++++++
30 files changed, 295 insertions(+), 35 deletions(-)
--
2.21.0
6 years
