- Devel - libvirt List Archives

[libvirt] [jenkins-ci PATCH] lcitool: Don't install yast2_base group on openSUSE
by Andrea Bolognani 12 Dec '19

12 Dec '19

We're handling all configuration using lcitool, and we have to be able to cope with minimal openSUSE environments anyway because of containers. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- I've tested this by creating a fresh openSUSE Leap 15.1 VM and verifying that I could successfully 'lcitool build' libvirt inside it. guests/configs/autoinst.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/guests/configs/autoinst.xml b/guests/configs/autoinst.xml index f8ec3df..ceb702d 100644 --- a/guests/configs/autoinst.xml +++ b/guests/configs/autoinst.xml @@ -44,7 +44,6 @@ <patterns config:type="list"> <pattern>base</pattern> <pattern>minimal_base</pattern> - <pattern>yast2_basis</pattern> </patterns> <packages config:type="list"> <package>openssh</package> -- 2.23.0

2 1

[libvirt] [PATCH] Remove redundant usage of WITH_YAJL
by Ján Tomko 12 Dec '19

12 Dec '19

As of commit 2a00ef6e71f30241f9ca6288da984d75f3cef957 which was released in v5.2.0, we require YAJL to build the QEMU driver. Remove the checks from code that requires the QEMU driver or checks that also check for WITH_QEMU. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/qemu/qemu_driver.c | 5 ----- tests/cputest.c | 16 +++++++------- tests/qemuagenttest.c | 5 ----- tests/qemublocktest.c | 42 ++++++++++++++----------------------- tests/qemumigparamstest.c | 5 ----- tests/qemumonitorjsontest.c | 5 ----- 6 files changed, 24 insertions(+), 54 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e65150f42b..66c58d190f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2104,11 +2104,6 @@ qemuDomainRebootMonitor(virQEMUDriverPtr driver, if (virDomainObjCheckActive(vm) < 0) goto endjob; -#if !WITH_YAJL - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("ACPI reboot is not supported without the JSON monitor")); - goto endjob; -#endif qemuDomainSetFakeReboot(driver, vm, isReboot); qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorSystemPowerdown(priv->mon); diff --git a/tests/cputest.c b/tests/cputest.c index fd86344ea4..f57516838b 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -36,7 +36,7 @@ #include "cpu/cpu_map.h" #include "virstring.h" -#if WITH_QEMU && WITH_YAJL +#if WITH_QEMU # include "testutilsqemu.h" # include "qemumonitortestutils.h" # define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW @@ -62,7 +62,7 @@ struct data { int result; }; -#if WITH_QEMU && WITH_YAJL +#if WITH_QEMU static virQEMUDriver driver; #endif @@ -465,7 +465,7 @@ typedef enum { JSON_MODELS_REQUIRED, } cpuTestCPUIDJson; -#if WITH_QEMU && WITH_YAJL +#if WITH_QEMU static virQEMUCapsPtr cpuTestMakeQEMUCaps(const struct data *data) { @@ -547,7 +547,7 @@ cpuTestGetCPUModels(const struct data *data, return 0; } -#else /* if WITH_QEMU && WITH_YAJL */ +#else /* if WITH_QEMU */ static int cpuTestGetCPUModels(const struct data *data, @@ -871,7 +871,7 @@ cpuTestUpdateLive(const void *arg) } -#if WITH_QEMU && WITH_YAJL +#if WITH_QEMU static int cpuTestJSONCPUID(const void *arg) { @@ -970,7 +970,7 @@ mymain(void) virDomainCapsCPUModelsPtr ppc_models = NULL; int ret = 0; -#if WITH_QEMU && WITH_YAJL +#if WITH_QEMU if (qemuTestDriverInit(&driver) < 0) return EXIT_FAILURE; @@ -1057,7 +1057,7 @@ mymain(void) host "/" cpu " (" #models ")", \ host, cpu, models, 0, result) -#if WITH_QEMU && WITH_YAJL +#if WITH_QEMU # define DO_TEST_JSON(arch, host, json) \ do { \ if (json == JSON_MODELS) { \ @@ -1270,7 +1270,7 @@ mymain(void) DO_TEST_CPUID(VIR_ARCH_X86_64, "Ice-Lake-Server", JSON_MODELS); cleanup: -#if WITH_QEMU && WITH_YAJL +#if WITH_QEMU qemuTestDriverFree(&driver); #endif diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index d8824b8f09..644dc9d08b 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -1426,11 +1426,6 @@ mymain(void) { int ret = 0; -#if !WITH_YAJL - fputs("libvirt not compiled with JSON support, skipping this test\n", stderr); - return EXIT_AM_SKIP; -#endif - if (qemuTestDriverInit(&driver) < 0) return EXIT_FAILURE; diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c index 2c170548ec..c9335774b9 100644 --- a/tests/qemublocktest.c +++ b/tests/qemublocktest.c @@ -18,22 +18,20 @@ #include "testutils.h" +#include "testutilsqemu.h" +#include "testutilsqemuschema.h" +#include "virstoragefile.h" +#include "virstring.h" +#include "virlog.h" +#include "qemu/qemu_block.h" +#include "qemu/qemu_qapi.h" -#if WITH_YAJL -# include "testutilsqemu.h" -# include "testutilsqemuschema.h" -# include "virstoragefile.h" -# include "virstring.h" -# include "virlog.h" -# include "qemu/qemu_block.h" -# include "qemu/qemu_qapi.h" +#include "qemu/qemu_command.h" -# include "qemu/qemu_command.h" +#define LIBVIRT_SNAPSHOT_CONF_PRIV_H_ALLOW +#include "conf/snapshot_conf_priv.h" -# define LIBVIRT_SNAPSHOT_CONF_PRIV_H_ALLOW -# include "conf/snapshot_conf_priv.h" - -# define VIR_FROM_THIS VIR_FROM_NONE +#define VIR_FROM_THIS VIR_FROM_NONE VIR_LOG_INIT("tests.storagetest"); @@ -523,7 +521,7 @@ mymain(void) virTestCounterReset("qemu storage source xml->json->xml "); -# define TEST_JSON_FORMAT(tpe, xmlstr) \ +#define TEST_JSON_FORMAT(tpe, xmlstr) \ do { \ xmljsonxmldata.type = tpe; \ xmljsonxmldata.xml = xmlstr; \ @@ -532,7 +530,7 @@ mymain(void) ret = -1; \ } while (0) -# define TEST_JSON_FORMAT_NET(xmlstr) \ +#define TEST_JSON_FORMAT_NET(xmlstr) \ TEST_JSON_FORMAT(VIR_STORAGE_TYPE_NETWORK, xmlstr) TEST_JSON_FORMAT(VIR_STORAGE_TYPE_FILE, "<source file='/path/to/file'/>\n"); @@ -588,7 +586,7 @@ mymain(void) " <host name='example.com' port='9999'/>\n" "</source>\n"); -# define TEST_DISK_TO_JSON_FULL(nme, fl) \ +#define TEST_DISK_TO_JSON_FULL(nme, fl) \ do { \ diskxmljsondata.name = nme; \ diskxmljsondata.props = NULL; \ @@ -611,7 +609,7 @@ mymain(void) testQemuDiskXMLToPropsClear(&diskxmljsondata); \ } while (0) -# define TEST_DISK_TO_JSON(nme) TEST_DISK_TO_JSON_FULL(nme, false) +#define TEST_DISK_TO_JSON(nme) TEST_DISK_TO_JSON_FULL(nme, false) if (!(diskxmljsondata.schema = testQEMUSchemaLoad())) { ret = -1; @@ -667,7 +665,7 @@ mymain(void) TEST_DISK_TO_JSON("block-raw-noopts"); TEST_DISK_TO_JSON("block-raw-reservations"); -# define TEST_IMAGE_CREATE(testname, testbacking) \ +#define TEST_IMAGE_CREATE(testname, testbacking) \ do { \ imagecreatedata.name = testname; \ imagecreatedata.backingname = testbacking; \ @@ -711,12 +709,4 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -#else -static int -mymain(void) -{ - return EXIT_AM_SKIP; -} -#endif - VIR_TEST_MAIN(mymain) diff --git a/tests/qemumigparamstest.c b/tests/qemumigparamstest.c index b36aa60302..954cd1c578 100644 --- a/tests/qemumigparamstest.c +++ b/tests/qemumigparamstest.c @@ -201,11 +201,6 @@ mymain(void) virQEMUDriver driver; int ret = 0; -#if !WITH_YAJL - fputs("libvirt not compiled with JSON support, skipping this test\n", stderr); - return EXIT_AM_SKIP; -#endif - if (qemuTestDriverInit(&driver) < 0) return EXIT_FAILURE; diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 4f3bfad1d7..21b029390c 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -2991,11 +2991,6 @@ mymain(void) virJSONValuePtr metaschema = NULL; char *metaschemastr = NULL; -#if !WITH_YAJL - fputs("libvirt not compiled with JSON support, skipping this test\n", stderr); - return EXIT_AM_SKIP; -#endif - if (qemuTestDriverInit(&driver) < 0) return EXIT_FAILURE; -- 2.19.2

2 1

[libvirt] [jenkins-ci PATCH 0/5] lcitool: Make Dockerfile generation work on openSUSE
by Andrea Bolognani 12 Dec '19

12 Dec '19

With this series applied, running ./lcitool dockerfile libvirt-opensuse-151 libvirt results in a Dockerfile that can be successfully used to build a container image, and that image in turn can be successfully used to build libvirt in. Andrea Bolognani (5): guests: Add mapping for augeas-lenses guests: Install augeas-lenses for libvirt lcitool: Remove redundant update step for openSUSE guests: Add base container image for openSUSE Leap 15.1 lcitool: Make Dockerfile generation work on openSUSE guests/host_vars/libvirt-opensuse-151/docker.yml | 2 ++ guests/lcitool | 14 ++++++++++++-- guests/playbooks/update/tasks/base.yml | 7 ------- guests/vars/mappings.yml | 5 +++++ guests/vars/projects/libvirt.yml | 1 + 5 files changed, 20 insertions(+), 9 deletions(-) create mode 100644 guests/host_vars/libvirt-opensuse-151/docker.yml -- 2.23.0

4 20

[libvirt] [jenkins-ci PATCH v2 0/6] Add support for gtk-vnc builds
by Daniel P. Berrangé 12 Dec '19

12 Dec '19

Support gtk-vnc and make virt-viewer depend on it I sent this months ago & forgot to push it. Re-sending just in case something has invalidated any patches. I've at least added the newer distros Daniel P. Berrangé (6): mappings: add libgcrypt mappings: add PulseAudio projects: add gtk-vnc project guests: pull in deps for gtk-vnc project projects: make virt-viewer depend on gtk-vnc jobs mappings: remove gtk-vnc2 guests/host_vars/libvirt-centos-7/main.yml | 1 + guests/host_vars/libvirt-centos-8/main.yml | 1 + guests/host_vars/libvirt-debian-10/main.yml | 1 + guests/host_vars/libvirt-debian-9/main.yml | 1 + guests/host_vars/libvirt-debian-sid/main.yml | 1 + guests/host_vars/libvirt-fedora-30/main.yml | 1 + guests/host_vars/libvirt-fedora-31/main.yml | 1 + .../host_vars/libvirt-fedora-rawhide/main.yml | 3 ++ guests/host_vars/libvirt-freebsd-11/main.yml | 1 + guests/host_vars/libvirt-freebsd-12/main.yml | 1 + .../libvirt-freebsd-current/main.yml | 1 + guests/host_vars/libvirt-ubuntu-1604/main.yml | 1 + guests/host_vars/libvirt-ubuntu-1804/main.yml | 1 + guests/playbooks/build/jobs/defaults.yml | 3 ++ .../build/projects/gtk-vnc+mingw32.yml | 12 ++++++++ .../build/projects/gtk-vnc+mingw64.yml | 12 ++++++++ guests/playbooks/build/projects/gtk-vnc.yml | 14 +++++++++ guests/vars/mappings.yml | 30 +++++++++++-------- guests/vars/projects/gtk-vnc+mingw32.yml | 6 ++++ guests/vars/projects/gtk-vnc+mingw64.yml | 6 ++++ guests/vars/projects/gtk-vnc.yml | 11 +++++++ guests/vars/projects/virt-viewer+mingw32.yml | 1 - guests/vars/projects/virt-viewer+mingw64.yml | 1 - guests/vars/projects/virt-viewer.yml | 1 - jenkins/jobs/defaults.yaml | 3 ++ jenkins/projects/gtk-vnc+mingw32.yaml | 12 ++++++++ jenkins/projects/gtk-vnc+mingw64.yaml | 12 ++++++++ jenkins/projects/gtk-vnc.yaml | 17 +++++++++++ jenkins/projects/virt-viewer+mingw32.yaml | 4 ++- jenkins/projects/virt-viewer+mingw64.yaml | 4 ++- jenkins/projects/virt-viewer.yaml | 4 ++- 31 files changed, 149 insertions(+), 19 deletions(-) create mode 100644 guests/playbooks/build/projects/gtk-vnc+mingw32.yml create mode 100644 guests/playbooks/build/projects/gtk-vnc+mingw64.yml create mode 100644 guests/playbooks/build/projects/gtk-vnc.yml create mode 100644 guests/vars/projects/gtk-vnc+mingw32.yml create mode 100644 guests/vars/projects/gtk-vnc+mingw64.yml create mode 100644 guests/vars/projects/gtk-vnc.yml create mode 100644 jenkins/projects/gtk-vnc+mingw32.yaml create mode 100644 jenkins/projects/gtk-vnc+mingw64.yaml create mode 100644 jenkins/projects/gtk-vnc.yaml -- 2.23.0

2 9

[libvirt] [jenkins-ci PATCH] lcitool: Only install EPEL on CentOS
by Andrea Bolognani 12 Dec '19

12 Dec '19

This fixes a bug introduced by commit 0a7993d3ed30 which caused our machinery to try to install the epel-release on all targets, including the likes of Debian and even FreeBSD. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed under the build breaker rule. guests/playbooks/update/tasks/base.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/guests/playbooks/update/tasks/base.yml b/guests/playbooks/update/tasks/base.yml index 8128975..f721e39 100644 --- a/guests/playbooks/update/tasks/base.yml +++ b/guests/playbooks/update/tasks/base.yml @@ -21,6 +21,8 @@ package: name: epel-release state: latest + when: + - os_name == 'CentOS' - name: Create OpenVZ key template: -- 2.23.0

1 0

[libvirt] [PATCH 0/8] Don't hold both monitor and agent jobs at the same time
by Jonathon Jongsma 12 Dec '19

12 Dec '19

We have to assume that the guest agent may be malicious, so we don't want to allow any agent queries to block any other libvirt API. By holding a monitor job and an agent job while we're querying the agent, any other threads will be blocked from using the monitor while the agent is unresponsive. Because libvirt waits forever for an agent response, this makes us vulnerable to a denial of service from a malicious (or simply buggy) guest agent. This series of patches attempts to remove any cases where we were holding both jobs at the same time, removes a convenience function which allows us to grab both jobs at once, and updates documentation regarding this issue. Jonathon Jongsma (8): qemu: don't take agent and monitor job for shutdown qemu: don't hold a monitor and agent job for reboot qemu: don't hold both jobs for suspend qemu: don't hold monitor and agent job when setting time qemu: don't hold monitor job for fsinfo qemu: don't hold monitor job for GetGuestInfo() qemu: remove use of qemuDomainObjBeginJobWithAgent() qemu: remove qemuDomainObjBegin/EndJobWithAgent() src/qemu/THREADS.txt | 58 +----- src/qemu/qemu_domain.c | 56 +----- src/qemu/qemu_domain.h | 7 - src/qemu/qemu_driver.c | 405 +++++++++++++++++++++++++---------------- 4 files changed, 258 insertions(+), 268 deletions(-) -- 2.21.0

3 15

[libvirt] [RFC PATCH 0/9] add virtiofs support (virtio-fs epopee)
by Ján Tomko 12 Dec '19

12 Dec '19

https://bugzilla.redhat.com/show_bug.cgi?id=1694166 A work in progress, but I'm sending it now to get the XML bikesh^Wdiscussion out of the way. TODO: * documentation (due to the requirement of shared memory and therefore a <numa> topology specification, this probably deserves a separate article on https://libvirt.org/kbase.html ) * validation - refuse unsupported combinations and block migration * remove a few hardcoded values * figure out the binary path from qemu interop config * leave queue-size and cache-size on their default values or expose them in XML * use FD passing for vhost-user-fs device as well * clean up the code Tested with: commit 320000e72ec0613e164ce9608d865396fb2da278 Author: Linus Torvalds <torvalds(a)linux-foundation.org> Date: Wed Oct 30 14:17:18 2019 +0100 Merge tag 'iommu-fixes-v5.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu and commit d3d2efbb0e37494708dde359a9d0f492f84833e8 Author: Dr. David Alan Gilbert <dgilbert(a)redhat.com> CommitDate: 2019-10-24 11:50:55 +0100 virtio-fs: Allow mapping of meta data version table from https://gitlab.com/virtio-fs/qemu/tree/virtio-fs-dev git fetch https://gitlab.com/virtio-fs/qemu.git virtio-fs-dev (not yet merged upstream) Ján Tomko (9): qemu: address: take fsdriver type into account qemu: cmdline: take fsdriver into account qemu: add QEMU_CAPS_VHOST_USER_FS wip: tests: add xml2xml tests for virtio-fs wip: add XML -> ARGV tests for virtio-fs conf: qemu: add virtio-fs fsdriver type qemu: pass private data to qemuBuildFilesystemCommandLine wip: start virtiofsd wip: build vhost-user-fs device command line docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 1 + src/conf/domain_conf.h | 2 + src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 67 +++++- src/qemu/qemu_domain.c | 4 + src/qemu/qemu_domain_address.c | 35 +++- src/qemu/qemu_extdevice.c | 191 ++++++++++++++++++ ...vhost-user-fs-fd-memory.x86_64-latest.args | 38 ++++ .../vhost-user-fs-fd-memory.xml | 38 ++++ ...vhost-user-fs-hugepages.x86_64-latest.args | 42 ++++ .../vhost-user-fs-hugepages.xml | 67 ++++++ tests/qemuxml2argvtest.c | 9 + .../vhost-user-fs-fd-memory.x86_64-latest.xml | 1 + .../vhost-user-fs-hugepages.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 3 + 17 files changed, 493 insertions(+), 14 deletions(-) create mode 100644 tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/vhost-user-fs-fd-memory.xml create mode 100644 tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/vhost-user-fs-hugepages.xml create mode 120000 tests/qemuxml2xmloutdata/vhost-user-fs-fd-memory.x86_64-latest.xml create mode 120000 tests/qemuxml2xmloutdata/vhost-user-fs-hugepages.x86_64-latest.xml -- 2.21.0

5 19

[libvirt] [jenkins-ci PATCH 0/2] lcitool: Refactor Dockerfile generation
by Andrea Bolognani 12 Dec '19

12 Dec '19

Andrea Bolognani (2): lcitool: Perform system update after enabling repos lcitool: Refactor Dockerfile generation guests/lcitool | 66 +++++++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) -- 2.23.0

2 6

[libvirt] [PATCH v2 0/3] misc fixes for qemu domain validation/post-parse
by Daniel P. Berrangé 12 Dec '19

12 Dec '19

Daniel P. Berrangé (3): tests: add a domain ID to live status XML doc qemu: check os type / virt type / arch in validate callback qemu: honour parseOpaque instead of refetching caps src/qemu/qemu_domain.c | 54 ++++++++++--------- .../qemustatusxml2xmldata/vcpus-multi-in.xml | 2 +- tests/qemuxml2argvtest.c | 9 ++-- 3 files changed, 35 insertions(+), 30 deletions(-) -- 2.23.0

2 5

[libvirt] [PATCHv2 0/8] Remove VIR_STRNDUP
by Ján Tomko 12 Dec '19

12 Dec '19

Ján Tomko (8): Remove VIR_STRDUP usage that sneaked in in the meantime vsh: remove vshErrorOOM Remove VIR_STRNDUP usage with checked pointers Remove all the uses that use subtraction in their length argument Remove the rest of VIR_STRNDUP tests: delete tests for VIR_STR(N)DUP util: remove VIR_STRDUP and VIR_STRNDUP docs: hacking: document removal of VIR_STR(N)DUP docs/hacking.html.in | 10 +- src/bhyve/bhyve_parse_command.c | 6 +- src/conf/backup_conf.c | 4 +- src/conf/nwfilter_conf.c | 4 +- src/conf/nwfilter_params.c | 6 +- src/interface/interface_backend_udev.c | 8 +- src/libvirt_private.syms | 2 - src/libxl/xen_common.c | 29 +++--- src/libxl/xen_xl.c | 6 +- src/libxl/xen_xm.c | 9 +- src/lxc/lxc_driver.c | 3 +- src/qemu/qemu_driver.c | 3 +- src/qemu/qemu_monitor_json.c | 14 +-- src/rpc/virnetlibsshsession.c | 7 +- src/util/vircgroupv1.c | 5 +- src/util/vircommand.c | 1 - src/util/virconf.c | 24 ++--- src/util/viriscsi.c | 3 +- src/util/virjson.c | 11 +- src/util/virkeyfile.c | 9 +- src/util/virsocketaddr.c | 5 +- src/util/virstoragefile.c | 6 +- src/util/virstring.c | 52 +--------- src/util/virstring.h | 69 ------------- src/util/virsysinfo.c | 3 +- src/vmware/vmware_conf.c | 6 +- tests/virstringtest.c | 136 ------------------------- tools/vsh.c | 16 +-- 28 files changed, 63 insertions(+), 394 deletions(-) -- 2.21.0

2 9