- Devel - libvirt List Archives

[libvirt] [PATCH 00/12] Drop KVM assignment
by Michal Privoznik 23 Aug '19

23 Aug '19

The KVM style of PCI assignment is not used, and it hasn't been for a while. Any attempt to start a domain with it would result in error as kernel dropped its support in 4.12.0 (after being deprecated for 1.5 years). Michal Prívozník (12): qemu: Drop KVM assignment tests: Remove 'kvm' PCI backend from domaincapstest virhostdev: Unify virDomainHostdevDef to virPCIDevice translation qemu: Drop unused qemuOpenPCIConfig() virhostdev: Disable legacy kvm assignment virpci: Drop 'pci-stub' driver virpci: Remove unused virPCIDeviceWaitForCleanup virpci: Drop newid style of PCI device detach virpcimock: Don't create "pci-stub" driver virpcimock: Don't create new_id or remove_id files virpcimock: Drop @driverActions enum news: Document KVM assignment removal docs/news.xml | 13 + src/libvirt_private.syms | 1 - src/qemu/qemu_capabilities.c | 6 - src/qemu/qemu_command.c | 48 +-- src/qemu/qemu_command.h | 3 - src/qemu/qemu_driver.c | 14 +- src/qemu/qemu_hostdev.c | 44 +- src/qemu/qemu_hostdev.h | 1 - src/qemu/qemu_hotplug.c | 20 +- src/util/virhostdev.c | 97 +++-- src/util/virpci.c | 403 +----------------- src/util/virpci.h | 2 - .../qemu_1.7.0.x86_64.xml | 1 - .../qemu_2.12.0-virt.aarch64.xml | 1 - .../qemu_2.12.0.ppc64.xml | 1 - .../qemu_2.12.0.s390x.xml | 1 - .../qemu_2.12.0.x86_64.xml | 1 - .../qemu_2.6.0-virt.aarch64.xml | 1 - .../qemu_2.6.0.aarch64.xml | 1 - .../domaincapsschemadata/qemu_2.6.0.ppc64.xml | 1 - .../qemu_2.6.0.x86_64.xml | 1 - .../domaincapsschemadata/qemu_2.7.0.s390x.xml | 1 - .../qemu_2.8.0-tcg.x86_64.xml | 1 - .../domaincapsschemadata/qemu_2.8.0.s390x.xml | 1 - .../qemu_2.8.0.x86_64.xml | 1 - .../qemu_2.9.0-q35.x86_64.xml | 1 - .../qemu_2.9.0-tcg.x86_64.xml | 1 - .../qemu_2.9.0.x86_64.xml | 1 - .../domaincapsschemadata/qemu_3.0.0.s390x.xml | 1 - .../qemu_3.1.0.x86_64.xml | 1 - .../domaincapsschemadata/qemu_4.0.0.s390x.xml | 1 - .../qemu_4.0.0.x86_64.xml | 1 - .../qemu_4.1.0.x86_64.xml | 1 - tests/domaincapstest.c | 4 +- tests/virpcimock.c | 137 +----- 35 files changed, 92 insertions(+), 722 deletions(-) -- 2.21.0

3 41

[libvirt] [PATCH] mdev: point user to mdevctl for missing devices
by Jonathon Jongsma 22 Aug '19

22 Aug '19

When a host is rebooted, any mediated devices that were previously configured will disappear. There have been requests for libvirt to handle persisting these mediated devices across reboots, but the decision was made that this should be handled at a lower level. mdevctl is a new tool that handles registration and persistence of mediated devices. If desired, mdevctl can automatically start these mediated devices when the parent device becomes available. Since mdevctl is the recommended solution for handling persistent mediated devices, point users there when they encounter an error for a missing mediated device. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- NOTE: - previous patch which attempted to start missing devices using mdevctl has been withdrawn. src/util/virmdev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/util/virmdev.c b/src/util/virmdev.c index 3d5488cdae..df02fc8d28 100644 --- a/src/util/virmdev.c +++ b/src/util/virmdev.c @@ -149,7 +149,9 @@ virMediatedDeviceNew(const char *uuidstr, virMediatedDeviceModelType model) if (!virFileExists(sysfspath)) { virReportError(VIR_ERR_DEVICE_MISSING, - _("mediated device '%s' not found"), uuidstr); + _("mediated device '%s' not found. " + "Persistent devices can be managed with 'mdevctl'."), + uuidstr); return NULL; } -- 2.21.0

2 2

[libvirt] [PATCH v2 0/2] security: Deal with stale XATTRs
by Michal Privoznik 22 Aug '19

22 Aug '19

v2 of: https://www.redhat.com/archives/libvir-list/2019-August/msg00520.html diff to v1: - use virOnce to obtain host boot time - switched to configure time check of getutxid - dropped host's UUID from timestamp Michal Prívozník (2): util: Introduce virhostuptime security_util: Remove stale XATTRs configure.ac | 1 + src/libvirt_private.syms | 4 + src/security/security_util.c | 196 +++++++++++++++++++++++++++++++- src/util/Makefile.inc.am | 2 + src/util/virhostuptime.c | 81 +++++++++++++ src/util/virhostuptime.h | 27 +++++ tests/qemusecuritymock.c | 12 ++ tools/libvirt_recover_xattrs.sh | 2 +- 8 files changed, 323 insertions(+), 2 deletions(-) create mode 100644 src/util/virhostuptime.c create mode 100644 src/util/virhostuptime.h -- 2.21.0

2 6

[libvirt] [PATCH] security: Don't increase XATTRs refcounter on failure
by Michal Privoznik 22 Aug '19

22 Aug '19

If user has two domains, each have the same disk (configured for RW) but each runs with different seclabel then we deny start of the second domain because in order to do that we would need to relabel the disk but that would cut the first domain off. Even if we did not do that, qemu would fail to start because it would be unable to lock the disk image for the second time. So far, this behaviour is expected. But what is not expected is that we increase the refcounter in XATTRs and leave it like that. What happens is that when the second domain starts, virSecuritySetRememberedLabel() is called, and since there are XATTRs from the first domain it increments the refcounter and returns it (refcounter == 2 at this point). Then callers (virSecurityDACSetOwnership() and virSecuritySELinuxSetFileconHelper()) realize that refcounter is greater than 1 and desired seclabel doesn't match the one the disk image already has and an error is produced. But the refcounter is never decremented. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1740024 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/security/security_dac.c | 19 ++++++++++++++----- src/security/security_selinux.c | 17 +++++++++++------ 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 137daf5d28..b0070f7390 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -754,6 +754,8 @@ virSecurityDACSetOwnership(virSecurityManagerPtr mgr, struct stat sb; int refcount; int rc; + bool rollback = false; + int ret = -1; if (!path && src && src->path && virStorageSourceIsLocalStorage(src)) @@ -780,16 +782,18 @@ virSecurityDACSetOwnership(virSecurityManagerPtr mgr, } else if (refcount < 0) { return -1; } else if (refcount > 1) { + rollback = true; /* Refcount is greater than 1 which means that there * is @refcount domains using the @path. Do not * change the label (as it would almost certainly * cause the other domains to lose access to the - * @path). */ + * @path). However, the refcounter was incremented in + * XATTRs so decrease it. */ if (sb.st_uid != uid || sb.st_gid != gid) { virReportError(VIR_ERR_OPERATION_INVALID, _("Setting different DAC user or group on %s " "which is already in use"), path); - return -1; + goto cleanup; } } } @@ -797,7 +801,13 @@ virSecurityDACSetOwnership(virSecurityManagerPtr mgr, VIR_INFO("Setting DAC user and group on '%s' to '%ld:%ld'", NULLSTR(src ? src->path : path), (long)uid, (long)gid); - if (virSecurityDACSetOwnershipInternal(priv, src, path, uid, gid) < 0) { + if (virSecurityDACSetOwnershipInternal(priv, src, path, uid, gid) < 0) + goto cleanup; + + ret = 0; + + cleanup: + if (ret < 0 && rollback) { virErrorPtr origerr; virErrorPreserveLast(&origerr); @@ -812,10 +822,9 @@ virSecurityDACSetOwnership(virSecurityManagerPtr mgr, NULLSTR(src ? src->path : path)); virErrorRestore(&origerr); - return -1; } - return 0; + return ret; } diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index ea20373a90..0c6ace75fa 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -1334,6 +1334,7 @@ virSecuritySELinuxSetFileconHelper(virSecurityManagerPtr mgr, security_context_t econ = NULL; int refcount; int rc; + bool rollback = false; int ret = -1; if ((rc = virSecuritySELinuxTransactionAppend(path, tcon, @@ -1358,11 +1359,13 @@ virSecuritySELinuxSetFileconHelper(virSecurityManagerPtr mgr, } else if (refcount < 0) { goto cleanup; } else if (refcount > 1) { + rollback = true; /* Refcount is greater than 1 which means that there * is @refcount domains using the @path. Do not * change the label (as it would almost certainly * cause the other domains to lose access to the - * @path). */ + * @path). However, the refcounter was + * incremented in XATTRs so decrease it. */ if (STRNEQ(econ, tcon)) { virReportError(VIR_ERR_OPERATION_INVALID, _("Setting different SELinux label on %s " @@ -1373,7 +1376,12 @@ virSecuritySELinuxSetFileconHelper(virSecurityManagerPtr mgr, } } - if (virSecuritySELinuxSetFileconImpl(path, tcon, optional, privileged) < 0) { + if (virSecuritySELinuxSetFileconImpl(path, tcon, optional, privileged) < 0) + goto cleanup; + + ret = 0; + cleanup: + if (ret < 0 && rollback) { virErrorPtr origerr; virErrorPreserveLast(&origerr); @@ -1388,11 +1396,8 @@ virSecuritySELinuxSetFileconHelper(virSecurityManagerPtr mgr, path); virErrorRestore(&origerr); - goto cleanup; - } - ret = 0; - cleanup: + } freecon(econ); return ret; } -- 2.21.0

2 1

[libvirt] [PATCH v10 00/10] incremental backup
by Eric Blake 22 Aug '19

22 Aug '19

This is not the final version of incremental backup - before we can accept this series, it needs a lot of polish to pick up cleanups made possible by Peter's blockdev work, and we need to settle on our Job API addition (so that the return value of BackupBegin and the parameter to BackupGetXMLDesc and BackupEnd use the same representation, whether that be UUID or something else). I also know that Peter left quite a few comments against v9, many of which I have not actually attempted to address yet. But it rebases things on top of the checkpoint work that landed in the 5.6 release, and is still able to perform the pull-mode incremental backups that I demonstrated at KVM Forum 2018. There's still probably crashes in portions of the code that are not exercised by my demo, and I know that we really want to use qemu's blockdev image creation instead of calling out to qemu-img create for preparing the qcow2 scratch image in pull mode. The main point of this posting is to allow further testing before the actual feature lands in an upstream libvirt release. I've pushed a tag backup-v10 to both my libvirt.git and libvirt-python.git repos to match: https://repo.or.cz/libvirt/ericb.git/shortlog/refs/tags/backup-v10 https://repo.or.cz/libvirt-python/ericb.git/shortlog/refs/tags/backup-v10 001/10:[0033] [FC] 'backup: qemu: Implement VIR_DOMAIN_CHECKPOINT_XML_SIZE flag' 002/10:[0002] [FC] 'backup: Document new XML for backups' 003/10:[0010] [FC] 'backup: Introduce virDomainBackup APIs' 004/10:[0031] [FC] 'backup: Implement backup APIs for remote driver' 005/10:[----] [--] 'backup: Parse and output backup XML' 006/10:[----] [--] 'backup: Implement virsh support for backup' 007/10:[0025] [FC] 'backup: qemu: Implement framework for backup job APIs' 008/10:[0002] [FC] 'backup: Wire up qemu full pull backup commands over QMP' 009/10:[----] [--] 'backup: qemu: Wire up qemu full push backup commands over QMP' 010/10:[0017] [FC] 'backup: Implement qemu incremental pull backup' Eric Blake (10): backup: qemu: Implement VIR_DOMAIN_CHECKPOINT_XML_SIZE flag backup: Document new XML for backups backup: Introduce virDomainBackup APIs backup: Implement backup APIs for remote driver backup: Parse and output backup XML backup: Implement virsh support for backup backup: qemu: Implement framework for backup job APIs backup: Wire up qemu full pull backup commands over QMP backup: qemu: Wire up qemu full push backup commands over QMP backup: Implement qemu incremental pull backup include/libvirt/libvirt-domain.h | 41 +- src/conf/backup_conf.h | 94 +++ src/conf/virconftypes.h | 3 + src/driver-hypervisor.h | 14 + src/qemu/qemu_blockjob.h | 1 + src/qemu/qemu_domain.h | 4 + src/qemu/qemu_monitor.h | 4 + src/qemu/qemu_monitor_json.h | 4 + docs/docs.html.in | 3 +- docs/format.html.in | 1 + docs/formatbackup.html.in | 184 +++++ docs/formatcheckpoint.html.in | 12 +- docs/index.html.in | 3 +- docs/schemas/domainbackup.rng | 219 ++++++ examples/c/misc/event-test.c | 3 + libvirt.spec.in | 1 + mingw-libvirt.spec.in | 2 + src/conf/Makefile.inc.am | 2 + src/conf/backup_conf.c | 546 +++++++++++++++ src/conf/domain_conf.c | 2 +- src/libvirt-domain-checkpoint.c | 7 +- src/libvirt-domain.c | 219 ++++++ src/libvirt_private.syms | 8 +- src/libvirt_public.syms | 7 + src/qemu/qemu_blockjob.c | 3 + src/qemu/qemu_domain.c | 35 +- src/qemu/qemu_driver.c | 684 ++++++++++++++++++- src/qemu/qemu_monitor.c | 11 + src/qemu/qemu_monitor_json.c | 84 +++ src/qemu/qemu_process.c | 8 + src/remote/remote_driver.c | 3 + src/remote/remote_protocol.x | 54 +- src/remote_protocol-structs | 28 + tests/Makefile.am | 2 + tests/domainbackupxml2xmlin/backup-pull.xml | 9 + tests/domainbackupxml2xmlin/backup-push.xml | 9 + tests/domainbackupxml2xmlin/empty.xml | 1 + tests/domainbackupxml2xmlout/backup-pull.xml | 9 + tests/domainbackupxml2xmlout/backup-push.xml | 9 + tests/domainbackupxml2xmlout/empty.xml | 7 + tests/virschematest.c | 2 + tools/virsh-domain.c | 253 ++++++- tools/virsh.pod | 49 ++ 43 files changed, 2623 insertions(+), 21 deletions(-) create mode 100644 src/conf/backup_conf.h create mode 100644 docs/formatbackup.html.in create mode 100644 docs/schemas/domainbackup.rng create mode 100644 src/conf/backup_conf.c create mode 100644 tests/domainbackupxml2xmlin/backup-pull.xml create mode 100644 tests/domainbackupxml2xmlin/backup-push.xml create mode 100644 tests/domainbackupxml2xmlin/empty.xml create mode 100644 tests/domainbackupxml2xmlout/backup-pull.xml create mode 100644 tests/domainbackupxml2xmlout/backup-push.xml create mode 100644 tests/domainbackupxml2xmlout/empty.xml -- 2.21.0

1 10

[libvirt] [PATCH 00/11] Fix 10 tests on macOS
by Roman Bolshakov 21 Aug '19

21 Aug '19

Hi! This patch series attempts to reduce the number of failing tests on macOS. The fixes involve some funk with macOS dynamic and static linkers, dyld and ld64, respectively. As result, instead of 15 failing tests we get only 5. The tests have been fixed: qemublocktest qemumonitorjsontest viriscsitest virmacmaptest virnetserverclienttest vircryptotest qemufirmwaretest domaincapstest commandtest sockettest The tests are still failing: qemumemlocktest storagepoolxml2argvtest qemuxml2xmltest qemusecuritytest qemuxml2argvtest qemucapsprobe doesn't yet works but I started working on the fix. The failing tests depend on virpcimock that is guarded by ifdefs so no functions are injected and the mock is no-op on macOS. How can we fix the tests that rely on the mock? Should we select only specific tests to run on macOS or we should make virpci mock cross-platform? Skipping them entirely is not an option IMO as I think qemu driver can be used on macOS with qemu/hvf/haxm domains and the tests are helpful for the domains. And as soon as we get working tests and qemucapsprobe I'd want to resend hvf patchset. Best regards, Roman Roman Bolshakov (11): tests: Don't test octal localhost IP in sockettest on macOS tests: Avoid IPv4-translated IPv6 address in sockettest tests: Preload mocks with DYLD_INSERT_LIBRARIES on macOS tests: Add lib- prefix to all mocks tests: Remove -module flag for mocks tests: Drop /private CWD prefix in commandhelper build: Use flat namespace for libvirt on macOS tests: Lookup extended stat/lstat in mocks tests: Use flat namespace on macOS tests: Avoid gnulib replacements in mocks tests: Make references to global symbols indirect in test drivers configure.ac | 1 + src/Makefile.am | 9 +- tests/Makefile.am | 199 +++++++++++++++++---------------- tests/bhyveargv2xmltest.c | 2 +- tests/bhyvexml2argvtest.c | 2 +- tests/bhyvexml2xmltest.c | 2 +- tests/commandhelper.c | 9 ++ tests/domaincapstest.c | 6 +- tests/fchosttest.c | 2 +- tests/libxlxml2domconfigtest.c | 2 +- tests/nsstest.c | 2 +- tests/qemucaps2xmltest.c | 2 +- tests/qemucapsprobe.c | 2 +- tests/qemumemlocktest.c | 3 +- tests/qemumonitorjsontest.c | 2 +- tests/qemuxml2argvtest.c | 8 +- tests/qemuxml2xmltest.c | 6 +- tests/sockettest.c | 6 +- tests/testutils.c | 4 +- tests/testutils.h | 18 ++- tests/vircaps2xmltest.c | 2 +- tests/vircgrouptest.c | 2 +- tests/vircryptotest.c | 2 +- tests/virfilecachetest.c | 2 +- tests/virfiletest.c | 2 +- tests/virfilewrapper.c | 5 + tests/virfirewalltest.c | 2 +- tests/virhostcputest.c | 2 +- tests/virhostdevtest.c | 2 +- tests/viriscsitest.c | 3 +- tests/virmacmaptest.c | 2 +- tests/virmock.h | 10 ++ tests/virmockstathelpers.c | 18 +++ tests/virnetdaemontest.c | 2 +- tests/virnetdevbandwidthtest.c | 2 +- tests/virnetdevtest.c | 2 +- tests/virnetserverclienttest.c | 2 +- tests/virnettlscontexttest.c | 2 +- tests/virnettlssessiontest.c | 2 +- tests/virpcitest.c | 2 +- tests/virpolkittest.c | 2 +- tests/virportallocatortest.c | 2 +- tests/virsystemdtest.c | 2 +- tests/virusbtest.c | 2 +- 44 files changed, 214 insertions(+), 149 deletions(-) -- 2.22.0

2 24

[libvirt] [PATCH 00/10] ci: Several fixes and improvements
by Andrea Bolognani 21 Aug '19

21 Aug '19

See the individual commits for details, but the gist of it is that after this series it's possible for users to hook into the build process and customize it according to their needs; on top of that, the whole thing is made more maintainable in the process. Andrea Bolognani (10): ci: Fix /etc/sub{u,g}id parsing ci: Drop $(CI_SUBMODULES) ci: Move everything to a separate directory ci: Create user's home directory in the container ci: Move source directory under $(CI_USER_HOME) ci: Introduce $(CI_BUILD_SCRIPT) ci: Generalize running commands inside the container ci: Introduce $(CI_PREPARE_SCRIPT) ci: Run $(CI_PREPARE_SCRIPT) as root ci: Stop using --workdir .gitignore | 2 +- .travis.yml | 8 +-- Makefile.am | 6 +- Makefile.ci => ci/Makefile | 109 +++++++++++++++++++------------------ ci/build.sh | 40 ++++++++++++++ ci/prepare.sh | 13 +++++ 6 files changed, 118 insertions(+), 60 deletions(-) rename Makefile.ci => ci/Makefile (79%) create mode 100644 ci/build.sh create mode 100644 ci/prepare.sh -- 2.21.0

2 12

[libvirt] [PATCH v2 0/9] More consistent virDomainUndefine flag handling
by Eric Blake 21 Aug '19

21 Aug '19

Since v1: - use syntax-check rather than dynamic runtime check for API mismatch - fix more stragglers with mismatched API, found by the syntax-check - fix a bug in bhyve no-op flag handling - expand no-op flag handling to other affected drivers Eric Blake (9): vbox: Add various vir*Flags API xenapi: Add various vir*Flags API maint: Enhance check-driverimpls.pl to check for API pairing bhyve: Ignore no-op flag during virDomainUndefine libxl: Ignore no-op flag during virDomainUndefine lxc: Ignore no-op flag during virDomainUndefine openvz: Ignore no-op flag during virDomainUndefine vmware: Ignore no-op flag during virDomainUndefine xenapi: Ignore no-op flag during virDomainUndefine src/bhyve/bhyve_driver.c | 6 +++++- src/check-driverimpls.pl | 33 +++++++++++++++++++++++++++++++-- src/libxl/libxl_driver.c | 4 +++- src/lxc/lxc_driver.c | 5 ++++- src/openvz/openvz_driver.c | 5 ++++- src/vbox/vbox_common.c | 24 ++++++++++++++++++++++-- src/vmware/vmware_driver.c | 5 ++++- src/xenapi/xenapi_driver.c | 28 ++++++++++++++++++++++++---- 8 files changed, 97 insertions(+), 13 deletions(-) -- 2.20.1

2 23

[libvirt] [PATCH 0/5] security: Deal with stale XATTRs
by Michal Privoznik 21 Aug '19

21 Aug '19

There are some ways users can end up in stale XATTRs. One is sudden power loss, the other is stopping libvirt whilst some domains are running and then rebooting the host. And I believe users will find other creative ways to shut down domains without qemuProcessStop() being called. When that happens our XATTRs will be left behind and not reflect the real state of things (e.g. refcounter). To resolve this, record a timestamp within XATTRs too so that host reboots can be detected. Michal Prívozník (5): virUUIDFormat: s/VIR_UUID_RAW_LEN/VIR_UUID_BUFLEN/ in comment security_util: Use more VIR_AUTOFREE() security_util: Document virSecurityMoveRememberedLabel util: Introduce virhostuptime security_util: Remove stale XATTRs src/libvirt_private.syms | 4 + src/security/security_util.c | 293 +++++++++++++++++++++++++++++------ src/util/Makefile.inc.am | 2 + src/util/virhostuptime.c | 61 ++++++++ src/util/virhostuptime.h | 27 ++++ src/util/viruuid.c | 2 +- tests/qemusecuritymock.c | 12 ++ 7 files changed, 353 insertions(+), 48 deletions(-) create mode 100644 src/util/virhostuptime.c create mode 100644 src/util/virhostuptime.h -- 2.21.0

3 11

[libvirt] [PATCH] virt-aa-helper: Drop unnecessary AppArmor rule
by Andrea Bolognani 21 Aug '19

21 Aug '19

Apparently /proc/self is automatically converted to /proc/@{pid} before checking rules, which makes spelling it out explicitly redundant. Suggested-by: Jamie Strandboge <jamie(a)canonical.com> Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/security/apparmor/usr.lib.libvirt.virt-aa-helper | 1 - 1 file changed, 1 deletion(-) diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper b/src/security/apparmor/usr.lib.libvirt.virt-aa-helper index 64772f0756..11e9c039ca 100644 --- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper +++ b/src/security/apparmor/usr.lib.libvirt.virt-aa-helper @@ -18,7 +18,6 @@ profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper { @{PROC}/filesystems r, # Used when internally running another command (namely apparmor_parser) - @{PROC}/self/fd/ r, @{PROC}/@{pid}/fd/ r, /etc/libnl-3/classid r, -- 2.21.0

2 1

[libvirt] [PATCH v3 0/2] snapshot: Store both config and live XML in the snapshot domain
by Maxiwell S. Garcia 21 Aug '19

21 Aug '19

This patchset store both config and live XML in the snapshot XML. To avoid nest 'config' XML one level deeper ('inactive/domain'), it was necessary change the virDomainDefFormatInternal() to use 'domain' or 'inactiveDomain' in the root node. Maxiwell S. Garcia (2): qemu: formatting XML from domain def choosing the root name snapshot: Store both config and live XML in the snapshot domain src/conf/domain_conf.c | 13 ++++++++++--- src/conf/domain_conf.h | 1 + src/conf/moment_conf.c | 1 + src/conf/moment_conf.h | 11 +++++++++++ src/conf/snapshot_conf.c | 23 +++++++++++++++++++++-- src/qemu/qemu_driver.c | 37 ++++++++++++++++++++++++++++--------- 6 files changed, 72 insertions(+), 14 deletions(-) -- 2.20.1

3 5

[libvirt] [PATCH] virDomainGetAutostart takes a pointer that it writes the output value to
by Sage Imel 21 Aug '19

21 Aug '19

The current version of get_autostart seg faults. This patch correctly passes a pointer to an int to virDomainGetAutostart and returns a result based on the value of that int Signed-off-by: sage Imel <sage(a)cat.pdx.edu> --- src/domain.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/domain.rs b/src/domain.rs index 11ecb3c..acb9e6e 100644 --- a/src/domain.rs +++ b/src/domain.rs @@ -136,7 +136,7 @@ extern "C" { fn virDomainGetHostname(ptr: sys::virDomainPtr, flags: libc::c_uint) -> *mut libc::c_char; fn virDomainGetUUIDString(ptr: sys::virDomainPtr, uuid: *mut libc::c_char) -> libc::c_int; fn virDomainGetXMLDesc(ptr: sys::virDomainPtr, flags: libc::c_uint) -> *mut libc::c_char; - fn virDomainGetAutostart(ptr: sys::virDomainPtr) -> libc::c_int; + fn virDomainGetAutostart(ptr: sys::virDomainPtr, autostart: *mut libc::c_int) -> libc::c_int; fn virDomainSetAutostart(ptr: sys::virDomainPtr, autostart: libc::c_uint) -> libc::c_int; fn virDomainGetID(ptr: sys::virDomainPtr) -> libc::c_uint; fn virDomainSetMaxMemory(ptr: sys::virDomainPtr, memory: libc::c_ulong) -> libc::c_int; @@ -1036,11 +1036,12 @@ impl Domain { pub fn get_autostart(&self) -> Result<bool, Error> { unsafe { - let ret = virDomainGetAutostart(self.as_ptr()); + let mut autostart: libc::c_int = 0; + let ret = virDomainGetAutostart(self.as_ptr(), &mut autostart); if ret == -1 { return Err(Error::new()); } - return Ok(ret == 1); + return Ok(autostart == 1); } } -- 2.17.1

2 3

[libvirt] [PATCH] virDomainGetAutostart takes a pointer that it writes the output value to
by Sage Imel 21 Aug '19

21 Aug '19

--- src/domain.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/domain.rs b/src/domain.rs index 11ecb3c..acb9e6e 100644 --- a/src/domain.rs +++ b/src/domain.rs @@ -136,7 +136,7 @@ extern "C" { fn virDomainGetHostname(ptr: sys::virDomainPtr, flags: libc::c_uint) -> *mut libc::c_char; fn virDomainGetUUIDString(ptr: sys::virDomainPtr, uuid: *mut libc::c_char) -> libc::c_int; fn virDomainGetXMLDesc(ptr: sys::virDomainPtr, flags: libc::c_uint) -> *mut libc::c_char; - fn virDomainGetAutostart(ptr: sys::virDomainPtr) -> libc::c_int; + fn virDomainGetAutostart(ptr: sys::virDomainPtr, autostart: *mut libc::c_int) -> libc::c_int; fn virDomainSetAutostart(ptr: sys::virDomainPtr, autostart: libc::c_uint) -> libc::c_int; fn virDomainGetID(ptr: sys::virDomainPtr) -> libc::c_uint; fn virDomainSetMaxMemory(ptr: sys::virDomainPtr, memory: libc::c_ulong) -> libc::c_int; @@ -1036,11 +1036,12 @@ impl Domain { pub fn get_autostart(&self) -> Result<bool, Error> { unsafe { - let ret = virDomainGetAutostart(self.as_ptr()); + let mut autostart: libc::c_int = 0; + let ret = virDomainGetAutostart(self.as_ptr(), &mut autostart); if ret == -1 { return Err(Error::new()); } - return Ok(ret == 1); + return Ok(autostart == 1); } } -- 2.17.1

3 3

[libvirt] [PATCH] xml: namespaces: use uri instead of href
by Ján Tomko 21 Aug '19

21 Aug '19

Store the namespace URI as const char*, instead of in a function. Suggested-by: Jiri Denemark <jdenemar(a)redhat.com> Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/bhyve/bhyve_domain.c | 11 ++--------- src/lxc/lxc_domain.c | 9 +-------- src/network/bridge_driver.c | 11 +---------- src/qemu/qemu_domain.c | 10 +--------- src/storage/storage_backend_fs.c | 9 +-------- src/storage/storage_backend_rbd.c | 11 +---------- src/test/test_driver.c | 11 ++--------- src/util/virxml.c | 6 +++--- src/util/virxml.h | 2 +- src/vmx/vmx.c | 8 +------- 10 files changed, 14 insertions(+), 74 deletions(-) diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c index ea4bd54969..ed281d7c68 100644 --- a/src/bhyve/bhyve_domain.c +++ b/src/bhyve/bhyve_domain.c @@ -31,8 +31,6 @@ VIR_LOG_INIT("bhyve.bhyve_domain"); -#define BHYVE_NAMESPACE_HREF "http://libvirt.org/schemas/domain/bhyve/1.0" - static void * bhyveDomainObjPrivateAlloc(void *opaque ATTRIBUTE_UNUSED) { @@ -258,16 +256,11 @@ bhyveDomainDefNamespaceFormatXML(virBufferPtr buf, return 0; } -static const char * -bhyveDomainDefNamespaceHref(void) -{ - return BHYVE_NAMESPACE_HREF; -} - virXMLNamespace virBhyveDriverDomainXMLNamespace = { .parse = bhyveDomainDefNamespaceParse, .free = bhyveDomainDefNamespaceFree, .format = bhyveDomainDefNamespaceFormatXML, .prefix = "bhyve", - .href = bhyveDomainDefNamespaceHref, + .uri = "http://libvirt.org/schemas/domain/bhyve/1.0", + }; diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c index 00362e4c7f..c4360f25f6 100644 --- a/src/lxc/lxc_domain.c +++ b/src/lxc/lxc_domain.c @@ -34,7 +34,6 @@ #include "virinitctl.h" #define VIR_FROM_THIS VIR_FROM_LXC -#define LXC_NAMESPACE_HREF "http://libvirt.org/schemas/domain/lxc/1.0" VIR_ENUM_IMPL(virLXCDomainJob, LXC_JOB_LAST, @@ -302,19 +301,13 @@ lxcDomainDefNamespaceFormatXML(virBufferPtr buf, return 0; } -static const char * -lxcDomainDefNamespaceHref(void) -{ - return LXC_NAMESPACE_HREF; -} - virXMLNamespace virLXCDriverDomainXMLNamespace = { .parse = lxcDomainDefNamespaceParse, .free = lxcDomainDefNamespaceFree, .format = lxcDomainDefNamespaceFormatXML, .prefix = "lxc", - .href = lxcDomainDefNamespaceHref, + .uri = "http://libvirt.org/schemas/domain/lxc/1.0", }; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index dd4f111cc0..86e2035b85 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -83,8 +83,6 @@ VIR_LOG_INIT("network.bridge_driver"); -#define DNSMASQ_NAMESPACE_HREF "http://libvirt.org/schemas/network/dnsmasq/1.0" - static virNetworkDriverStatePtr network_driver; @@ -231,19 +229,12 @@ networkDnsmasqDefNamespaceFormatXML(virBufferPtr buf, } -static const char * -networkDnsmasqDefNamespaceHref(void) -{ - return DNSMASQ_NAMESPACE_HREF; -} - - virXMLNamespace networkDnsmasqXMLNamespace = { .parse = networkDnsmasqDefNamespaceParse, .free = networkDnsmasqDefNamespaceFree, .format = networkDnsmasqDefNamespaceFormatXML, .prefix = "dnsmasq", - .href = networkDnsmasqDefNamespaceHref, + .uri = "http://libvirt.org/schemas/network/dnsmasq/1.0", }; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 6d770d3c13..8a3755c6fe 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -81,8 +81,6 @@ VIR_LOG_INIT("qemu.qemu_domain"); -#define QEMU_NAMESPACE_HREF "http://libvirt.org/schemas/domain/qemu/1.0" - VIR_ENUM_IMPL(qemuDomainJob, QEMU_JOB_LAST, "none", @@ -3713,19 +3711,13 @@ qemuDomainDefNamespaceFormatXML(virBufferPtr buf, return 0; } -static const char * -qemuDomainDefNamespaceHref(void) -{ - return QEMU_NAMESPACE_HREF; -} - virXMLNamespace virQEMUDriverDomainXMLNamespace = { .parse = qemuDomainDefNamespaceParse, .free = qemuDomainDefNamespaceFree, .format = qemuDomainDefNamespaceFormatXML, .prefix = "qemu", - .href = qemuDomainDefNamespaceHref, + .uri = "http://libvirt.org/schemas/domain/qemu/1.0", }; diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index d947beac2c..d793ac19e8 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -528,7 +528,6 @@ virStorageBackendFileSystemBuild(virStoragePoolObjPtr pool, #if WITH_STORAGE_FS -# define STORAGE_POOL_FS_NAMESPACE_HREF "http://libvirt.org/schemas/storagepool/fs/1.0" /* Backend XML Namespace handling for fs or netfs specific mount options to * be added to the mount -o {options_list} command line that are not otherwise @@ -624,12 +623,6 @@ virStoragePoolDefFSNamespaceFormatXML(virBufferPtr buf, } -static const char * -virStoragePoolDefFSNamespaceHref(void) -{ - return STORAGE_POOL_FS_NAMESPACE_HREF; -} - #endif /* WITH_STORAGE_FS */ @@ -697,7 +690,7 @@ static virXMLNamespace virStoragePoolFSXMLNamespace = { .free = virStoragePoolDefFSNamespaceFree, .format = virStoragePoolDefFSNamespaceFormatXML, .prefix = "fs", - .href = virStoragePoolDefFSNamespaceHref, + .uri = "http://libvirt.org/schemas/storagepool/fs/1.0", }; #endif /* WITH_STORAGE_FS */ diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 22caa189d7..c4781debd8 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -58,8 +58,6 @@ struct _virStoragePoolRBDConfigOptionsDef { char **values; }; -#define STORAGE_POOL_RBD_NAMESPACE_HREF "http://libvirt.org/schemas/storagepool/rbd/1.0" - static void virStoragePoolDefRBDNamespaceFree(void *nsdata) { @@ -166,13 +164,6 @@ virStoragePoolDefRBDNamespaceFormatXML(virBufferPtr buf, } -static const char * -virStoragePoolDefRBDNamespaceHref(void) -{ - return STORAGE_POOL_RBD_NAMESPACE_HREF; -} - - static int virStorageBackendRBDRADOSConfSet(rados_t cluster, const char *option, @@ -1538,7 +1529,7 @@ static virXMLNamespace virStoragePoolRBDXMLNamespace = { .free = virStoragePoolDefRBDNamespaceFree, .format = virStoragePoolDefRBDNamespaceFormatXML, .prefix = "rbd", - .href = virStoragePoolDefRBDNamespaceHref, + .uri = "http://libvirt.org/schemas/storagepool/rbd/1.0", }; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 57d54c05b3..6a694d8b1f 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -167,8 +167,6 @@ testDriverDispose(void *obj) virObjectUnref(driver->eventState); } -#define TEST_NAMESPACE_HREF "http://libvirt.org/schemas/domain/test/1.0" - typedef struct _testDomainNamespaceDef testDomainNamespaceDef; typedef testDomainNamespaceDef *testDomainNamespaceDefPtr; struct _testDomainNamespaceDef { @@ -180,12 +178,6 @@ struct _testDomainNamespaceDef { xmlNodePtr *snap_nodes; }; -static const char* -testDomainDefNamespaceHref(void) -{ - return TEST_NAMESPACE_HREF; -} - static void testDomainDefNamespaceFree(void *data) { @@ -427,7 +419,8 @@ testDriverNew(void) .parse = testDomainDefNamespaceParse, .free = testDomainDefNamespaceFree, .prefix = "test", - .href = testDomainDefNamespaceHref, + .uri = "http://libvirt.org/schemas/domain/test/1.0", + }; virDomainDefParserConfig config = { .features = VIR_DOMAIN_DEF_FEATURE_MEMORY_HOTPLUG | diff --git a/src/util/virxml.c b/src/util/virxml.c index 84b824f432..f9c117dd58 100644 --- a/src/util/virxml.c +++ b/src/util/virxml.c @@ -1416,7 +1416,7 @@ void virXMLNamespaceFormatNS(virBufferPtr buf, virXMLNamespace const *ns) { - virBufferAsprintf(buf, " xmlns:%s='%s'", ns->prefix, ns->href()); + virBufferAsprintf(buf, " xmlns:%s='%s'", ns->prefix, ns->uri); } @@ -1426,10 +1426,10 @@ virXMLNamespaceRegister(xmlXPathContextPtr ctxt, { if (xmlXPathRegisterNs(ctxt, BAD_CAST ns->prefix, - BAD_CAST ns->href()) < 0) { + BAD_CAST ns->uri) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to register xml namespace '%s'"), - ns->href()); + ns->uri); return -1; } diff --git a/src/util/virxml.h b/src/util/virxml.h index be2abd23f7..30cc895436 100644 --- a/src/util/virxml.h +++ b/src/util/virxml.h @@ -257,7 +257,7 @@ struct _virXMLNamespace { virXMLNamespaceFree free; virXMLNamespaceFormat format; const char *prefix; - virXMLNamespaceHref href; + const char *uri; }; typedef struct _virXMLNamespace virXMLNamespace; typedef virXMLNamespace *virXMLNamespacePtr; diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index c4e90537f8..2cc0995783 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -597,18 +597,12 @@ virVMXDomainDefNamespaceFormatXML(virBufferPtr buf, void *nsdata) return 0; } -static const char * -virVMXDomainDefNamespaceHref(void) -{ - return "http://libvirt.org/schemas/domain/vmware/1.0"; -} - static virXMLNamespace virVMXDomainXMLNamespace = { .parse = NULL, .free = virVMXDomainDefNamespaceFree, .format = virVMXDomainDefNamespaceFormatXML, .prefix = "vmware", - .href = virVMXDomainDefNamespaceHref, + .uri = "http://libvirt.org/schemas/domain/vmware/1.0", }; virDomainXMLOptionPtr -- 2.19.2

2 1

[libvirt] [PATCH] virt-aa-helper: Actually fix AppArmor profile
by Andrea Bolognani 21 Aug '19

21 Aug '19

Tried previously in commit b1eb8b3e8fd1d4cb1da8e5e2b16f2c10837fd823 Author: Andrea Bolognani <abologna(a)redhat.com> Date: Mon Aug 19 10:23:42 2019 +0200 virt-aa-helper: Fix AppArmor profile v5.6.0-243-gb1eb8b3e8f with somewhat disappointing results. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/security/apparmor/usr.lib.libvirt.virt-aa-helper | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper b/src/security/apparmor/usr.lib.libvirt.virt-aa-helper index d81dddef30..64772f0756 100644 --- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper +++ b/src/security/apparmor/usr.lib.libvirt.virt-aa-helper @@ -18,8 +18,8 @@ profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper { @{PROC}/filesystems r, # Used when internally running another command (namely apparmor_parser) - @{PROC}/self/fd r, - @{PROC}/@{pid}/fd r, + @{PROC}/self/fd/ r, + @{PROC}/@{pid}/fd/ r, /etc/libnl-3/classid r, -- 2.21.0

3 3

[libvirt] [PATCH 00/21] conf: namespaces: remove some copy'n'paste
by Ján Tomko 21 Aug '19

21 Aug '19

Ján Tomko (21): virDomainDefNamespaceParse: remove unused attributes virDomainDefParseXML: remove unused parameter prepare: domain format if format not href conf: ns.parse: decouple call from condition util: introduce virXMLNamespace conf: network: use generic XML namespace types conf: storage: use generic XML namespace types conf: domain: use generic XML namespace types xml: virXMLNamespace: add prefix conf: network: store namespace prefix conf: domain: store namespace prefix conf: storage: store namespace prefix conf: test: store namespace href util: introduce virXMLNamespaceFormatNS conf: network: use virXMLNamespaceFormatNS conf: storage: use virXMLNamespaceFormatNS conf: domain: use virXMLNamespaceFormatNS util: xml: introduce virXMLNamespaceRegister conf: network: use virXMLNamespaceRegister conf: storage: use virXMLNamespaceRegister conf: domain: use virXMLNamespaceRegister src/bhyve/bhyve_domain.c | 18 ++++-------------- src/bhyve/bhyve_domain.h | 2 +- src/conf/capabilities.h | 13 ------------- src/conf/domain_conf.c | 24 +++++++++++++----------- src/conf/domain_conf.h | 6 +++--- src/conf/network_conf.c | 13 ++++++++----- src/conf/network_conf.h | 25 ++++--------------------- src/conf/storage_conf.c | 15 +++++++++------ src/conf/storage_conf.h | 23 ++++------------------- src/conf/virconftypes.h | 3 --- src/lxc/lxc_domain.c | 17 ++++------------- src/lxc/lxc_domain.h | 2 +- src/network/bridge_driver.c | 15 +++------------ src/network/bridge_driver.h | 2 +- src/qemu/qemu_domain.c | 17 ++++------------- src/qemu/qemu_domain.h | 2 +- src/storage/storage_backend_fs.c | 14 +++----------- src/storage/storage_backend_rbd.c | 14 +++----------- src/storage/storage_util.c | 2 +- src/storage/storage_util.h | 2 +- src/test/test_driver.c | 23 ++++++++++------------- src/util/virxml.c | 27 +++++++++++++++++++++++++++ src/util/virxml.h | 22 ++++++++++++++++++++++ src/vmx/vmx.c | 5 +++-- 24 files changed, 130 insertions(+), 176 deletions(-) -- 2.19.2

2 43

[libvirt] [PATCH] virpci:fix Secondary Bus Reset bug
by hexin900110＠163.com 20 Aug '19

20 Aug '19

From: hexin <hexin15(a)baidu.com> The parent bridge configuration of the current device should be read and reset, instead of reading the current device configuration. Signed-off-by: He Xin <hexin15(a)baidu.com> Signed-off-by: Liu Qi <liuqi16(a)baidu.com> Signed-off-by: Zhang Yu <zhangyu31(a)baidu.com> --- src/util/virpci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index 61a6b359e5..483de2cb16 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -821,7 +821,7 @@ virPCIDeviceTrySecondaryBusReset(virPCIDevicePtr dev, /* Read the control register, set the reset flag, wait 200ms, * unset the reset flag and wait 200ms. */ - ctl = virPCIDeviceRead16(dev, cfgfd, PCI_BRIDGE_CONTROL); + ctl = virPCIDeviceRead16(dev, parentfd, PCI_BRIDGE_CONTROL); virPCIDeviceWrite16(parent, parentfd, PCI_BRIDGE_CONTROL, ctl | PCI_BRIDGE_CTL_RESET); -- 2.22.0

5 5

[libvirt] [PATCH 0/2] cgroups v2 fixes
by Pavel Hrdina 20 Aug '19

20 Aug '19

*** BLURB HERE *** Pavel Hrdina (2): vircgroupv2: fix parsing multiple values in single file vircgroupv2: fix virCgroupV2GetCpuCfsQuota for "max" value src/util/vircgroupv2.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) -- 2.21.0

2 4

[libvirt] [ocaml PATCH 0/3] Misc improvements
by Pino Toscano 20 Aug '19

20 Aug '19

*** IMAGINE A BLURB HERE *** Pino Toscano (3): Synchronize Virterror with libvirt 5.6.0 Update config.guess and config.sub Fix shebang in perl scripts config.guess | 284 ++++++++++++++++++++++++++++------- config.sub | 69 +++++---- libvirt/generator.pl | 3 +- libvirt/libvirt.ml | 8 + libvirt/libvirt.mli | 4 + libvirt/libvirt_c_epilogue.c | 4 +- 6 files changed, 282 insertions(+), 90 deletions(-) -- 2.21.0

2 4

[libvirt] 5.6.0 regression: "Some activation file descriptors are unclaimed"
by Allen, John 20 Aug '19

20 Aug '19

After upgrading to v5.6.0, starting libvirtd fails with the following message in journalctl -xe: libvirtd[186338]: internal error: Some activation file descriptors are unclaimed 5b8569dd6e284b9159c701e8bffafb196983fc4a introduces the message. The commit message indicates that systemd version 227 is required, but my system seems to be running version 237. Is this a known issue? Is there any other configuration for systemd needed to avoid the problem? Thanks, John

2 5

[libvirt] [PATCH 0/2] libxl: suspend-related fixes
by Jim Fehlig 20 Aug '19

20 Aug '19

Commit d00c77ae introduced a regression in save and migration operations of persisent domains. E.g. after a successful migration the source host showes the migrated domain in state "pmsuspended" instead of "shut off". Fix it by reverting the commit and setting the state after a successful call to the underlying libxl API. Jim Fehlig (2): Revert "libxl: send lifecycle event on suspend" libxl: send lifecycle event on PMSuspend src/libxl/libxl_domain.c | 19 ++++++++----------- src/libxl/libxl_driver.c | 6 ++++++ 2 files changed, 14 insertions(+), 11 deletions(-) -- 2.22.0

2 4

[libvirt] [PATCH] conf: resctrl object is not properly handled
by Wang Huaqiang 20 Aug '19

20 Aug '19

resctrl object stored in def->resctrls is shared by cachetune and memorytune. The domain xml configuration is parsed firstly for cachetune then memorytune, and the resctrl object will not be created in parsing settings for memorytune once it found sharing exists. But resctrl is improperly freed when sharing happens. Signed-off-by: Wang Huaqiang <huaqiang.wang(a)intel.com> --- src/conf/domain_conf.c | 12 +++++------- tests/genericxml2xmlindata/memorytune.xml | 4 ++++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 617ccac..604e006 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -19590,7 +19590,6 @@ virDomainMemorytuneDefParse(virDomainDefPtr def, VIR_AUTOUNREF(virResctrlAllocPtr) alloc = NULL; ssize_t i = 0; int n; - int ret = -1; ctxt->node = node; @@ -19632,14 +19631,13 @@ virDomainMemorytuneDefParse(virDomainDefPtr def, if (!(resctrl = virDomainResctrlNew(node, alloc, vcpus, flags))) return -1; - if (VIR_APPEND_ELEMENT(def->resctrls, def->nresctrls, resctrl) < 0) - goto cleanup; + if (VIR_APPEND_ELEMENT(def->resctrls, def->nresctrls, resctrl) < 0) { + virDomainResctrlDefFree(resctrl); + return -1; + } } - ret = 0; - cleanup: - virDomainResctrlDefFree(resctrl); - return ret; + return 0; } diff --git a/tests/genericxml2xmlindata/memorytune.xml b/tests/genericxml2xmlindata/memorytune.xml index ea03e22..7486b54 100644 --- a/tests/genericxml2xmlindata/memorytune.xml +++ b/tests/genericxml2xmlindata/memorytune.xml @@ -5,6 +5,10 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>4</vcpu> <cputune> + <cachetune vcpus='0-1'> + <cache id='0' level='3' type='both' size='768' unit='KiB'/> + <cache id='1' level='3' type='both' size='768' unit='KiB'/> + </cachetune> <memorytune vcpus='0-1'> <node id='0' bandwidth='20'/> <node id='1' bandwidth='30'/> -- 2.7.4

3 2

[libvirt] [PATCH v2] tools: console: Relax stream EOF handling
by Roman Bolshakov 20 Aug '19

20 Aug '19

Regular VM shutdown triggers the error for existing session of virsh console and it returns with non-zero exit code: error: internal error: console stream EOF The message and status code are misleading because there's no real error. virStreamRecv returns 0 when the end of the stream is reached. In that case, virStreamFinish should be used to get confirmation of stream completion. virSteramAbort is used otherwise to terminate the stream early before an EOF. Fixes: 29f2b5248c6 ("tools: console: pass stream/fd errors to user") Signed-off-by: Roman Bolshakov <r.bolshakov(a)yadro.com> --- Changes since v1: - Added needAbort parameter to virConsoleShutdown to specify if finish or abort is needed - Use it (needAbort = false) to finish stream after EOF from virStreamRecv - Print internal error if virStreamFinish or virStreamAbort do not succeed tools/virsh-console.c | 44 ++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/tools/virsh-console.c b/tools/virsh-console.c index e16f841e57..ad514a99a7 100644 --- a/tools/virsh-console.c +++ b/tools/virsh-console.c @@ -97,7 +97,7 @@ virConsoleHandleSignal(int sig ATTRIBUTE_UNUSED) static void -virConsoleShutdown(virConsolePtr con) +virConsoleShutdown(virConsolePtr con, bool needAbort) { virErrorPtr err = virGetLastError(); @@ -105,8 +105,15 @@ virConsoleShutdown(virConsolePtr con) virCopyLastError(&con->error); if (con->st) { + int termError; virStreamEventRemoveCallback(con->st); - virStreamAbort(con->st); + if (needAbort) + termError = virStreamAbort(con->st); + else + termError = virStreamFinish(con->st); + if (termError < 0) + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("cannot terminate console stream")); virStreamFree(con->st); con->st = NULL; } @@ -158,7 +165,7 @@ virConsoleEventOnStream(virStreamPtr st, if (avail < 1024) { if (VIR_REALLOC_N(con->streamToTerminal.data, con->streamToTerminal.length + 1024) < 0) { - virConsoleShutdown(con); + virConsoleShutdown(con, true); goto cleanup; } con->streamToTerminal.length += 1024; @@ -172,11 +179,10 @@ virConsoleEventOnStream(virStreamPtr st, if (got == -2) goto cleanup; /* blocking */ if (got <= 0) { + bool needAbort = true; if (got == 0) - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("console stream EOF")); - - virConsoleShutdown(con); + needAbort = false; + virConsoleShutdown(con, needAbort); goto cleanup; } con->streamToTerminal.offset += got; @@ -195,7 +201,7 @@ virConsoleEventOnStream(virStreamPtr st, if (done == -2) goto cleanup; /* blocking */ if (done < 0) { - virConsoleShutdown(con); + virConsoleShutdown(con, true); goto cleanup; } memmove(con->terminalToStream.data, @@ -216,7 +222,7 @@ virConsoleEventOnStream(virStreamPtr st, if (events & VIR_STREAM_EVENT_ERROR || events & VIR_STREAM_EVENT_HANGUP) { - virConsoleShutdown(con); + virConsoleShutdown(con, true); } cleanup: @@ -246,7 +252,7 @@ virConsoleEventOnStdin(int watch ATTRIBUTE_UNUSED, if (avail < 1024) { if (VIR_REALLOC_N(con->terminalToStream.data, con->terminalToStream.length + 1024) < 0) { - virConsoleShutdown(con); + virConsoleShutdown(con, true); goto cleanup; } con->terminalToStream.length += 1024; @@ -260,17 +266,17 @@ virConsoleEventOnStdin(int watch ATTRIBUTE_UNUSED, if (got < 0) { if (errno != EAGAIN) { virReportSystemError(errno, "%s", _("cannot read from stdin")); - virConsoleShutdown(con); + virConsoleShutdown(con, true); } goto cleanup; } if (got == 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("EOF on stdin")); - virConsoleShutdown(con); + virConsoleShutdown(con, true); goto cleanup; } if (con->terminalToStream.data[con->terminalToStream.offset] == con->escapeChar) { - virConsoleShutdown(con); + virConsoleShutdown(con, true); goto cleanup; } @@ -283,13 +289,13 @@ virConsoleEventOnStdin(int watch ATTRIBUTE_UNUSED, if (events & VIR_EVENT_HANDLE_ERROR) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("IO error on stdin")); - virConsoleShutdown(con); + virConsoleShutdown(con, true); goto cleanup; } if (events & VIR_EVENT_HANDLE_HANGUP) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("EOF on stdin")); - virConsoleShutdown(con); + virConsoleShutdown(con, true); goto cleanup; } @@ -322,7 +328,7 @@ virConsoleEventOnStdout(int watch ATTRIBUTE_UNUSED, if (done < 0) { if (errno != EAGAIN) { virReportSystemError(errno, "%s", _("cannot write to stdout")); - virConsoleShutdown(con); + virConsoleShutdown(con, true); } goto cleanup; } @@ -344,13 +350,13 @@ virConsoleEventOnStdout(int watch ATTRIBUTE_UNUSED, if (events & VIR_EVENT_HANDLE_ERROR) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("IO error stdout")); - virConsoleShutdown(con); + virConsoleShutdown(con, true); goto cleanup; } if (events & VIR_EVENT_HANDLE_HANGUP) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("EOF on stdout")); - virConsoleShutdown(con); + virConsoleShutdown(con, true); goto cleanup; } @@ -489,7 +495,7 @@ virshRunConsole(vshControl *ctl, ret = 0; cleanup: - virConsoleShutdown(con); + virConsoleShutdown(con, true); if (ret < 0) { vshResetLibvirtError(); -- 2.22.0

3 3

[libvirt] [PATCH] ci: Adapt to container name changes
by Andrea Bolognani 20 Aug '19

20 Aug '19

Since libvirt-dockerfile's commit 7130ffe0a0e9, the containers used for CI builds have been renamed from buildenv-* to buildenv-libvirt-* in order to make it possible for projects other than libvirt to be supported, so we need to update our Makefile.ci scaffolding accordingly. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- This is connected to https://www.redhat.com/archives/libvir-list/2019-August/msg00399.html https://www.redhat.com/archives/libvir-list/2019-August/msg00416.html and should only be merged once the above have been merged *and* deployed, as in, images with the new names have been generated. Makefile.ci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.ci b/Makefile.ci index 8857c953b2..dddd438a98 100644 --- a/Makefile.ci +++ b/Makefile.ci @@ -49,7 +49,7 @@ CI_SUBMODULES = $(shell git submodule | awk '{ print $$2 }') # Location of the container images we're going to pull # Can be useful to overridde to use a locally built # image instead -CI_IMAGE_PREFIX = quay.io/libvirt/buildenv- +CI_IMAGE_PREFIX = quay.io/libvirt/buildenv-libvirt- # The default tag is ':latest' but if the container # repo above uses different conventions this can override it -- 2.21.0

2 7

[libvirt] [PATCH] tests: fix #ifdef indentation from previous commit
by Daniel P. Berrangé 20 Aug '19

20 Aug '19

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed under the brown paper bag rule :-( tests/virpcimock.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/virpcimock.c b/tests/virpcimock.c index e9a3791aea..c0dcd377d5 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -32,9 +32,9 @@ static int (*real_access)(const char *path, int mode); static int (*real_open)(const char *path, int flags, ...); -#ifdef __GLIBC__ +# ifdef __GLIBC__ static int (*real___open_2)(const char *path, int flags); -#endif /* ! __GLIBC__ */ +# endif /* ! __GLIBC__ */ static int (*real_close)(int fd); static DIR * (*real_opendir)(const char *name); static char *(*real_virFileCanonicalizePath)(const char *path); @@ -957,9 +957,9 @@ init_syms(void) VIR_MOCK_REAL_INIT(access); VIR_MOCK_REAL_INIT(open); -#ifdef __GLIBC__ +# ifdef __GLIBC__ VIR_MOCK_REAL_INIT(__open_2); -#endif /* ! __GLIBC__ */ +# endif /* ! __GLIBC__ */ VIR_MOCK_REAL_INIT(close); VIR_MOCK_REAL_INIT(opendir); VIR_MOCK_REAL_INIT(virFileCanonicalizePath); @@ -1088,7 +1088,7 @@ open(const char *path, int flags, ...) } -#ifdef __GLIBC__ +# ifdef __GLIBC__ /* in some cases this function may not be present in headers, so we need * a declaration to silence the complier */ int @@ -1118,7 +1118,7 @@ __open_2(const char *path, int flags) return ret; } -#endif /* ! __GLIBC__ */ +# endif /* ! __GLIBC__ */ DIR * opendir(const char *path) -- 2.21.0

1 0

[libvirt] [PATCH] tests: don't try to mock __open_2 on non-GLibc builds
by Daniel P. Berrangé 20 Aug '19

20 Aug '19

Mocking of the __open_2 function was added in commit 459f071cacf30af9df93b7d090b1bda71b0ef20f Author: Michal Privoznik <mprivozn(a)redhat.com> Date: Thu Aug 15 16:37:17 2019 +0200 virpcimock: Mock __open_2() This function only exists in glibc, however, and the mocking code runs on systems not using glibc, such as FreeBSD. Even Linux hosts might be using a different libc impl, though we don't actively try to support that. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a CI build fix for FreeBSD tests/virpcimock.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/virpcimock.c b/tests/virpcimock.c index ca6cc060fd..e9a3791aea 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -32,7 +32,9 @@ static int (*real_access)(const char *path, int mode); static int (*real_open)(const char *path, int flags, ...); +#ifdef __GLIBC__ static int (*real___open_2)(const char *path, int flags); +#endif /* ! __GLIBC__ */ static int (*real_close)(int fd); static DIR * (*real_opendir)(const char *name); static char *(*real_virFileCanonicalizePath)(const char *path); @@ -955,7 +957,9 @@ init_syms(void) VIR_MOCK_REAL_INIT(access); VIR_MOCK_REAL_INIT(open); +#ifdef __GLIBC__ VIR_MOCK_REAL_INIT(__open_2); +#endif /* ! __GLIBC__ */ VIR_MOCK_REAL_INIT(close); VIR_MOCK_REAL_INIT(opendir); VIR_MOCK_REAL_INIT(virFileCanonicalizePath); @@ -1084,6 +1088,7 @@ open(const char *path, int flags, ...) } +#ifdef __GLIBC__ /* in some cases this function may not be present in headers, so we need * a declaration to silence the complier */ int @@ -1113,7 +1118,7 @@ __open_2(const char *path, int flags) return ret; } - +#endif /* ! __GLIBC__ */ DIR * opendir(const char *path) -- 2.21.0

1 0

[libvirt] [PATCHv2 00/11] util/resctrl cleanups and refactors
by Wang Huaqiang 20 Aug '19

20 Aug '19

Patches submitted for purpose of refactoring existing 'resctrl' related source code, including some code cleanups as well as some fixes. This is also a preparation for memory bandwidth monitor codes. Plan to support Resctrl Control Monitors, which is a feature introduced by kernel 'resctrl' sub-model. Submit some cleanup and refactoring patches for upcoming memory bandwidth resource monitoring (MBM) monitors. Related MBM RFC is https://www.redhat.com/archives/libvir-list/2019-April/msg01409.html. This RFC is not actively discussed since libvirt already implemented similar resctrl cache monitoring (CMT), and lots details have been discussed and implemented during the work of CMT. The cleanups and refactoring includes: v2 changes: 1. Addressed comments of v1. 2. Introduce a new algorithm for verifying new monitor vcpus and existing monitors and allocations. 3. Fixes for creating default-allocation-monitor in 'resctrl' file system.(patch 0001). v1 changes: 1. Removing some reluctant lines and white spaces that is existing in current code and not meet the libvirt coding style. 2. Replace 'virResctrlAllocIsEmpty' with @n==0 for indicating no resctrl allocation in configuration file. 3. Private API changes, removed 'virResctrlMonitorGetCacheOccupancy' and exported a new API named 'virResctrlMonitorGetStats' with similar functionality, but with capability to be used for retrieving MBM statistical information. 4. Refactoring 'virResctrlMonitorFreeStats' for more reusing in code. 5. Extend data structure 'virResctrlMonitorStats' with the capability to carry multiple statistical information from monitor. Wang Huaqiang (11): util,conf: Handle default monitor group of an allocation properly conf: code cleanup, remove empty line and one space conf: code cleanup for return error code directly conf: some code cleanup conf: refactor 'virDomainResctrlVcpuMatch' and some code cleanup conf: Append 'resctrl' object according to number of monitor group directly util: Refactor and rename 'virResctrlMonitorFreeStats' util: Refactor 'virResctrlMonitorStats' util: Extend virresctl API to retrieve multiple monitor statistics util: Remove unused virResctrlMonitorGetCacheOccupancy conf: Refactor and rename the function to validate a new resctrl monitor src/conf/domain_conf.c | 145 ++++++++++++++++++++++++----------------------- src/libvirt_private.syms | 5 +- src/qemu/qemu_driver.c | 41 ++++++++++---- src/qemu/qemu_process.c | 3 +- src/util/virresctrl.c | 75 ++++++++++-------------- src/util/virresctrl.h | 23 +++++--- 6 files changed, 156 insertions(+), 136 deletions(-) -- 2.7.4

5 19

[libvirt] [jenkins-ci PATCH] guests: remove obsolete install of intltool
by Daniel P. Berrangé 20 Aug '19

20 Aug '19

libvirt-glib, libvirt-sandbox and virt-viewer have all ditched usage of intltool, so this no longer needs to be installed. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- guests/vars/projects/libvirt-glib.yml | 1 - guests/vars/projects/libvirt-sandbox.yml | 1 - guests/vars/projects/virt-viewer.yml | 1 - 3 files changed, 3 deletions(-) diff --git a/guests/vars/projects/libvirt-glib.yml b/guests/vars/projects/libvirt-glib.yml index 13a5128..baa5b6a 100644 --- a/guests/vars/projects/libvirt-glib.yml +++ b/guests/vars/projects/libvirt-glib.yml @@ -3,6 +3,5 @@ packages: - glib2 - gobject-introspection - gtk-doc - - intltool - libxml2 - vala diff --git a/guests/vars/projects/libvirt-sandbox.yml b/guests/vars/projects/libvirt-sandbox.yml index 46b903f..f444333 100644 --- a/guests/vars/projects/libvirt-sandbox.yml +++ b/guests/vars/projects/libvirt-sandbox.yml @@ -4,7 +4,6 @@ packages: - glibc-static - gobject-introspection - gtk-doc - - intltool - libcap-ng - libselinux - libxml2 diff --git a/guests/vars/projects/virt-viewer.yml b/guests/vars/projects/virt-viewer.yml index cd32176..c03d50b 100644 --- a/guests/vars/projects/virt-viewer.yml +++ b/guests/vars/projects/virt-viewer.yml @@ -3,7 +3,6 @@ packages: - glib2 - gtk-vnc2 - gtk3 - - intltool - libgovirt - libxml2 - spice-gtk3 -- 2.21.0

3 2

Re: [libvirt] [Libvirt-ci] Build failed in Jenkins: virt-manager-check » libvirt-fedora-30 #1020
by Cole Robinson 20 Aug '19

20 Aug '19

On 8/19/19 3:44 PM, ci(a)centos.org wrote: > See <https://ci.centos.org/job/virt-manager-check/systems=libvirt-fedora-30/1020…> > > ------------------------------------------ > Started by upstream project "virt-manager-check" build number 1020 > originally caused by: > Started by upstream project "virt-manager-build" build number 1024 > originally caused by: > Started by an SCM change > Running as SYSTEM > [EnvInject] - Loading node environment variables. > Building remotely on libvirt-fedora-30 (libvirt) in workspace <https://ci.centos.org/job/virt-manager-check/systems=libvirt-fedora-30/ws/> > [virt-manager] $ /bin/sh -xe /tmp/jenkins5817546305801793439.sh > + /usr/bin/python3 ./setup.py test > running test New XML building in virt-install is triggering a crash in libvirt: https://www.redhat.com/archives/libvir-list/2019-August/msg00757.html - Cole

1 0

[libvirt] [PATCH] ci: Comment tweaks in Makefile.ci
by Eric Blake 20 Aug '19

20 Aug '19

Fix some typos and grammar (calling something safer and error-prone is odd, and 'ther eneeds' is an obvious typo), and reflow some long lines. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Makefile.ci | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/Makefile.ci b/Makefile.ci index 8857c953b2..df2195ea72 100644 --- a/Makefile.ci +++ b/Makefile.ci @@ -86,7 +86,7 @@ endif # is liable to mess with SELinux labelling which will # then prevent the host accessing them. And podman cannot # relabel the files due to it running rootless. So -# copying them first is safer and error-prone. +# copying them first is safer and less error-prone. CI_PWDB_MOUNTS = \ --volume $(CI_SCRATCHDIR)/group:/etc/group:ro,z \ --volume $(CI_SCRATCHDIR)/passwd:/etc/passwd:ro,z \ @@ -98,22 +98,26 @@ CI_PWDB_MOUNTS = \ CI_ULIMIT_FILES = 1024 ifeq ($(CI_ENGINE),podman) - # Podman cannot reuse host namespace when running non-root containers. Until - # support for --keep-uid is added we can just create another mapping that will - # do that for us. Beware, that in {uid,git}map=container_id:host_id:range, - # the host_id does actually refer to the uid in the first mapping where 0 - # (root) is mapped to the current user and rest is offset. - - # In order to set up this mapping, we need to keep all the user IDs to prevent - # possible errors as some images might expect UIDs up to 90000 (looking at you - # fedora), so we don't want the overflowuid to be used for them. For mapping - # all the other users properly ther eneeds to be some math done. Don't worry, - # it's just addition and subtraction. - - # 65536 ought to be enough (tm), but for really rare cases the maximums might - # need to be higher, but that only happens when your /etc/sub{u,g}id allow - # users to have more IDs. Unless --keep-uid is supported, let's do this in a - # way that should work for everyone. + # Podman cannot reuse host namespace when running non-root + # containers. Until support for --keep-uid is added we can + # just create another mapping that will do that for us. + # Beware, that in {uid,git}map=container_id:host_id:range, the + # host_id does actually refer to the uid in the first mapping + # where 0 (root) is mapped to the current user and rest is + # offset. + # + # In order to set up this mapping, we need to keep all the + # user IDs to prevent possible errors as some images might + # expect UIDs up to 90000 (looking at you fedora), so we don't + # want the overflowuid to be used for them. For mapping all + # the other users properly, some math needs to be done. + # Don't worry, it's just addition and subtraction. + # + # 65536 ought to be enough (tm), but for really rare cases the + # maximums might need to be higher, but that only happens when + # your /etc/sub{u,g}id allow users to have more IDs. Unless + # --keep-uid is supported, let's do this in a way that should + # work for everyone. CI_MAX_UID = $(shell sed -n "s/^$USER:[^:]\+://p" /etc/subuid) CI_MAX_GID = $(shell sed -n "s/^$USER:[^:]\+://p" /etc/subgid) ifeq ($(CI_MAX_UID),) -- 2.20.1

1 1

[libvirt] [PATCH 1/1] qemuxml2xmltest.c: mock /etc/qemu/firmware path
by Daniel Henrique Barboza 20 Aug '19

20 Aug '19

Since commit 'b66ca0220a' the 'tpm-emulator' tests in qemuxml2xmltest started to fail unless 'make check' is either executed as root or with an user with access to /etc/qemu/firmware file. This is the error that happens in a regular 'make check' run with an unprivileged user: ------ 546) QEMU XML-2-XML-inactive tpm-emulator ... 1315 In '/home/danielhb/kvm-project/libvirt/tests/qemuxml2xmloutdata/tpm-emulator.xml': 1316 Offset 909 1317 Expect [1.2] 1318 Actual [default] 1319 ... Expected result code=0 but received code=4libvirt: error : cannot open directory '/home/danielhb/kvm-pr oject/libvirt/usr/etc/qemu/firmware': Permission denied 1320 FAILED 1321 547) QEMU XML-2-XML-active tpm-emulator ... 1322 In '/home/danielhb/kvm-project/libvirt/tests/qemuxml2xmloutdata/tpm-emulator.xml': 1323 Offset 909 1324 Expect [1.2] 1325 Actual [default] 1326 ... Expected result code=0 but received code=4libvirt: error : cannot open directory '/home/danielhb/kvm-pr oject/libvirt/usr/etc/qemu/firmware': Permission denied 1327 FAILED ------ The reason is that commit b66ca0220a changed the domain validation to fetch the capabilities in qemuDomainDeviceDefValidate time, directly impacting existing tpm-emulator tests in qemuxml2xmltest.c that that since then will attempt to read the /etc/qemu/firmware file that wasn't being mocked. This patch fixes it by adding the mock paths for /etc/qemu/firmware in qemuxml2xmltest.c as well, using the virFileWrapper API like it is done in commit 5b9819eedc71. Fixes: b66ca0220a ("qemu: domain: Call virDomainCapsDeviceDefValidate") Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com> --- tests/Makefile.am | 3 ++- tests/qemuxml2xmltest.c | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 1c92e3ca6f..31a22ebefd 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -573,7 +573,8 @@ qemuxml2argvmock_la_LIBADD = $(MOCKLIBS_LIBS) qemuxml2xmltest_SOURCES = \ qemuxml2xmltest.c testutilsqemu.c testutilsqemu.h \ - testutils.c testutils.h + testutils.c testutils.h \ + virfilewrapper.c virfilewrapper.h qemuxml2xmltest_LDADD = $(qemu_LDADDS) qemumonitorjsontest_SOURCES = \ diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 525eb9a740..51be6e0263 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -14,6 +14,9 @@ # include "qemu/qemu_domain.h" # include "testutilsqemu.h" # include "virstring.h" +# include "virfilewrapper.h" +# include "testutils.h" +# include "configmake.h" # define VIR_FROM_THIS VIR_FROM_NONE @@ -167,6 +170,15 @@ mymain(void) setenv("LIBVIRT_FAKE_ROOT_DIR", fakerootdir, 1); + /* Required for tpm-emulator tests + */ + virFileWrapperAddPrefix(SYSCONFDIR "/qemu/firmware", + abs_srcdir "/qemufirmwaredata/etc/qemu/firmware"); + virFileWrapperAddPrefix(PREFIX "/share/qemu/firmware", + abs_srcdir "/qemufirmwaredata/usr/share/qemu/firmware"); + virFileWrapperAddPrefix("/home/user/.config/qemu/firmware", + abs_srcdir "/qemufirmwaredata/home/user/.config/qemu/firmware"); + if (qemuTestDriverInit(&driver) < 0) return EXIT_FAILURE; @@ -1325,6 +1337,7 @@ mymain(void) virHashFree(capslatest); qemuTestDriverFree(&driver); VIR_FREE(fakerootdir); + virFileWrapperClearPrefixes(); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 2.21.0

3 3

[libvirt] [PATCH] src: Don't check lxc_monitor_protocol-struct when LXC is disabled
by Michal Privoznik 19 Aug '19

19 Aug '19

If LXC is disabled at build time then there is no libvirt_driver_lxc_impl_la-*.lo to run the 'check-protocol' against. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Makefile.am b/src/Makefile.am index 3ae4b87abb..817a7ecf34 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -318,9 +318,11 @@ $(srcdir)/remote_protocol-struct \ $(srcdir)/virnetprotocol-struct $(srcdir)/virkeepaliveprotocol-struct: \ $(srcdir)/%-struct: rpc/libvirt_net_rpc_la-%.lo $(PDWTAGS) +if WITH_LXC $(srcdir)/lxc_monitor_protocol-struct: \ $(srcdir)/%-struct: lxc/libvirt_driver_lxc_impl_la-%.lo $(PDWTAGS) +endif WITH_LXC $(srcdir)/lock_protocol-struct: \ $(srcdir)/%-struct: locking/lockd_la-%.lo $(PDWTAGS) -- 2.21.0

2 1

[libvirt] [PATCH] qemu: alias: Generate 'qomName' of disk with useraliases
by Peter Krempa 19 Aug '19

19 Aug '19

Commit fb64e176f4f forgot to delete the check that short-circuits the disk alias creation if the alias is already present. The side efect of this is that the creation qomName which is necessary to be able to refer to disk frontends when -blockdev is used was skipped when user aliases are used. Fix it by deleting the check. Also prevent any potential memory leaks from calling this function repeatedly by creating the qomName only when it's not present. https://bugzilla.redhat.com/show_bug.cgi?id=1741838 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_alias.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index 585cc972ba..216a18d0d9 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -182,9 +182,6 @@ qemuAssignDeviceDiskAlias(virDomainDefPtr def, const char *prefix = virDomainDiskBusTypeToString(disk->bus); int controllerModel = -1; - if (disk->info.alias) - return 0; - if (!disk->info.alias) { if (disk->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) { if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI) { @@ -220,7 +217,8 @@ qemuAssignDeviceDiskAlias(virDomainDefPtr def, * on the alias in qemu. While certain disk types use just the alias, some * need the full path into /machine/peripheral as a historical artifact. */ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV)) { + if (!diskPriv->qomName && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV)) { switch ((virDomainDiskBus) disk->bus) { case VIR_DOMAIN_DISK_BUS_FDC: case VIR_DOMAIN_DISK_BUS_IDE: -- 2.21.0

2 1

[libvirt] [PATCH] util: mdev: support persistent devices with mdevctl
by Jonathon Jongsma 19 Aug '19

19 Aug '19

When a host is rebooted, mediated devices disappear from sysfs. mdevctl (https://github.com/mdevctl/mdevctl) is a utility for managing and persisting these devices. It maintains a registry of mediated devices and can start and stop them by UUID. when libvirt attempts to create a new mediated device object, we currently fail if the path does not exist in sysfs. This patch tries a little bit harder by using mdevctl to attempt to activate the device. The approach is fairly naive -- it just calls 'mdevctl start -u $UUID' without checking whether this UUID is registered with mdevctl or not. See https://bugzilla.redhat.com/show_bug.cgi?id=1699274 Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- NOTES: - an argument could be made that we should simply do nothing here. mdevctl does have support for automatically activating the mediated device when the parent device becomes available (via udev). So if the administrator set up the mdev to start automatically, this patch should not even be necessary. That said, I think this patch could still be useful. - As I said above, the approach is pretty naive. I could have checked whether the device was defined in mdevctl's registry and given a different error message ("try registering this device with mdevctl") in that scenario. But I chose to keep it simple. src/util/virmdev.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/src/util/virmdev.c b/src/util/virmdev.c index 3d5488cdae..7a2f0adedc 100644 --- a/src/util/virmdev.c +++ b/src/util/virmdev.c @@ -25,6 +25,7 @@ #include "virfile.h" #include "virstring.h" #include "viralloc.h" +#include "vircommand.h" #define VIR_FROM_THIS VIR_FROM_NONE @@ -148,9 +149,24 @@ virMediatedDeviceNew(const char *uuidstr, virMediatedDeviceModelType model) return NULL; if (!virFileExists(sysfspath)) { - virReportError(VIR_ERR_DEVICE_MISSING, - _("mediated device '%s' not found"), uuidstr); - return NULL; + bool activated = false; + /* if the mdev device path doesn't exist, we may still be able to start + * the device using mdevctl + */ + char *mdevctl = virFindFileInPath("mdevctl"); + if (mdevctl) { + const char *runargs[] = { mdevctl, "start", "-u", uuidstr, NULL }; + if (virRun(runargs, NULL) == 0) { + /* check to see if it the device exists now */ + activated = virFileExists(sysfspath); + } + } + + if (!activated) { + virReportError(VIR_ERR_DEVICE_MISSING, + _("mediated device '%s' not found"), uuidstr); + return NULL; + } } if (VIR_ALLOC(dev) < 0) -- 2.21.0

4 4

[libvirt] [glib PATCH 0/2] Fix build failures on Fedora rawhide due to new glib
by Daniel P. Berrangé 19 Aug '19

19 Aug '19

Daniel P. Berrangé (2): gobject: remove use of G_PARAM_PRIVATE Set desired glib min/max API versions configure.ac | 2 ++ libvirt-gconfig/Makefile.am | 2 ++ libvirt-glib/Makefile.am | 2 ++ libvirt-gobject/Makefile.am | 2 ++ libvirt-gobject/libvirt-gobject-network-dhcp-lease.c | 1 - 5 files changed, 8 insertions(+), 1 deletion(-) -- 2.23.0.rc2

2 3

[libvirt] [PATCH v2] maint: Improve use of configmake.h on mingw
by Eric Blake 19 Aug '19

19 Aug '19

Gnulib has added a patch that allows configmake.h to be included without causing build failures on mingw if <winsock2.h> is later included (whether directly, or indirectly such as through gnulib's <unistd.h>). This reverts commit fed58d83c60ff1c20292856bec006577788b7494 ("build: Fix checkpoint_conf on mingw"), now that we don't have to worry about header inclusion ordering issues. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- v1 was 'build: Solve mingw build clash with DATADIR', and dead on arrival, so it was reverted shortly after. It turns out that pragma push_macro isn't good enough (you have to do it before EVERY site that includes winsock2.h, including those that do so indirectly by including gnulib's replacement unistd.h), so it's better to just fix gnulib from the get-go instead of trying to work around it at every internal spot. This time, I've actually tested mingw locally rather than lazily relying on jenkins to do the mingw validation work for me; I used: make -f Makefile.ci ci-build@fedora-rawhide CI_CONFIGURE="mingw32-configure" But since I botched up v1, I'll still wait for a review before pushing v2. Gnulib changes: b5e7a0d configmake: Avoid namespace pollution issue on mingw. .gnulib | 2 +- src/conf/checkpoint_conf.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.gnulib b/.gnulib index c8e2eee548..b5e7a0deb7 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit c8e2eee548e6e81f3fccd31cf9f9a825db7fc8a8 +Subproject commit b5e7a0deb7f9a3fc7f0206e39f6b032b1051d0cd diff --git a/src/conf/checkpoint_conf.c b/src/conf/checkpoint_conf.c index 5ce4cc4853..5f4c275dd8 100644 --- a/src/conf/checkpoint_conf.c +++ b/src/conf/checkpoint_conf.c @@ -21,8 +21,6 @@ #include <config.h> -#include <unistd.h> - #include "configmake.h" #include "internal.h" #include "virbitmap.h" -- 2.20.1

2 1

[libvirt] [PATCH 0/3] virt-aa-helper: A few fixes
by Andrea Bolognani 19 Aug '19

19 Aug '19

Found while updating libvirt in Debian to 5.6.0. More background available at https://salsa.debian.org/libvirt-team/libvirt/merge_requests/30 Andrea Bolognani (3): virt-aa-helper: Use virCommand APIs directly virt-aa-helper: Call virCommandRawStatus() virt-aa-helper: Fix AppArmor profile src/security/apparmor/usr.lib.libvirt.virt-aa-helper | 4 ++++ src/security/virt-aa-helper.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) -- 2.21.0

2 6

[libvirt] [dockerfiles PATCH 0/2] Use Fedora 30 to perform MinGW builds
by Fabiano Fidêncio 19 Aug '19

19 Aug '19

Due to a recent removal of mingw packages on Rawhide, let's use Fedora 30 machines to perform MinGW builds till the packages are un-retired/re-added in Rawhide. Fabiano Fidêncio (2): refresh: Use fedora-30 to perform MinGW builds Refresh archived Dockerfiles buildenv-libosinfo-centos-7.zip | Bin 458 -> 458 bytes buildenv-libosinfo-debian-10-cross-aarch64.zip | Bin 683 -> 683 bytes buildenv-libosinfo-debian-10-cross-armv6l.zip | Bin 682 -> 682 bytes buildenv-libosinfo-debian-10-cross-armv7l.zip | Bin 686 -> 686 bytes buildenv-libosinfo-debian-10-cross-i686.zip | Bin 682 -> 682 bytes buildenv-libosinfo-debian-10-cross-mips.zip | Bin 678 -> 678 bytes buildenv-libosinfo-debian-10-cross-mips64el.zip | Bin 689 -> 689 bytes buildenv-libosinfo-debian-10-cross-mipsel.zip | Bin 681 -> 681 bytes buildenv-libosinfo-debian-10-cross-ppc64le.zip | Bin 687 -> 687 bytes buildenv-libosinfo-debian-10-cross-s390x.zip | Bin 680 -> 680 bytes buildenv-libosinfo-debian-10.zip | Bin 555 -> 555 bytes buildenv-libosinfo-debian-9-cross-aarch64.zip | Bin 682 -> 682 bytes buildenv-libosinfo-debian-9-cross-armv6l.zip | Bin 681 -> 681 bytes buildenv-libosinfo-debian-9-cross-armv7l.zip | Bin 685 -> 685 bytes buildenv-libosinfo-debian-9-cross-mips.zip | Bin 678 -> 678 bytes buildenv-libosinfo-debian-9-cross-mips64el.zip | Bin 689 -> 689 bytes buildenv-libosinfo-debian-9-cross-mipsel.zip | Bin 680 -> 680 bytes buildenv-libosinfo-debian-9-cross-ppc64le.zip | Bin 687 -> 687 bytes buildenv-libosinfo-debian-9-cross-s390x.zip | Bin 680 -> 680 bytes buildenv-libosinfo-debian-9.zip | Bin 554 -> 554 bytes buildenv-libosinfo-debian-sid-cross-aarch64.zip | Bin 683 -> 683 bytes buildenv-libosinfo-debian-sid-cross-armv6l.zip | Bin 682 -> 682 bytes buildenv-libosinfo-debian-sid-cross-armv7l.zip | Bin 686 -> 686 bytes buildenv-libosinfo-debian-sid-cross-i686.zip | Bin 683 -> 683 bytes buildenv-libosinfo-debian-sid-cross-mips.zip | Bin 678 -> 678 bytes ...denv-libosinfo-debian-sid-cross-mips64el.zip | Bin 689 -> 689 bytes buildenv-libosinfo-debian-sid-cross-mipsel.zip | Bin 681 -> 681 bytes buildenv-libosinfo-debian-sid-cross-ppc64le.zip | Bin 687 -> 687 bytes buildenv-libosinfo-debian-sid-cross-s390x.zip | Bin 680 -> 680 bytes buildenv-libosinfo-debian-sid.zip | Bin 555 -> 555 bytes buildenv-libosinfo-fedora-29.zip | Bin 488 -> 488 bytes buildenv-libosinfo-fedora-30.zip | Bin 489 -> 551 bytes buildenv-libosinfo-fedora-rawhide.zip | Bin 572 -> 507 bytes buildenv-libosinfo-ubuntu-16.zip | Bin 558 -> 558 bytes buildenv-libosinfo-ubuntu-18.zip | Bin 558 -> 558 bytes buildenv-libvirt-centos-7.zip | Bin 662 -> 662 bytes buildenv-libvirt-debian-10-cross-aarch64.zip | Bin 887 -> 887 bytes buildenv-libvirt-debian-10-cross-armv6l.zip | Bin 880 -> 880 bytes buildenv-libvirt-debian-10-cross-armv7l.zip | Bin 884 -> 884 bytes buildenv-libvirt-debian-10-cross-i686.zip | Bin 883 -> 883 bytes buildenv-libvirt-debian-10-cross-mips.zip | Bin 878 -> 878 bytes buildenv-libvirt-debian-10-cross-mips64el.zip | Bin 892 -> 892 bytes buildenv-libvirt-debian-10-cross-mipsel.zip | Bin 882 -> 882 bytes buildenv-libvirt-debian-10-cross-ppc64le.zip | Bin 890 -> 890 bytes buildenv-libvirt-debian-10-cross-s390x.zip | Bin 883 -> 883 bytes buildenv-libvirt-debian-10.zip | Bin 773 -> 773 bytes buildenv-libvirt-debian-9-cross-aarch64.zip | Bin 896 -> 896 bytes buildenv-libvirt-debian-9-cross-armv6l.zip | Bin 887 -> 887 bytes buildenv-libvirt-debian-9-cross-armv7l.zip | Bin 893 -> 893 bytes buildenv-libvirt-debian-9-cross-mips.zip | Bin 886 -> 886 bytes buildenv-libvirt-debian-9-cross-mips64el.zip | Bin 898 -> 898 bytes buildenv-libvirt-debian-9-cross-mipsel.zip | Bin 889 -> 889 bytes buildenv-libvirt-debian-9-cross-ppc64le.zip | Bin 898 -> 898 bytes buildenv-libvirt-debian-9-cross-s390x.zip | Bin 890 -> 890 bytes buildenv-libvirt-debian-9.zip | Bin 777 -> 777 bytes buildenv-libvirt-debian-sid-cross-aarch64.zip | Bin 886 -> 886 bytes buildenv-libvirt-debian-sid-cross-armv6l.zip | Bin 879 -> 879 bytes buildenv-libvirt-debian-sid-cross-armv7l.zip | Bin 884 -> 884 bytes buildenv-libvirt-debian-sid-cross-i686.zip | Bin 883 -> 883 bytes buildenv-libvirt-debian-sid-cross-mips.zip | Bin 877 -> 877 bytes buildenv-libvirt-debian-sid-cross-mips64el.zip | Bin 892 -> 892 bytes buildenv-libvirt-debian-sid-cross-mipsel.zip | Bin 882 -> 882 bytes buildenv-libvirt-debian-sid-cross-ppc64le.zip | Bin 890 -> 890 bytes buildenv-libvirt-debian-sid-cross-s390x.zip | Bin 883 -> 883 bytes buildenv-libvirt-debian-sid.zip | Bin 773 -> 773 bytes buildenv-libvirt-fedora-29.zip | Bin 694 -> 694 bytes buildenv-libvirt-fedora-30.zip | Bin 695 -> 809 bytes buildenv-libvirt-fedora-rawhide.zip | Bin 828 -> 714 bytes buildenv-libvirt-ubuntu-16.zip | Bin 784 -> 784 bytes buildenv-libvirt-ubuntu-18.zip | Bin 783 -> 783 bytes refresh | 4 ++-- 71 files changed, 2 insertions(+), 2 deletions(-) -- 2.21.0

2 4

[libvirt] [jenkins-ci PATCH 0/3] Use Fedora 30 to perform MinGW builds
by Fabiano Fidêncio 19 Aug '19

19 Aug '19

Due to a recent removal of mingw packages on Rawhide, let's use Fedora 30 machines to perform MinGW builds till the packages are un-retired/re-added in Rawhide. Fabiano Fidêncio (3): mappings: MinGW packages are not Fedora Rawhide specific guests: Move MinGW builds to fedora-30 jenkins: Set fedora-30 as the MinGW machine. guests/host_vars/libvirt-fedora-30/main.yml | 10 ++ .../host_vars/libvirt-fedora-rawhide/main.yml | 10 -- guests/vars/mappings.yml | 108 +++++++++--------- jenkins/jobs/defaults.yaml | 2 +- 4 files changed, 65 insertions(+), 65 deletions(-) -- 2.21.0

2 6

[libvirt] [PATCH v4 0/4] Add support for Direct Mode for Hyper-V Synthetic timers
by Vitaly Kuznetsov 19 Aug '19

19 Aug '19

Changes since v3 [Ján Tomko]: - Drop already merged patches. - add "tests: qemuxml2argv: switch to DO_TEST_CAPS_LATEST for Hyper-V tests" patch (hope I got the idea correctly). - add hyperv-stimer-direct test to qemuxml2xml/qemuxml2argv tests. - use VIR_CPU_x86_HV_STIMER_DIRECT instead of 'hv-stimer-direct'. Original description: QEMU-4.1 will bring us Direct Mode for Hyper-V Synthetic timers support, we need to support it in libvirt too. As this is not a new enlightenment but rather an enhancement of an existing one ('stimer'), support it in <stimer state='on'> <direct state='on'/> </stimer> form. Backwards compatibility is (hopefully) preserved. Vitaly Kuznetsov (4): tests: qemuxml2argv: switch to DO_TEST_CAPS_LATEST for Hyper-V tests conf: add support for Direct Mode for Hyper-V Synthetic timers qemu: add support for Direct Mode for Hyper-V Synthetic timers news: mention Direct Mode for Hyper-V Synthetic timers support docs/formatdomain.html.in | 10 +-- docs/news.xml | 9 +++ docs/schemas/domaincommon.rng | 16 ++++- src/conf/domain_conf.c | 62 ++++++++++++++++++- src/conf/domain_conf.h | 1 + src/cpu/cpu_x86.c | 3 + src/cpu/cpu_x86_data.h | 2 + src/qemu/qemu_command.c | 3 + src/qemu/qemu_process.c | 20 +++++- tests/qemuxml2argvdata/hyperv-off.args | 27 -------- .../hyperv-off.x86_64-latest.args | 32 ++++++++++ tests/qemuxml2argvdata/hyperv-panic.args | 27 -------- .../hyperv-panic.x86_64-latest.args | 32 ++++++++++ .../hyperv-stimer-direct.x86_64-latest.args | 32 ++++++++++ .../qemuxml2argvdata/hyperv-stimer-direct.xml | 33 ++++++++++ tests/qemuxml2argvdata/hyperv.args | 29 --------- .../hyperv.x86_64-latest.args | 34 ++++++++++ tests/qemuxml2argvtest.c | 7 ++- .../hyperv-stimer-direct.xml | 35 +++++++++++ tests/qemuxml2xmltest.c | 1 + 20 files changed, 321 insertions(+), 94 deletions(-) delete mode 100644 tests/qemuxml2argvdata/hyperv-off.args create mode 100644 tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/hyperv-panic.args create mode 100644 tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/hyperv-stimer-direct.xml delete mode 100644 tests/qemuxml2argvdata/hyperv.args create mode 100644 tests/qemuxml2argvdata/hyperv.x86_64-latest.args create mode 100644 tests/qemuxml2xmloutdata/hyperv-stimer-direct.xml -- 2.20.1

2 7

[libvirt] [PATCH] tests: virpcimock: remove unused variable 'devid'
by Ján Tomko 19 Aug '19

19 Aug '19

virpcimock.c:685:26: error: unused variable 'devid' [-Werror,-Wunused-variable] VIR_AUTOFREE(char *) devid = NULL; ^ Fixes: 76b42294380d40282ed29560e4ae4a7491b9df05 Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Pushed as a trivial build fix. tests/virpcimock.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/virpcimock.c b/tests/virpcimock.c index 09a6c648af..ca6cc060fd 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -682,7 +682,6 @@ pci_driver_find_by_path(const char *path) static struct pciDriver * pci_driver_find_by_driver_override(struct pciDevice *dev) { - VIR_AUTOFREE(char *) devid = NULL; VIR_AUTOFREE(char *) path = NULL; char tmp[32]; size_t i; -- 2.20.1

1 0

[libvirt] [PATCH] test_driver: implement virDomainSetBlockThreshold
by Ilias Stamatis 17 Aug '19

17 Aug '19

Store disk name - threshold pairs in vm-private data so they can be retrieved by virConnectGetAllDomainStats later. Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- src/test/test_driver.c | 91 +++++++++++++++++++++++++++++++++++++++++- src/test/test_driver.h | 9 +++++ 2 files changed, 98 insertions(+), 2 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 9bf3728654..0b4646b0bb 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -396,6 +396,10 @@ struct _testDomainObjPrivate { /* used by get/set time APIs */ long long seconds; unsigned int nseconds; + + /* used by domainSetBlockThreshold */ + size_t num_thresholds; + testBlockThresholdPtr *thresholds; }; @@ -413,6 +417,9 @@ testDomainObjPrivateAlloc(void *opaque) priv->seconds = 627319920; priv->nseconds = 0; + priv->num_thresholds = 0; + priv->thresholds = NULL; + return priv; } @@ -3974,6 +3981,71 @@ testDomainGetBlockIoTune(virDomainPtr dom, #undef TEST_SET_PARAM +static int +testDomainSetBlockThreshold(virDomainPtr dom, + const char *dev, + unsigned long long threshold, + unsigned int flags) +{ + virDomainObjPtr vm = NULL; + virDomainDiskDefPtr disk; + testDomainObjPrivatePtr priv; + testBlockThresholdPtr blockthreshold = NULL; + size_t i; + int ret = -1; + + virCheckFlags(0, -1); + + if (!(vm = testDomObjFromDomain(dom))) + return -1; + + if (virDomainObjCheckActive(vm) < 0) + goto cleanup; + + if (!(disk = virDomainDiskByName(vm->def, dev, true))) { + virReportError(VIR_ERR_INVALID_ARG, + _("failed to find disk '%s'"), + dev); + goto cleanup; + } + + priv = vm->privateData; + + for (i = 0; i < priv->num_thresholds; i++) { + if (STREQ(dev, priv->thresholds[i]->name)) { + blockthreshold = priv->thresholds[i]; + break; + } + } + + if (blockthreshold != NULL) { + blockthreshold->threshold = threshold; + } else { + /* disk not found. add it to the list */ + if (VIR_ALLOC(blockthreshold) < 0) + goto cleanup; + if (VIR_STRDUP(blockthreshold->name, dev) < 0) + goto cleanup; + + blockthreshold->threshold = threshold; + + if (VIR_APPEND_ELEMENT(priv->thresholds, priv->num_thresholds, + blockthreshold) < 0) + goto cleanup; + } + + ret = 0; + + cleanup: + if (ret < 0 && blockthreshold != NULL) { + VIR_FREE(blockthreshold->name); + VIR_FREE(blockthreshold); + } + virDomainObjEndAPI(&vm); + return ret; +} + + static int testConnectNumOfDefinedDomains(virConnectPtr conn) { testDriverPtr privconn = conn->privateData; @@ -5070,10 +5142,12 @@ testDomainDeviceOperation(testDriverPtr driver, virTestDeviceOperation operation, const char *xml, const char *alias, + virDomainObjPtr vm, virDomainDefPtr def) { virDomainDeviceDefPtr dev = NULL; unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE; + size_t i; int ret = -1; if (operation == TEST_DEVICE_DETACH) @@ -5097,6 +5171,17 @@ testDomainDeviceOperation(testDriverPtr driver, case TEST_DEVICE_DETACH: if (testDomainDetachDeviceLiveAndConfig(def, dev) < 0) goto cleanup; + + if (dev->type == VIR_DOMAIN_DEVICE_DISK) { + testDomainObjPrivatePtr priv = vm->privateData; + + for (i = 0; i < priv->num_thresholds; i++) { + if (STREQ(dev->data.disk->dst, priv->thresholds[i]->name)) { + VIR_DELETE_ELEMENT(priv->thresholds[i], i, priv->num_thresholds); + break; + } + } + } break; case TEST_DEVICE_UPDATE: if (testDomainUpdateDeviceLiveAndConfig(def, dev) < 0) @@ -5137,12 +5222,13 @@ testDomainAttachDetachUpdateDevice(virDomainPtr dom, goto cleanup; if (persistentDef) { - if (testDomainDeviceOperation(driver, operation, xml, alias, persistentDef) < 0) + if (testDomainDeviceOperation(driver, operation, xml, alias, vm, + persistentDef) < 0) goto cleanup; } if (def) { - if (testDomainDeviceOperation(driver, operation, xml, alias, def) < 0) + if (testDomainDeviceOperation(driver, operation, xml, alias, vm, def) < 0) goto cleanup; } @@ -10001,6 +10087,7 @@ static virHypervisorDriver testHypervisorDriver = { .domainGetInterfaceParameters = testDomainGetInterfaceParameters, /* 5.6.0 */ .domainSetBlockIoTune = testDomainSetBlockIoTune, /* 5.7.0 */ .domainGetBlockIoTune = testDomainGetBlockIoTune, /* 5.7.0 */ + .domainSetBlockThreshold = testDomainSetBlockThreshold, /* 5.7.0 */ .connectListDefinedDomains = testConnectListDefinedDomains, /* 0.1.11 */ .connectNumOfDefinedDomains = testConnectNumOfDefinedDomains, /* 0.1.11 */ .domainCreate = testDomainCreate, /* 0.1.11 */ diff --git a/src/test/test_driver.h b/src/test/test_driver.h index 8c8a462db7..bcb5ffd7a4 100644 --- a/src/test/test_driver.h +++ b/src/test/test_driver.h @@ -23,4 +23,13 @@ #include "internal.h" + +typedef struct _testBlockThreshold testBlockThreshold; +typedef testBlockThreshold *testBlockThresholdPtr; + +struct _testBlockThreshold { + char *name; + unsigned long long threshold; +}; + int testRegister(void); -- 2.22.0

1 0

[libvirt] [PATCH 00/18] Enhance virpcimock and test VFIO instead of KVM
by Michal Privoznik 17 Aug '19

17 Aug '19

Kernel structure looks slightly different than what virpcimock creates. This did not use to be a problem, because we are testing KVM device assignment even though majority of systems we run on (if not all of them) use VFIO assignment. In order to switch our test suite (mainly virhostdevtest and virpcitest) to test VFIO assignment, the virpcimock must be fixed. Firstly, it needs to create symlinks under /sys/kernel/iommu_groups/... directories (patch 13/18) so that virhostdev module can iterate over them. Secondly, it needs to create 'driver_override' file (which exists since kernel-3.16.0) so that the virtual environment the mock creates matches real up to date systems (patch 03/18). Funny thing is, that enhancing the mock uncovered a bug we had (fix is in 15/18) and also one latent bug (14/18). As usual, these patches can be found on my github too: https://github.com/zippy2/libvirt/tree/virpcimock and just for the fun of it, here's the latest travis build of that branch: https://travis-ci.org/zippy2/libvirt/builds/571752953 Michal Prívozník (18): virpcimock: Move actions checking one level up Revert "virpcitest: Test virPCIDeviceDetach failure" virpcimock: Create driver_override file in device dirs virpcimock: Drop needless typecast virpcimock: Use VIR_AUTOFREE() virpcimock: Eliminate use of @fakesysfspcidir virpcimock: Rename @fakesysfspcidir virpcimock: Create devices/ and drivers/ under /sys/bus/pci upfront virpcimock: Introduce and use pci_device_get_path() virpcimock: Introduce and use pci_driver_get_path() virpcimock: Store PCI address as ints not string virpcimock: Create PCI devices under /sys/devices/pci* virpcimock: Create symlink in /sys/kernel/iommu_groups/N/devices dir virhostdev: Check driver name too in virHostdevIsPCINodeDeviceUsed() virhostdev: Unify virHostdevPreparePCIDevices behaviour for KVM and VFIO cases qemuxml2argvtest: Switch to modern vfio backend virhostdevtest: Use modern VFIO virpcitest: Use modern VFIO src/util/virhostdev.c | 26 +- .../hostdev-pci-address-device.args | 2 +- .../qemuxml2argvdata/hostdev-pci-address.args | 2 +- .../net-hostdev-bootorder.args | 3 +- .../net-hostdev-multidomain.args | 2 +- tests/qemuxml2argvdata/net-hostdev.args | 2 +- tests/qemuxml2argvdata/pci-rom.args | 4 +- tests/qemuxml2argvtest.c | 14 +- tests/virhostdevtest.c | 4 +- tests/virpcimock.c | 394 ++++++++++++------ tests/virpcitest.c | 48 +-- 11 files changed, 304 insertions(+), 197 deletions(-) -- 2.21.0

3 44

[libvirt] [PATCH v2 0/6] test_driver: implement device attach/detach APIs
by Ilias Stamatis 16 Aug '19

16 Aug '19

This series needed a respin since there were conflicts when trying to apply on the current master. Ilias Stamatis (6): test_driver: implement virDomainAttachDeviceFlags test_driver: implement virDomainAttachDevice test_driver: implement virDomainDetachDeviceFlags test_driver: implement virDomainDetachDevice test_driver: implement virDomainDetachDeviceAlias test_driver: implement virDomainUpdateDeviceFlags src/test/test_driver.c | 569 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 569 insertions(+) -- 2.22.0

2 14

[libvirt] [PATCH v2 0/7] PCI Multifunction hotplug/unplug, part 1
by Daniel Henrique Barboza 16 Aug '19

16 Aug '19

v2: - rebased without 3 patches from Michal that are under review in his NVMe patch series This is the first part of the feature discussed at [1]. These patches are mostly cleanup and fixes, thus it is beneficial to have them upstream right away. The whole feature can be checked out at [2]. All patches survives unit testing. The feature was stress tested with hundreds of consecutive hotplug/unplugs of a Broadcom BCM5719 multifunction network card in a guest running in a Power 8 server. Hopefully I'll find a suitable x86 env to stress test the feature there too. [1] https://www.redhat.com/archives/libvir-list/2019-June/msg00703.html [2] https://github.com/danielhb/libvirt/tree/multifunction_latest Daniel Henrique Barboza (1): util/virhostdev: enhance VFIO device is in use detection Shivaprasad G Bhat (6): tests: Fix the iommu group path in mock pci tests: pci: Mock the iommu groups and vfio virpcitest: Change the stub driver to vfio from pci-stub virpcimock: Mock the SRIOV Virtual functions tests: qemu: Add test case for pci-hostdev hotplug tests: Add a baseline test for multifunction pci device use case src/util/virhostdev.c | 74 +++++-- src/util/virprocess.h | 2 +- tests/Makefile.am | 7 + tests/qemuhotplugtest.c | 42 +++- .../qemuhotplug-hostdev-pci.xml | 6 + .../qemuhotplug-base-live+hostdev-pci.xml | 58 +++++ ...uhotplug-pseries-base-live+hostdev-pci.xml | 51 +++++ .../qemuhotplug-pseries-base-live.xml | 43 ++++ .../hostdev-pci-multifunction.args | 35 +++ .../hostdev-pci-multifunction.xml | 59 +++++ .../hostdev-vfio-multidomain.args | 2 +- .../hostdev-vfio-multidomain.xml | 2 +- tests/qemuxml2argvdata/hostdev-vfio.args | 2 +- tests/qemuxml2argvdata/hostdev-vfio.xml | 2 +- tests/qemuxml2argvdata/net-hostdev-fail.xml | 2 +- tests/qemuxml2argvdata/net-hostdev-vfio.args | 2 +- tests/qemuxml2argvdata/net-hostdev-vfio.xml | 2 +- tests/qemuxml2argvtest.c | 3 + .../hostdev-pci-multifunction.xml | 79 +++++++ tests/qemuxml2xmloutdata/hostdev-vfio.xml | 2 +- tests/qemuxml2xmloutdata/net-hostdev-vfio.xml | 2 +- tests/qemuxml2xmltest.c | 1 + tests/virhostdevtest.c | 4 +- tests/virpcimock.c | 201 ++++++++++++++++-- tests/virpcitest.c | 12 +- tests/virpcitestdata/0000-06-12.0.config | Bin 0 -> 256 bytes tests/virpcitestdata/0000-06-12.1.config | Bin 0 -> 256 bytes tests/virpcitestdata/0000-06-12.2.config | Bin 0 -> 256 bytes tests/virprocessmock.c | 28 +++ 29 files changed, 668 insertions(+), 55 deletions(-) create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-hostdev-pci.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-live+hostdev-pci.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-pseries-base-live+hostdev-pci.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-pseries-base-live.xml create mode 100644 tests/qemuxml2argvdata/hostdev-pci-multifunction.args create mode 100644 tests/qemuxml2argvdata/hostdev-pci-multifunction.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-pci-multifunction.xml create mode 100644 tests/virpcitestdata/0000-06-12.0.config create mode 100644 tests/virpcitestdata/0000-06-12.1.config create mode 100644 tests/virpcitestdata/0000-06-12.2.config create mode 100644 tests/virprocessmock.c -- 2.21.0

2 14

[libvirt] [jenkins-ci PATCH 0/2] quayadmin: Add create-build command
by Andrea Bolognani 16 Aug '19

16 Aug '19

Once [1] has been merged, we'll be able to conveniently cause container images to be rebuilt without having to define custom triggers. [1] https://www.redhat.com/archives/libvir-list/2019-August/msg00399.html Andrea Bolognani (2): quayadmin: Fix endpoints quayadmin: Add create-build command guests/quayadmin | 46 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 42 insertions(+), 4 deletions(-) -- 2.21.0

2 3

[libvirt] [dockerfiles PATCH 0/3] refresh: Generate archived Dockerfiles
by Andrea Bolognani 16 Aug '19

16 Aug '19

See commit 1/3 for more information. Andrea Bolognani (3): refresh: Generate archived Dockerfiles Remove plain Dockerfiles Add archived Dockerfiles .gitignore | 1 + buildenv-libosinfo-centos-7.Dockerfile | 43 ------- buildenv-libosinfo-centos-7.zip | Bin 0 -> 458 bytes ...bosinfo-debian-10-cross-aarch64.Dockerfile | 64 ---------- ...denv-libosinfo-debian-10-cross-aarch64.zip | Bin 0 -> 683 bytes ...ibosinfo-debian-10-cross-armv6l.Dockerfile | 64 ---------- buildenv-libosinfo-debian-10-cross-armv6l.zip | Bin 0 -> 682 bytes ...ibosinfo-debian-10-cross-armv7l.Dockerfile | 64 ---------- buildenv-libosinfo-debian-10-cross-armv7l.zip | Bin 0 -> 686 bytes ...-libosinfo-debian-10-cross-i686.Dockerfile | 64 ---------- buildenv-libosinfo-debian-10-cross-i686.zip | Bin 0 -> 682 bytes ...-libosinfo-debian-10-cross-mips.Dockerfile | 64 ---------- buildenv-libosinfo-debian-10-cross-mips.zip | Bin 0 -> 678 bytes ...osinfo-debian-10-cross-mips64el.Dockerfile | 64 ---------- ...env-libosinfo-debian-10-cross-mips64el.zip | Bin 0 -> 689 bytes ...ibosinfo-debian-10-cross-mipsel.Dockerfile | 64 ---------- buildenv-libosinfo-debian-10-cross-mipsel.zip | Bin 0 -> 681 bytes ...bosinfo-debian-10-cross-ppc64le.Dockerfile | 64 ---------- ...denv-libosinfo-debian-10-cross-ppc64le.zip | Bin 0 -> 687 bytes ...libosinfo-debian-10-cross-s390x.Dockerfile | 64 ---------- buildenv-libosinfo-debian-10-cross-s390x.zip | Bin 0 -> 680 bytes buildenv-libosinfo-debian-10.Dockerfile | 50 -------- buildenv-libosinfo-debian-10.zip | Bin 0 -> 555 bytes ...ibosinfo-debian-9-cross-aarch64.Dockerfile | 64 ---------- buildenv-libosinfo-debian-9-cross-aarch64.zip | Bin 0 -> 682 bytes ...libosinfo-debian-9-cross-armv6l.Dockerfile | 64 ---------- buildenv-libosinfo-debian-9-cross-armv6l.zip | Bin 0 -> 681 bytes ...libosinfo-debian-9-cross-armv7l.Dockerfile | 64 ---------- buildenv-libosinfo-debian-9-cross-armv7l.zip | Bin 0 -> 685 bytes ...v-libosinfo-debian-9-cross-mips.Dockerfile | 64 ---------- buildenv-libosinfo-debian-9-cross-mips.zip | Bin 0 -> 678 bytes ...bosinfo-debian-9-cross-mips64el.Dockerfile | 64 ---------- ...denv-libosinfo-debian-9-cross-mips64el.zip | Bin 0 -> 689 bytes ...libosinfo-debian-9-cross-mipsel.Dockerfile | 64 ---------- buildenv-libosinfo-debian-9-cross-mipsel.zip | Bin 0 -> 680 bytes ...ibosinfo-debian-9-cross-ppc64le.Dockerfile | 64 ---------- buildenv-libosinfo-debian-9-cross-ppc64le.zip | Bin 0 -> 687 bytes ...-libosinfo-debian-9-cross-s390x.Dockerfile | 64 ---------- buildenv-libosinfo-debian-9-cross-s390x.zip | Bin 0 -> 680 bytes buildenv-libosinfo-debian-9.Dockerfile | 50 -------- buildenv-libosinfo-debian-9.zip | Bin 0 -> 554 bytes ...osinfo-debian-sid-cross-aarch64.Dockerfile | 64 ---------- ...env-libosinfo-debian-sid-cross-aarch64.zip | Bin 0 -> 683 bytes ...bosinfo-debian-sid-cross-armv6l.Dockerfile | 64 ---------- ...denv-libosinfo-debian-sid-cross-armv6l.zip | Bin 0 -> 682 bytes ...bosinfo-debian-sid-cross-armv7l.Dockerfile | 64 ---------- ...denv-libosinfo-debian-sid-cross-armv7l.zip | Bin 0 -> 686 bytes ...libosinfo-debian-sid-cross-i686.Dockerfile | 64 ---------- buildenv-libosinfo-debian-sid-cross-i686.zip | Bin 0 -> 683 bytes ...libosinfo-debian-sid-cross-mips.Dockerfile | 64 ---------- buildenv-libosinfo-debian-sid-cross-mips.zip | Bin 0 -> 678 bytes ...sinfo-debian-sid-cross-mips64el.Dockerfile | 64 ---------- ...nv-libosinfo-debian-sid-cross-mips64el.zip | Bin 0 -> 689 bytes ...bosinfo-debian-sid-cross-mipsel.Dockerfile | 64 ---------- ...denv-libosinfo-debian-sid-cross-mipsel.zip | Bin 0 -> 681 bytes ...osinfo-debian-sid-cross-ppc64le.Dockerfile | 64 ---------- ...env-libosinfo-debian-sid-cross-ppc64le.zip | Bin 0 -> 687 bytes ...ibosinfo-debian-sid-cross-s390x.Dockerfile | 64 ---------- buildenv-libosinfo-debian-sid-cross-s390x.zip | Bin 0 -> 680 bytes buildenv-libosinfo-debian-sid.Dockerfile | 50 -------- buildenv-libosinfo-debian-sid.zip | Bin 0 -> 555 bytes buildenv-libosinfo-fedora-29.Dockerfile | 49 -------- buildenv-libosinfo-fedora-29.zip | Bin 0 -> 488 bytes buildenv-libosinfo-fedora-30.Dockerfile | 49 -------- buildenv-libosinfo-fedora-30.zip | Bin 0 -> 489 bytes buildenv-libosinfo-fedora-rawhide.Dockerfile | 63 ---------- buildenv-libosinfo-fedora-rawhide.zip | Bin 0 -> 572 bytes buildenv-libosinfo-ubuntu-16.Dockerfile | 50 -------- buildenv-libosinfo-ubuntu-16.zip | Bin 0 -> 558 bytes buildenv-libosinfo-ubuntu-18.Dockerfile | 50 -------- buildenv-libosinfo-ubuntu-18.zip | Bin 0 -> 558 bytes buildenv-libvirt-centos-7.Dockerfile | 81 ------------- buildenv-libvirt-centos-7.zip | Bin 0 -> 662 bytes ...libvirt-debian-10-cross-aarch64.Dockerfile | 100 --------------- buildenv-libvirt-debian-10-cross-aarch64.zip | Bin 0 -> 887 bytes ...-libvirt-debian-10-cross-armv6l.Dockerfile | 98 --------------- buildenv-libvirt-debian-10-cross-armv6l.zip | Bin 0 -> 880 bytes ...-libvirt-debian-10-cross-armv7l.Dockerfile | 99 --------------- buildenv-libvirt-debian-10-cross-armv7l.zip | Bin 0 -> 884 bytes ...nv-libvirt-debian-10-cross-i686.Dockerfile | 99 --------------- buildenv-libvirt-debian-10-cross-i686.zip | Bin 0 -> 883 bytes ...nv-libvirt-debian-10-cross-mips.Dockerfile | 99 --------------- buildenv-libvirt-debian-10-cross-mips.zip | Bin 0 -> 878 bytes ...ibvirt-debian-10-cross-mips64el.Dockerfile | 99 --------------- buildenv-libvirt-debian-10-cross-mips64el.zip | Bin 0 -> 892 bytes ...-libvirt-debian-10-cross-mipsel.Dockerfile | 99 --------------- buildenv-libvirt-debian-10-cross-mipsel.zip | Bin 0 -> 882 bytes ...libvirt-debian-10-cross-ppc64le.Dockerfile | 99 --------------- buildenv-libvirt-debian-10-cross-ppc64le.zip | Bin 0 -> 890 bytes ...v-libvirt-debian-10-cross-s390x.Dockerfile | 99 --------------- buildenv-libvirt-debian-10-cross-s390x.zip | Bin 0 -> 883 bytes buildenv-libvirt-debian-10.Dockerfile | 89 -------------- buildenv-libvirt-debian-10.zip | Bin 0 -> 773 bytes ...-libvirt-debian-9-cross-aarch64.Dockerfile | 101 ---------------- buildenv-libvirt-debian-9-cross-aarch64.zip | Bin 0 -> 896 bytes ...v-libvirt-debian-9-cross-armv6l.Dockerfile | 99 --------------- buildenv-libvirt-debian-9-cross-armv6l.zip | Bin 0 -> 887 bytes ...v-libvirt-debian-9-cross-armv7l.Dockerfile | 100 --------------- buildenv-libvirt-debian-9-cross-armv7l.zip | Bin 0 -> 893 bytes ...env-libvirt-debian-9-cross-mips.Dockerfile | 100 --------------- buildenv-libvirt-debian-9-cross-mips.zip | Bin 0 -> 886 bytes ...libvirt-debian-9-cross-mips64el.Dockerfile | 100 --------------- buildenv-libvirt-debian-9-cross-mips64el.zip | Bin 0 -> 898 bytes ...v-libvirt-debian-9-cross-mipsel.Dockerfile | 100 --------------- buildenv-libvirt-debian-9-cross-mipsel.zip | Bin 0 -> 889 bytes ...-libvirt-debian-9-cross-ppc64le.Dockerfile | 100 --------------- buildenv-libvirt-debian-9-cross-ppc64le.zip | Bin 0 -> 898 bytes ...nv-libvirt-debian-9-cross-s390x.Dockerfile | 100 --------------- buildenv-libvirt-debian-9-cross-s390x.zip | Bin 0 -> 890 bytes buildenv-libvirt-debian-9.Dockerfile | 90 -------------- buildenv-libvirt-debian-9.zip | Bin 0 -> 777 bytes ...ibvirt-debian-sid-cross-aarch64.Dockerfile | 100 --------------- buildenv-libvirt-debian-sid-cross-aarch64.zip | Bin 0 -> 886 bytes ...libvirt-debian-sid-cross-armv6l.Dockerfile | 98 --------------- buildenv-libvirt-debian-sid-cross-armv6l.zip | Bin 0 -> 879 bytes ...libvirt-debian-sid-cross-armv7l.Dockerfile | 99 --------------- buildenv-libvirt-debian-sid-cross-armv7l.zip | Bin 0 -> 884 bytes ...v-libvirt-debian-sid-cross-i686.Dockerfile | 99 --------------- buildenv-libvirt-debian-sid-cross-i686.zip | Bin 0 -> 883 bytes ...v-libvirt-debian-sid-cross-mips.Dockerfile | 99 --------------- buildenv-libvirt-debian-sid-cross-mips.zip | Bin 0 -> 877 bytes ...bvirt-debian-sid-cross-mips64el.Dockerfile | 99 --------------- ...denv-libvirt-debian-sid-cross-mips64el.zip | Bin 0 -> 892 bytes ...libvirt-debian-sid-cross-mipsel.Dockerfile | 99 --------------- buildenv-libvirt-debian-sid-cross-mipsel.zip | Bin 0 -> 882 bytes ...ibvirt-debian-sid-cross-ppc64le.Dockerfile | 99 --------------- buildenv-libvirt-debian-sid-cross-ppc64le.zip | Bin 0 -> 890 bytes ...-libvirt-debian-sid-cross-s390x.Dockerfile | 99 --------------- buildenv-libvirt-debian-sid-cross-s390x.zip | Bin 0 -> 883 bytes buildenv-libvirt-debian-sid.Dockerfile | 89 -------------- buildenv-libvirt-debian-sid.zip | Bin 0 -> 773 bytes buildenv-libvirt-fedora-29.Dockerfile | 89 -------------- buildenv-libvirt-fedora-29.zip | Bin 0 -> 694 bytes buildenv-libvirt-fedora-30.Dockerfile | 89 -------------- buildenv-libvirt-fedora-30.zip | Bin 0 -> 695 bytes buildenv-libvirt-fedora-rawhide.Dockerfile | 114 ------------------ buildenv-libvirt-fedora-rawhide.zip | Bin 0 -> 828 bytes buildenv-libvirt-ubuntu-16.Dockerfile | 91 -------------- buildenv-libvirt-ubuntu-16.zip | Bin 0 -> 784 bytes buildenv-libvirt-ubuntu-18.Dockerfile | 91 -------------- buildenv-libvirt-ubuntu-18.zip | Bin 0 -> 783 bytes refresh | 21 +++- 142 files changed, 20 insertions(+), 5525 deletions(-) create mode 100644 .gitignore delete mode 100644 buildenv-libosinfo-centos-7.Dockerfile create mode 100644 buildenv-libosinfo-centos-7.zip delete mode 100644 buildenv-libosinfo-debian-10-cross-aarch64.Dockerfile create mode 100644 buildenv-libosinfo-debian-10-cross-aarch64.zip delete mode 100644 buildenv-libosinfo-debian-10-cross-armv6l.Dockerfile create mode 100644 buildenv-libosinfo-debian-10-cross-armv6l.zip delete mode 100644 buildenv-libosinfo-debian-10-cross-armv7l.Dockerfile create mode 100644 buildenv-libosinfo-debian-10-cross-armv7l.zip delete mode 100644 buildenv-libosinfo-debian-10-cross-i686.Dockerfile create mode 100644 buildenv-libosinfo-debian-10-cross-i686.zip delete mode 100644 buildenv-libosinfo-debian-10-cross-mips.Dockerfile create mode 100644 buildenv-libosinfo-debian-10-cross-mips.zip delete mode 100644 buildenv-libosinfo-debian-10-cross-mips64el.Dockerfile create mode 100644 buildenv-libosinfo-debian-10-cross-mips64el.zip delete mode 100644 buildenv-libosinfo-debian-10-cross-mipsel.Dockerfile create mode 100644 buildenv-libosinfo-debian-10-cross-mipsel.zip delete mode 100644 buildenv-libosinfo-debian-10-cross-ppc64le.Dockerfile create mode 100644 buildenv-libosinfo-debian-10-cross-ppc64le.zip delete mode 100644 buildenv-libosinfo-debian-10-cross-s390x.Dockerfile create mode 100644 buildenv-libosinfo-debian-10-cross-s390x.zip delete mode 100644 buildenv-libosinfo-debian-10.Dockerfile create mode 100644 buildenv-libosinfo-debian-10.zip delete mode 100644 buildenv-libosinfo-debian-9-cross-aarch64.Dockerfile create mode 100644 buildenv-libosinfo-debian-9-cross-aarch64.zip delete mode 100644 buildenv-libosinfo-debian-9-cross-armv6l.Dockerfile create mode 100644 buildenv-libosinfo-debian-9-cross-armv6l.zip delete mode 100644 buildenv-libosinfo-debian-9-cross-armv7l.Dockerfile create mode 100644 buildenv-libosinfo-debian-9-cross-armv7l.zip delete mode 100644 buildenv-libosinfo-debian-9-cross-mips.Dockerfile create mode 100644 buildenv-libosinfo-debian-9-cross-mips.zip delete mode 100644 buildenv-libosinfo-debian-9-cross-mips64el.Dockerfile create mode 100644 buildenv-libosinfo-debian-9-cross-mips64el.zip delete mode 100644 buildenv-libosinfo-debian-9-cross-mipsel.Dockerfile create mode 100644 buildenv-libosinfo-debian-9-cross-mipsel.zip delete mode 100644 buildenv-libosinfo-debian-9-cross-ppc64le.Dockerfile create mode 100644 buildenv-libosinfo-debian-9-cross-ppc64le.zip delete mode 100644 buildenv-libosinfo-debian-9-cross-s390x.Dockerfile create mode 100644 buildenv-libosinfo-debian-9-cross-s390x.zip delete mode 100644 buildenv-libosinfo-debian-9.Dockerfile create mode 100644 buildenv-libosinfo-debian-9.zip delete mode 100644 buildenv-libosinfo-debian-sid-cross-aarch64.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid-cross-aarch64.zip delete mode 100644 buildenv-libosinfo-debian-sid-cross-armv6l.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid-cross-armv6l.zip delete mode 100644 buildenv-libosinfo-debian-sid-cross-armv7l.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid-cross-armv7l.zip delete mode 100644 buildenv-libosinfo-debian-sid-cross-i686.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid-cross-i686.zip delete mode 100644 buildenv-libosinfo-debian-sid-cross-mips.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid-cross-mips.zip delete mode 100644 buildenv-libosinfo-debian-sid-cross-mips64el.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid-cross-mips64el.zip delete mode 100644 buildenv-libosinfo-debian-sid-cross-mipsel.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid-cross-mipsel.zip delete mode 100644 buildenv-libosinfo-debian-sid-cross-ppc64le.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid-cross-ppc64le.zip delete mode 100644 buildenv-libosinfo-debian-sid-cross-s390x.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid-cross-s390x.zip delete mode 100644 buildenv-libosinfo-debian-sid.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid.zip delete mode 100644 buildenv-libosinfo-fedora-29.Dockerfile create mode 100644 buildenv-libosinfo-fedora-29.zip delete mode 100644 buildenv-libosinfo-fedora-30.Dockerfile create mode 100644 buildenv-libosinfo-fedora-30.zip delete mode 100644 buildenv-libosinfo-fedora-rawhide.Dockerfile create mode 100644 buildenv-libosinfo-fedora-rawhide.zip delete mode 100644 buildenv-libosinfo-ubuntu-16.Dockerfile create mode 100644 buildenv-libosinfo-ubuntu-16.zip delete mode 100644 buildenv-libosinfo-ubuntu-18.Dockerfile create mode 100644 buildenv-libosinfo-ubuntu-18.zip delete mode 100644 buildenv-libvirt-centos-7.Dockerfile create mode 100644 buildenv-libvirt-centos-7.zip delete mode 100644 buildenv-libvirt-debian-10-cross-aarch64.Dockerfile create mode 100644 buildenv-libvirt-debian-10-cross-aarch64.zip delete mode 100644 buildenv-libvirt-debian-10-cross-armv6l.Dockerfile create mode 100644 buildenv-libvirt-debian-10-cross-armv6l.zip delete mode 100644 buildenv-libvirt-debian-10-cross-armv7l.Dockerfile create mode 100644 buildenv-libvirt-debian-10-cross-armv7l.zip delete mode 100644 buildenv-libvirt-debian-10-cross-i686.Dockerfile create mode 100644 buildenv-libvirt-debian-10-cross-i686.zip delete mode 100644 buildenv-libvirt-debian-10-cross-mips.Dockerfile create mode 100644 buildenv-libvirt-debian-10-cross-mips.zip delete mode 100644 buildenv-libvirt-debian-10-cross-mips64el.Dockerfile create mode 100644 buildenv-libvirt-debian-10-cross-mips64el.zip delete mode 100644 buildenv-libvirt-debian-10-cross-mipsel.Dockerfile create mode 100644 buildenv-libvirt-debian-10-cross-mipsel.zip delete mode 100644 buildenv-libvirt-debian-10-cross-ppc64le.Dockerfile create mode 100644 buildenv-libvirt-debian-10-cross-ppc64le.zip delete mode 100644 buildenv-libvirt-debian-10-cross-s390x.Dockerfile create mode 100644 buildenv-libvirt-debian-10-cross-s390x.zip delete mode 100644 buildenv-libvirt-debian-10.Dockerfile create mode 100644 buildenv-libvirt-debian-10.zip delete mode 100644 buildenv-libvirt-debian-9-cross-aarch64.Dockerfile create mode 100644 buildenv-libvirt-debian-9-cross-aarch64.zip delete mode 100644 buildenv-libvirt-debian-9-cross-armv6l.Dockerfile create mode 100644 buildenv-libvirt-debian-9-cross-armv6l.zip delete mode 100644 buildenv-libvirt-debian-9-cross-armv7l.Dockerfile create mode 100644 buildenv-libvirt-debian-9-cross-armv7l.zip delete mode 100644 buildenv-libvirt-debian-9-cross-mips.Dockerfile create mode 100644 buildenv-libvirt-debian-9-cross-mips.zip delete mode 100644 buildenv-libvirt-debian-9-cross-mips64el.Dockerfile create mode 100644 buildenv-libvirt-debian-9-cross-mips64el.zip delete mode 100644 buildenv-libvirt-debian-9-cross-mipsel.Dockerfile create mode 100644 buildenv-libvirt-debian-9-cross-mipsel.zip delete mode 100644 buildenv-libvirt-debian-9-cross-ppc64le.Dockerfile create mode 100644 buildenv-libvirt-debian-9-cross-ppc64le.zip delete mode 100644 buildenv-libvirt-debian-9-cross-s390x.Dockerfile create mode 100644 buildenv-libvirt-debian-9-cross-s390x.zip delete mode 100644 buildenv-libvirt-debian-9.Dockerfile create mode 100644 buildenv-libvirt-debian-9.zip delete mode 100644 buildenv-libvirt-debian-sid-cross-aarch64.Dockerfile create mode 100644 buildenv-libvirt-debian-sid-cross-aarch64.zip delete mode 100644 buildenv-libvirt-debian-sid-cross-armv6l.Dockerfile create mode 100644 buildenv-libvirt-debian-sid-cross-armv6l.zip delete mode 100644 buildenv-libvirt-debian-sid-cross-armv7l.Dockerfile create mode 100644 buildenv-libvirt-debian-sid-cross-armv7l.zip delete mode 100644 buildenv-libvirt-debian-sid-cross-i686.Dockerfile create mode 100644 buildenv-libvirt-debian-sid-cross-i686.zip delete mode 100644 buildenv-libvirt-debian-sid-cross-mips.Dockerfile create mode 100644 buildenv-libvirt-debian-sid-cross-mips.zip delete mode 100644 buildenv-libvirt-debian-sid-cross-mips64el.Dockerfile create mode 100644 buildenv-libvirt-debian-sid-cross-mips64el.zip delete mode 100644 buildenv-libvirt-debian-sid-cross-mipsel.Dockerfile create mode 100644 buildenv-libvirt-debian-sid-cross-mipsel.zip delete mode 100644 buildenv-libvirt-debian-sid-cross-ppc64le.Dockerfile create mode 100644 buildenv-libvirt-debian-sid-cross-ppc64le.zip delete mode 100644 buildenv-libvirt-debian-sid-cross-s390x.Dockerfile create mode 100644 buildenv-libvirt-debian-sid-cross-s390x.zip delete mode 100644 buildenv-libvirt-debian-sid.Dockerfile create mode 100644 buildenv-libvirt-debian-sid.zip delete mode 100644 buildenv-libvirt-fedora-29.Dockerfile create mode 100644 buildenv-libvirt-fedora-29.zip delete mode 100644 buildenv-libvirt-fedora-30.Dockerfile create mode 100644 buildenv-libvirt-fedora-30.zip delete mode 100644 buildenv-libvirt-fedora-rawhide.Dockerfile create mode 100644 buildenv-libvirt-fedora-rawhide.zip delete mode 100644 buildenv-libvirt-ubuntu-16.Dockerfile create mode 100644 buildenv-libvirt-ubuntu-16.zip delete mode 100644 buildenv-libvirt-ubuntu-18.Dockerfile create mode 100644 buildenv-libvirt-ubuntu-18.zip -- 2.21.0

2 4

[libvirt] [PATCH 0/2] network: fix crash during cleanup from failure to allocate port
by Laine Stump 16 Aug '19

16 Aug '19

The first patch fixes the bug. The 2nd patch just updates some code that I noticed while fixing the bug (because I figured someone would whine that I was just moving around calls to outdated APIs). Laine Stump (2): network: fix crash during cleanup from failure to allocate port network: replace virSaveLastError() with virErrorPreserveLast() src/network/bridge_driver.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) -- 2.21.0

2 3

[libvirt] [PATCH] access: fix incorrect addition to virAccessPermNetwork
by Laine Stump 16 Aug '19

16 Aug '19

Commit e69444e17 (first appeared in libvirt-5.5.0) added the new value "VIR_ACCESS_PERM_NETWORK_SEARCH_PORTS" to the virAccessPerNetwork enum, and also the string "search_ports" to the VIR_ENUM_IMPL() macro for that enum. Unfortunately, the enum value was added in the middle of the list, while the string was added to the end of the VIR_ENUM_IMPL(). This patch corrects that error by moving the new value to the end of the enum definition, so that the order matches that of the string list. Resolves: https://bugzilla.redhat.com/1741428 Signed-off-by: Laine Stump <laine(a)redhat.com> --- src/access/viraccessperm.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/access/viraccessperm.h b/src/access/viraccessperm.h index a42512d5e0..7480ee8c2f 100644 --- a/src/access/viraccessperm.h +++ b/src/access/viraccessperm.h @@ -410,18 +410,18 @@ typedef enum { */ VIR_ACCESS_PERM_NETWORK_START, - /** - * @desc: List network ports - * @message: Listing network ports requires authorization - */ - VIR_ACCESS_PERM_NETWORK_SEARCH_PORTS, - /** * @desc: Stop network * @message: Stopping network requires authorization */ VIR_ACCESS_PERM_NETWORK_STOP, + /** + * @desc: List network ports + * @message: Listing network ports requires authorization + */ + VIR_ACCESS_PERM_NETWORK_SEARCH_PORTS, + VIR_ACCESS_PERM_NETWORK_LAST } virAccessPermNetwork; -- 2.21.0

2 1

[libvirt] [PATCH] tests: virpcimock: Always declare __open_2
by Peter Krempa 16 Aug '19

16 Aug '19

In some cases e.g. with clang on fedora 30 __open2 isn't even declared which results in the following build error: /home/pipo/libvirt/tests/virpcimock.c:939:1: error: no previous prototype for function '__open_2' [-Werror,-Wmissing-prototypes] __open_2(const char *path, int flags) Add a separate declaration to appease the compiler. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- tests/virpcimock.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/virpcimock.c b/tests/virpcimock.c index 829d61cd3f..cfe91ba3ff 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -935,6 +935,11 @@ open(const char *path, int flags, ...) } +/* in some cases this function may not be present in headers, so we need + * a declaration to silence the complier */ +int +__open_2(const char *path, int flags); + int __open_2(const char *path, int flags) { -- 2.21.0

2 2