- Devel - libvirt List Archives

[libvirt] [PATCHv2 0/4] qemu: enable sandbox whitelist by default
by Ján Tomko 17 Apr '18

17 Apr '18

v1: https://www.redhat.com/archives/libvir-list/2018-March/msg01965.html https://bugzilla.redhat.com/show_bug.cgi?id=1492597 v2: * also deny resource control * split out and refactor the command line building * be explicit about denying the obsolete syscalls Ján Tomko (4): Introduce QEMU_CAPS_SECCOMP_BLACKLIST Introduce qemuBuildSeccompSandboxCommandLine Refactor qemuBuildSeccompSandboxCommandLine qemu: deny privilege elevation and spawn in seccomp src/qemu/qemu.conf | 7 ++-- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 46 +++++++++++++++++----- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 + tests/qemuxml2argvdata/minimal-sandbox.args | 29 ++++++++++++++ tests/qemuxml2argvdata/minimal-sandbox.xml | 34 ++++++++++++++++ tests/qemuxml2argvtest.c | 11 ++++++ 12 files changed, 123 insertions(+), 12 deletions(-) create mode 100644 tests/qemuxml2argvdata/minimal-sandbox.args create mode 100644 tests/qemuxml2argvdata/minimal-sandbox.xml -- 2.16.1

3 14

[libvirt] [jenkins-ci PATCH v2 0/6] Mostly drop CentOS 6
by Andrea Bolognani 17 Apr '18

17 Apr '18

Changes from [v1]: * instead of dropping CentOS 6 altogether, simply stop building pretty much all projects on it; * introduce a new job type specifically for whatever little stuff we need to ensure still works on CentOS 6; * the end result is still a nice cleanup thanks to not repeating the list of machines all over the place; moreover, the message about our support of the OS is very clear because it disappears from all but one page on the CI web interface. [v1] https://www.redhat.com/archives/libvir-list/2018-April/msg00453.html Andrea Bolognani (6): jobs: Introduce autotools-website-job guests: Introduce libvirt+website project projects: Add libvirt-master-website job projects: Stop building on CentOS 6 guests: Drop projects from CentOS 6 jobs: Introduce {all_machines} and {rpm_machines} guests/host_vars/libvirt-centos-6/main.yml | 5 +-- guests/vars/projects/libvirt+website.yml | 5 +++ jobs/autotools.yaml | 67 ++++++++++++++++++++++++++++++ jobs/defaults.yaml | 14 +++++++ projects/libosinfo.yaml | 16 +------ projects/libvirt-cim.yaml | 7 +--- projects/libvirt-glib.yaml | 16 +------ projects/libvirt-go-xml.yaml | 10 +---- projects/libvirt-go.yaml | 10 +---- projects/libvirt-perl.yaml | 17 +------- projects/libvirt-python.yaml | 18 +------- projects/libvirt.yaml | 34 +++++++-------- projects/osinfo-db-tools.yaml | 16 +------ projects/osinfo-db.yaml | 16 +------ projects/virt-viewer.yaml | 16 +------ 15 files changed, 119 insertions(+), 148 deletions(-) create mode 100644 guests/vars/projects/libvirt+website.yml -- 2.14.3

2 26

[libvirt] [PATCH v2 0/5] Enable memory-backend-file.discard-data
by Michal Privoznik 17 Apr '18

17 Apr '18

diff to v1: - Merged two patches into one (5/7 and 6/7 from the original series) - reworked last patch - 1/7 from the original series is pushed now Michal Privoznik (5): qemu_capabilities: s/ObjectProps/DeviceProps/g qemu_capabilities: Separate out device props fetching qemu_monitor: Introduce qemuMonitorGetObjectProps qemu_capabilities: Introduce QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD qemu: Enable memory-backend-file.discard-data whenever possible src/qemu/qemu_capabilities.c | 267 +++++---- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 7 + src/qemu/qemu_monitor.c | 13 + src/qemu/qemu_monitor.h | 3 + src/qemu/qemu_monitor_json.c | 62 ++- src/qemu/qemu_monitor_json.h | 4 + .../qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 20 +- tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 2 +- .../caps_2.10.0.aarch64.replies | 30 +- tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_2.10.0.ppc64.replies | 28 +- tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.10.0.s390x.replies | 32 +- tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 2 +- .../caps_2.10.0.x86_64.replies | 540 +++++++++--------- tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.11.0.s390x.replies | 26 +- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 2 +- .../caps_2.12.0.aarch64.replies | 24 +- tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 22 +- tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 24 +- .../caps_2.12.0.x86_64.replies | 612 +++++++++++---------- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 20 +- tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 22 +- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 2 +- .../caps_2.6.0.aarch64.replies | 30 +- tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_2.6.0.ppc64.replies | 28 +- tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 22 +- tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.7.0.s390x.replies | 28 +- tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 22 +- tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.8.0.s390x.replies | 32 +- tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 22 +- tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.ppc64.replies | 28 +- tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.s390x.replies | 32 +- tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 536 +++++++++--------- tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 2 +- 50 files changed, 1452 insertions(+), 1128 deletions(-) -- 2.16.1

4 9

[libvirt] [PATCH 0/6] qemu: Add support for 'write-cache' disk frontend argument (blockdev-add saga)
by Peter Krempa 17 Apr '18

17 Apr '18

'write-cache' is one of the booleans the 'cache' attribute of -drive translates to. Since we are getting rid of -drive this needs to be implemented in a different way. Peter Krempa (6): tests: utils: Allow parsing test capability file without virCaps tests: qemuxm2argv: Add infrastructure for testing with real qemuCaps qemu: domain: Add helper for translating disk cachemode to qemu flags qemu: caps: Add capability for 'write-cache' parameter of disk frontends qemu: Format 'write-cache' parameter for disk frontends tests: qemuxml2argv: Test formatting of 'write-cache' parameter src/qemu/qemu_capabilities.c | 5 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 27 ++++++++ src/qemu/qemu_domain.c | 75 ++++++++++++++++++++++ src/qemu/qemu_domain.h | 6 ++ tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + tests/qemuxml2argvdata/disk-drive-write-cache.args | 45 +++++++++++++ tests/qemuxml2argvdata/disk-drive-write-cache.xml | 45 +++++++++++++ tests/qemuxml2argvtest.c | 32 +++++++++ tests/testutilsqemu.c | 21 ++++-- tests/testutilsqemu.h | 3 + 26 files changed, 270 insertions(+), 6 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-drive-write-cache.args create mode 100644 tests/qemuxml2argvdata/disk-drive-write-cache.xml -- 2.16.2

3 24

[libvirt] [jenkins-ci PATCH] guests: Force use of nodebug kernel on Rawhide
by Andrea Bolognani 17 Apr '18

17 Apr '18

The nodebug kernel provides much better performance than the standard Rawhide kernel, so we want to use it; however, it can sometimes lag behind a bit, which might cause it to be replaced with the regular one when performing a system update. To work around the issue, perform the update in two steps: first with all repositories enabled but excluding the kernel packages, then only the kernel packages but with all repositories except fedora-rawhide-kernel-nodebug disabled. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/tasks/base.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/guests/tasks/base.yml b/guests/tasks/base.yml index 616db0a..70d5abc 100644 --- a/guests/tasks/base.yml +++ b/guests/tasks/base.yml @@ -104,6 +104,24 @@ state: latest when: - package_format == 'rpm' + - not ( os_name == 'Fedora' and + os_version == 'Rawhide' ) + +- name: Update installed packages + command: dnf update --refresh --exclude 'kernel*' -y + args: + warn: no + when: + - os_name == 'Fedora' + - os_version == 'Rawhide' + +- name: Update installed packages + command: dnf update --disablerepo='*' --enablerepo=fedora-rawhide-kernel-nodebug 'kernel*' -y + args: + warn: no + when: + - os_name == 'Fedora' + - os_version == 'Rawhide' - name: Update installed packages apt: -- 2.14.3

2 1

[libvirt] [PATCH] tests: remove double space
by Ján Tomko 17 Apr '18

17 Apr '18

Commit 70255fa5 introduced a double space before the newline-escaping backslash and broke syntax check. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Pushed as a trivial build-breaker fix. tests/qemuxml2argvtest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 43f07efc1..509fe776e 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -668,7 +668,7 @@ mymain(void) testCompareXMLToArgv, &info) < 0) \ ret = -1; \ if (virTestRun("QEMU XML-2-startup-XML " name, \ - testCompareXMLToStartupXML, &info) < 0) \ + testCompareXMLToStartupXML, &info) < 0) \ ret = -1; \ virObjectUnref(info.qemuCaps); \ virObjectUnref(info.vm); \ -- 2.16.1

3 2

[libvirt] [libvirt PATCH v2 00/4] Require QEMU 1.5.0
by Ján Tomko 17 Apr '18

17 Apr '18

v2: * Change the version from 1.3.0 to 1.5.0 * Mention this breaks RHEL 6 QEMU and list the versions in relevant long-term releases Some of the patches are very big, available in my repo: https://repo.or.cz/libvirt/jtomko.git/shortlog/refs/heads/caps_cleanup_v2 git fetch git://repo.or.cz/libvirt/jtomko.git caps_cleanup_v2: Ján Tomko (44): qemuxml2argvtest: Fix q35-virt-manager capabilities Delete bogus cpu-host-passthrough test Force QMP capability probing Require QEMU 1.5.0 The following patches are nearly identical to v1: * rebased on the 1.3.1 and 1.4.2 caps deletion * luks-disks-source-qcow2.args is fixed Deprecate QEMU_CAPS_PCI_MULTIFUNCTION Deprecate QEMU_CAPS_NETDEV Clean up qemuDomainAttachNetDevice Remove unused qemuDomainNetVLAN Remove qemuDomainSupportsNetdev Deprecate QEMU_CAPS_MONITOR_JSON Deprecate QEMU_CAPS_NO_USER_CONFIG Deprecate QEMU_CAPS_MEM_PATH Deprecate QEMU_CAPS_DRIVE_SERIAL Deprecate QEMU_CAPS_SDL Deprecate QEMU_CAPS_RTC Deprecate QEMU_CAPS_RTC_TD_HACK Deprecate QEMU_CAPS_VHOST_NET Deprecate QEMU_CAPS_NODEFCONFIG Deprecate QEMU_CAPS_BOOT_MENU Deprecate QEMU_CAPS_FSDEV Deprecate QEMU_CAPS_NAME_PROCESS Deprecate QEMU_CAPS_SMBIOS_TYPE Deprecate QEMU_CAPS_VGA_NONE Deprecate QEMU_CAPS_DRIVE_AIO Deprecate QEMU_CAPS_CHARDEV_SPICEVMC Deprecate QEMU_CAPS_DEVICE_SPICEVMC Deprecate QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC Deprecate QEMU_CAPS_NO_SHUTDOWN Deprecate QEMU_CAPS_DRIVE_CACHE_UNSAFE Deprecate QEMU_CAPS_FSDEV_READONLY Deprecate QEMU_CAPS_DRIVE_COPY_ON_READ Deprecate QEMU_CAPS_FSDEV_WRITEOUT Deprecate QEMU_CAPS_DRIVE_IOTUNE Deprecate QEMU_CAPS_WAKEUP Deprecate QEMU_CAPS_NETDEV_BRIDGE Deprecate QEMU_CAPS_SECCOMP_SANDBOX Deprecate QEMU_CAPS_DTB Deprecate QEMU_CAPS_IPV6_MIGRATION Deprecate QEMU_CAPS_MACHINE_OPT Deprecate QEMU_CAPS_DUMP_GUEST_CORE Deprecate QEMU_CAPS_VNC_SHARE_POLICY Deprecate QEMU_CAPS_HOST_PCI_MULTIDOMAIN Deprecate QEMU_CAPS_DISPLAY Deprecate QEMU_CAPS_MACHINE_USB_OPT cfg.mk | 2 +- src/qemu/qemu_capabilities.c | 936 +-------- src/qemu/qemu_capabilities.h | 74 +- src/qemu/qemu_capspriv.h | 17 +- src/qemu/qemu_command.c | 690 ++---- src/qemu/qemu_domain.c | 16 - src/qemu/qemu_domain.h | 6 - src/qemu/qemu_driver.c | 48 +- src/qemu/qemu_hotplug.c | 147 +- src/qemu/qemu_interface.c | 4 +- src/qemu/qemu_interface.h | 1 - src/qemu/qemu_migration.c | 10 +- src/qemu/qemu_process.c | 23 +- tests/Makefile.am | 8 +- .../qemucapabilitiesdata/caps_1.2.2.x86_64.replies | 1886 ----------------- tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml | 172 -- .../qemucapabilitiesdata/caps_1.3.1.x86_64.replies | 2141 ------------------- tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 196 -- .../qemucapabilitiesdata/caps_1.4.2.x86_64.replies | 2191 -------------------- tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 198 -- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 35 - tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 35 - tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 35 - tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 35 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 35 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 35 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 35 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 35 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 35 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 35 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 35 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 35 - tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 35 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 35 - tests/qemucapabilitiestest.c | 3 - tests/qemucapsprobe.c | 2 +- tests/qemuhelpdata/qemu-0.12.1 | 198 -- tests/qemuhelpdata/qemu-0.12.1-device | 62 - tests/qemuhelpdata/qemu-1.0 | 253 --- tests/qemuhelpdata/qemu-1.0-device | 148 -- tests/qemuhelpdata/qemu-1.1.0 | 269 --- tests/qemuhelpdata/qemu-1.1.0-device | 170 -- tests/qemuhelpdata/qemu-1.2.0 | 272 --- tests/qemuhelpdata/qemu-kvm-0.12.3 | 215 -- tests/qemuhelpdata/qemu-kvm-0.12.3-device | 63 - tests/qemuhelpdata/qemu-kvm-0.13.0 | 242 --- tests/qemuhelpdata/qemu-kvm-0.13.0-device | 90 - tests/qemuhelpdata/qemu-kvm-1.2.0 | 277 --- tests/qemuhelptest.c | 437 ---- .../aarch64-aavmf-virtio-mmio.args | 14 +- tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 9 +- [... lots of .args files ...] tests/qemuxml2argvdata/watchdog.args | 9 +- tests/qemuxml2argvdata/x86-kvm-32-on-64.args | 9 +- tests/qemuxml2argvtest.c | 744 +++---- tests/qemuxml2xmltest.c | 119 +- 670 files changed, 4582 insertions(+), 14981 deletions(-) delete mode 100644 tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml delete mode 100644 tests/qemuhelpdata/qemu-0.12.1 delete mode 100644 tests/qemuhelpdata/qemu-0.12.1-device delete mode 100644 tests/qemuhelpdata/qemu-1.0 delete mode 100644 tests/qemuhelpdata/qemu-1.0-device delete mode 100644 tests/qemuhelpdata/qemu-1.1.0 delete mode 100644 tests/qemuhelpdata/qemu-1.1.0-device delete mode 100644 tests/qemuhelpdata/qemu-1.2.0 delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.12.3 delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.12.3-device delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.13.0 delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.13.0-device delete mode 100644 tests/qemuhelpdata/qemu-kvm-1.2.0 delete mode 100644 tests/qemuhelptest.c delete mode 100644 tests/qemuxml2argvdata/channel-spicevmc-old.args delete mode 100644 tests/qemuxml2argvdata/channel-spicevmc-old.xml -- 2.16.1

4 102

[libvirt] [PATCH] tests: mock qemuInterfaceOpenVhostNet
by Ján Tomko 17 Apr '18

17 Apr '18

This functions contains logic that tries to use vhost for virtio interfaces, even if <driver name='vhost'/> was not supplied. In this case, a failure is non-fatal. On my system, /dev/vhost-net was not accessible to the user running 'make check', but we should not depend on that. Mock it to prevent accessing /dev/vhost-net and return some predictable file descriptor numbers instead. Introduced by commit c1f684e - deprecate QEMU_CAPS_VHOST_NET. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> Reported-by: Jiří Denemark <jdenemar(a)redhat.com> --- tests/qemuxml2argvdata/user-aliases.args | 2 +- tests/qemuxml2argvmock.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/tests/qemuxml2argvdata/user-aliases.args b/tests/qemuxml2argvdata/user-aliases.args index d887d53fa..774c599b5 100644 --- a/tests/qemuxml2argvdata/user-aliases.args +++ b/tests/qemuxml2argvdata/user-aliases.args @@ -51,7 +51,7 @@ id=ua-myEncryptedDisk1 \ if=none,id=drive-ua-WhatAnAwesomeCDROM,media=cdrom,readonly=on,cache=none \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ua-WhatAnAwesomeCDROM,\ id=ua-WhatAnAwesomeCDROM \ --netdev tap,fd=3,id=hostua-CheckoutThisNIC \ +-netdev tap,fd=3,id=hostua-CheckoutThisNIC,vhost=on,vhostfd=44 \ -device virtio-net-pci,netdev=hostua-CheckoutThisNIC,id=ua-CheckoutThisNIC,\ mac=52:54:00:d6:c0:0b,bus=pci.0,addr=0x3 \ -netdev socket,listen=127.0.0.1:1234,id=hostua-WeCanAlsoDoServerMode \ diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c index 177b24e0a..adab5c911 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -36,6 +36,7 @@ #include "virstring.h" #include "virtpm.h" #include "virutil.h" +#include "qemu/qemu_interface.h" #include <time.h> #include <unistd.h> @@ -188,3 +189,21 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path ATTRIBUTE_UNUSED, { return VIR_STRDUP(*ifname, "vhost-user0"); } + +int +qemuInterfaceOpenVhostNet(virDomainDefPtr def ATTRIBUTE_UNUSED, + virDomainNetDefPtr net, + int *vhostfd, + size_t *vhostfdSize) +{ + size_t i; + + if (!(net->model && STREQ(net->model, "virtio"))) { + *vhostfdSize = 0; + return 0; + } + + for (i = 0; i < *vhostfdSize; i++) + vhostfd[i] = STDERR_FILENO + 42 + i; + return 0; +} -- 2.16.1

2 1

[libvirt] [PATCH] tests: Don't touch /dev/vhost-net in qemuxml2argvtest
by Martin Kletzander 17 Apr '18

17 Apr '18

The code is trying to open /dev/vhost-net from the host machine and if the current user has access to it, the command line will end up having two more options for an interface (,vhost=on,vhostfd=X where X is next free file descriptor). Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- tests/qemuxml2argvmock.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c index 177b24e0a953..11626e2794c1 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -20,6 +20,10 @@ #include <config.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> + #include "internal.h" #include "viralloc.h" #include "vircommand.h" @@ -188,3 +192,35 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path ATTRIBUTE_UNUSED, { return VIR_STRDUP(*ifname, "vhost-user0"); } + +static int (*real_open)(const char *path, int flags, ...); + +static void init_syms(void) +{ + if (real_open) + return; + + VIR_MOCK_REAL_INIT(open); +} + +int open(const char *path, int flags, ...) +{ + va_list ap; + mode_t mode = 0; + + init_syms(); + + if (STREQ(path, "/dev/vhost-net")) + return -1; + + /* The mode argument is mandatory when O_CREAT is set in flags, + * otherwise the argument is ignored. + */ + if (flags & O_CREAT) { + va_start(ap, flags); + mode = (mode_t) va_arg(ap, int); + va_end(ap); + } + + return real_open(path, flags, mode); +} -- 2.17.0

3 4

[libvirt] [PATCH] tests: Fix up test numbering in qemuxml2argvtest
by Martin Kletzander 17 Apr '18

17 Apr '18

Due to conditional execution of virTestRun(), the testCounter was incremented only if all the cases were run. When using VIR_TEST_RANGE=x-y, first x/2 of the increments were skipped and that made figuring out a precise case a PITA. Moving the condition into the test function makes it way nicer to find out the test numbers to use in VIR_TEST_RANGE. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- tests/qemuxml2argvtest.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 7f1855782442..51adaabe1cc3 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -410,6 +410,9 @@ testCompareXMLToStartupXML(const void *data) char *actual = NULL; int ret = -1; + if (!info->vm) + return EXIT_AM_SKIP; + if (virAsprintf(&xml, "%s/qemuxml2startupxmloutdata/%s.xml", abs_srcdir, info->name) < 0) goto cleanup; @@ -664,8 +667,8 @@ mymain(void) if (virTestRun("QEMU XML-2-ARGV " name, \ testCompareXMLToArgv, &info) < 0) \ ret = -1; \ - if (info.vm && virTestRun("QEMU XML-2-startup-XML " name, \ - testCompareXMLToStartupXML, &info) < 0) \ + if (virTestRun("QEMU XML-2-startup-XML " name, \ + testCompareXMLToStartupXML, &info) < 0) \ ret = -1; \ virObjectUnref(info.qemuCaps); \ virObjectUnref(info.vm); \ -- 2.17.0

2 1