- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: require reply from guest agent in qemuAgentGetInterfaces
by Ján Tomko 10 Jan '19

10 Jan '19

Since its introduction in commit 0977b8aa071 (released in v1.2.14) qemuAgentGetInterfaces calls qemuAgentCommand with needReply=false, which allows qemuAgentCommand to return 0 even when it did not get any reply from the agent. Set needReply to true, since we dereference it right after. This can be hit if libvirt is waiting for an event from the agent (e.g. shutdown) and the agent cannot reply in time (e.g. due to the guest being shut down), as reported in: https://bugzilla.redhat.com/show_bug.cgi?id=1663051 Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/qemu/qemu_agent.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 0f4dae37e3..80b789b5e0 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -2043,7 +2043,7 @@ qemuAgentGetInterfaces(qemuAgentPtr mon, if (!(cmd = qemuAgentMakeCommand("guest-network-get-interfaces", NULL))) goto cleanup; - if (qemuAgentCommand(mon, cmd, &reply, false, + if (qemuAgentCommand(mon, cmd, &reply, true, VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) goto cleanup; -- 2.20.1

3 2

[libvirt] [PATCH] cpu_map: Add support for arch-capabilities feature
by Jiri Denemark 10 Jan '19

10 Jan '19

The feature was added to QEMU in 3.1.0 and it is currently blocking migration, which is expected to change in the future. Luckily 3.1.0 is new enough to give us migratability hints on each feature via query-cpu-model-expension, which means we don't need to use the "migratable" attribute on the CPU map XML. The kernel calls this feature arch_capabilities and RHEL/CentOS 7.* use arch-facilities. Apparently some CPU test files were gathered with the RHEL version of QEMU. Let's update the test files to avoid possible confusion about the correct naming. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/cpu_map/x86_features.xml | 3 +++ tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb.json | 2 +- tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3.json | 2 +- tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4.json | 2 +- tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115.json | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml index 59236456d6..02431bea29 100644 --- a/src/cpu_map/x86_features.xml +++ b/src/cpu_map/x86_features.xml @@ -326,6 +326,9 @@ <feature name='stibp'> <cpuid eax_in='0x07' ecx_in='0x00' edx='0x08000000'/> </feature> + <feature name='arch-capabilities'>  + <cpuid eax_in='0x07' ecx_in='0x00' edx='0x20000000'/> + </feature> <feature name='ssbd'> <cpuid eax_in='0x07' ecx_in='0x00' edx='0x80000000'/> </feature> diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb.json b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb.json index 94a60fcc8f..1f53bb8bf3 100644 --- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb.json +++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb.json @@ -232,7 +232,7 @@ "avx512vbmi": false, "kvm-asyncpf": true, "spec-ctrl": false, - "arch-facilities": false, + "arch-capabilities": false, "model": 1, "node-id": -1 } diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3.json b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3.json index 10c5434263..6bdaf6e83a 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3.json +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3.json @@ -232,7 +232,7 @@ "avx512vbmi": false, "kvm-asyncpf": true, "spec-ctrl": true, - "arch-facilities": false, + "arch-capabilities": false, "model": 63, "node-id": -1 } diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4.json b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4.json index 0506dec0a7..2c6be20768 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4.json +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4.json @@ -232,7 +232,7 @@ "avx512vbmi": false, "kvm-asyncpf": true, "spec-ctrl": true, - "arch-facilities": false, + "arch-capabilities": false, "model": 79, "node-id": -1 } diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115.json b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115.json index 79f3580219..79b47a56fb 100644 --- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115.json +++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115.json @@ -232,7 +232,7 @@ "avx512vbmi": false, "kvm-asyncpf": true, "spec-ctrl": true, - "arch-facilities": false, + "arch-capabilities": false, "model": 85, "node-id": -1 } -- 2.20.1

2 1

[libvirt] [PATCH] qemu: Don't enable seclabel remembering for session mode
by Michal Privoznik 10 Jan '19

10 Jan '19

The session daemon is unable to set XATTRs in 'trusted' namespace because it doesn't run as privileged process. Therefore, when creating the default qemu config enable rememberOwner only when running as privileged process. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 3718ca6c22..20952e9607 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -145,7 +145,7 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) cfg->group = (gid_t)-1; } cfg->dynamicOwnership = privileged; - cfg->rememberOwner = true; + cfg->rememberOwner = privileged; cfg->cgroupControllers = -1; /* -1 == auto-detect */ -- 2.19.2

2 1

[libvirt] [PATCH v2 0/3] Better syntax-check on BSD
by Eric Blake 10 Jan '19

10 Jan '19

Since v1: fix the gnulib bug I accidentally introduced, then copy the gist of Roman's gnulib changes to also apply to our cfg.mk syntax checks. Eric Blake (3): maint: update gnulib for syntax-check on BSD maint: prefer $(GREP) in cfg.mk maint: split long lines for BSD syntax-check .gnulib | 2 +- cfg.mk | 95 +++++++++++++++++++++++++++++---------------------------- 2 files changed, 49 insertions(+), 48 deletions(-) -- 2.20.1

4 13

[libvirt] [RFC] UEFI and NVRAM store file format
by Nikolay Shirokovskiy 10 Jan '19

10 Jan '19

Hi, all. There is old patch series [1] to add file format to UEFI and NVRAM. It is not merged because I guess it is intended to be used with online internal snapshot and such snapshot have issues with nvram. First it can save VM state in nvram image. Second nvram is saved as part of VM state so one doesn't need to make nvram image snapshot as QEMU does. This is explained in greater details in [2]. But offline internal snapshots and disk only snapshots makes sense. So what about finally take the patch series. [1] [PATCH v2 0/4] UEFI and NVRAM store file format https://www.redhat.com/archives/libvir-list/2015-January/msg00444.html [2] discussion of internal snapshot support for VMs with nvram https://bugzilla.redhat.com/show_bug.cgi?id=1180955#c7 Nikolay

1 0

[libvirt] Plans for next release
by Daniel Veillard 10 Jan '19

10 Jan '19

Happy New Year everybody, as planned we should release 5.0.0 around Jan 15. This means that the best to meet that deadline would be to enter freeze tomorrow Thur, then have an RC2 over the w.e. and then if all goes well we can roll out the release next Tuesday. If there is no issue with this plan I will then release RC1 tomorrow probably in the evening european time, thanks, Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

3 3

[libvirt] [PATCH 0/7] Various cleanups to the build system
by Andrea Bolognani 10 Jan '19

10 Jan '19

Came for 6/7, stayed for the yak shaving. Andrea Bolognani (7): remote: Move polkitdir definition remote: Define polkit{actions,rules}dir remote: Define sysctldir remote: Define sasldir src: Simplify installing/uninstalling data apparmor: Move static data out of examples/ src: Add Vim modeline to Makefile.am snippets examples/Makefile.am | 40 ---------- src/Makefile.am | 54 ++++++------- src/access/Makefile.inc.am | 2 + src/admin/Makefile.inc.am | 2 + src/bhyve/Makefile.inc.am | 2 + src/conf/Makefile.inc.am | 2 + src/cpu/Makefile.inc.am | 2 + src/cpu_map/Makefile.inc.am | 2 + src/esx/Makefile.inc.am | 2 + src/hyperv/Makefile.inc.am | 2 + src/interface/Makefile.inc.am | 2 + src/libxl/Makefile.inc.am | 2 + src/locking/Makefile.inc.am | 2 + src/logging/Makefile.inc.am | 2 + src/lxc/Makefile.inc.am | 2 + src/network/Makefile.inc.am | 2 + src/node_device/Makefile.inc.am | 2 + src/nwfilter/Makefile.inc.am | 2 + src/openvz/Makefile.inc.am | 2 + src/phyp/Makefile.inc.am | 2 + src/qemu/Makefile.inc.am | 2 + src/remote/Makefile.inc.am | 75 +++++++++---------- src/rpc/Makefile.inc.am | 2 + src/secret/Makefile.inc.am | 2 + src/security/Makefile.inc.am | 42 +++++++++++ .../security}/apparmor/TEMPLATE.lxc | 0 .../security}/apparmor/TEMPLATE.qemu | 0 .../security}/apparmor/libvirt-lxc | 0 .../security}/apparmor/libvirt-qemu | 0 .../apparmor/usr.lib.libvirt.virt-aa-helper | 0 .../security}/apparmor/usr.sbin.libvirtd | 0 src/storage/Makefile.inc.am | 2 + src/test/Makefile.inc.am | 2 + src/util/Makefile.inc.am | 2 + src/vbox/Makefile.inc.am | 2 + src/vmware/Makefile.inc.am | 2 + src/vmx/Makefile.inc.am | 2 + src/vz/Makefile.inc.am | 2 + src/xenapi/Makefile.inc.am | 2 + src/xenconfig/Makefile.inc.am | 2 + 40 files changed, 161 insertions(+), 110 deletions(-) rename {examples => src/security}/apparmor/TEMPLATE.lxc (100%) rename {examples => src/security}/apparmor/TEMPLATE.qemu (100%) rename {examples => src/security}/apparmor/libvirt-lxc (100%) rename {examples => src/security}/apparmor/libvirt-qemu (100%) rename {examples => src/security}/apparmor/usr.lib.libvirt.virt-aa-helper (100%) rename {examples => src/security}/apparmor/usr.sbin.libvirtd (100%) -- 2.20.1

3 20

[libvirt] [PATCH v2] network: remove stale function
by Laine Stump 10 Jan '19

10 Jan '19

networkMigrateStateFiles was added nearly 5 years ago when the network state directory was moved from /var/lib/libvirt to /var/run/libvirt just prior to libvirt-1.2.4). It was only required to maintain proper state information for networks that were active during an upgrade that didn't involve rebooting the host. At this point the likelyhood of anyone upgrading their libvirt from pre-1.2.4 directly to 5.0.0 or later *without rebooting the host* is probably so close to 0 that no properly informed bookie would take *any* odds on it happening, so it seems appropriate to remove this pointless code. Signed-off-by: Laine Stump <laine(a)laine.org> --- Change from V1 - the now-unused #include <dirent.h> was causing make syntax-check to fail. src/network/bridge_driver.c | 93 ------------------------------------- 1 file changed, 93 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index aed80c04d5..660a93666c 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -33,7 +33,6 @@ #include <sys/wait.h> #include <sys/ioctl.h> #include <net/if.h> -#include <dirent.h> #if HAVE_SYS_SYSCTL_H # include <sys/sysctl.h> #endif @@ -559,92 +558,6 @@ firewalld_dbus_filter_bridge(DBusConnection *connection ATTRIBUTE_UNUSED, #endif -static int -networkMigrateStateFiles(virNetworkDriverStatePtr driver) -{ - /* Due to a change in location of network state xml beginning in - * libvirt 1.2.4 (from /var/lib/libvirt/network to - * /var/run/libvirt/network), we must check for state files in two - * locations. Anything found in the old location must be written - * to the new location, then erased from the old location. (Note - * that we read/write the file rather than calling rename() - * because the old and new state directories are likely in - * different filesystems). - */ - int ret = -1; - const char *oldStateDir = LOCALSTATEDIR "/lib/libvirt/network"; - DIR *dir; - int direrr; - struct dirent *entry; - char *oldPath = NULL, *newPath = NULL; - char *contents = NULL; - int rc; - - if ((rc = virDirOpenIfExists(&dir, oldStateDir)) <= 0) - return rc; - - if (virFileMakePath(driver->stateDir) < 0) { - virReportSystemError(errno, _("cannot create directory %s"), - driver->stateDir); - goto cleanup; - } - - while ((direrr = virDirRead(dir, &entry, oldStateDir)) > 0) { - if (entry->d_type != DT_UNKNOWN && - entry->d_type != DT_REG) - continue; - - if (virAsprintf(&oldPath, "%s/%s", - oldStateDir, entry->d_name) < 0) - goto cleanup; - - if (entry->d_type == DT_UNKNOWN) { - struct stat st; - - if (lstat(oldPath, &st) < 0) { - virReportSystemError(errno, - _("failed to stat network status file '%s'"), - oldPath); - goto cleanup; - } - - if (!S_ISREG(st.st_mode)) { - VIR_FREE(oldPath); - continue; - } - } - - if (virFileReadAll(oldPath, 1024*1024, &contents) < 0) - goto cleanup; - - if (virAsprintf(&newPath, "%s/%s", - driver->stateDir, entry->d_name) < 0) - goto cleanup; - if (virFileWriteStr(newPath, contents, S_IRUSR | S_IWUSR) < 0) { - virReportSystemError(errno, - _("failed to write network status file '%s'"), - newPath); - goto cleanup; - } - - unlink(oldPath); - VIR_FREE(oldPath); - VIR_FREE(newPath); - VIR_FREE(contents); - } - if (direrr < 0) - goto cleanup; - - ret = 0; - cleanup: - VIR_DIR_CLOSE(dir); - VIR_FREE(oldPath); - VIR_FREE(newPath); - VIR_FREE(contents); - return ret; -} - - /** * networkStateInitialize: * @@ -691,12 +604,6 @@ networkStateInitialize(bool privileged, LOCALSTATEDIR "/lib/libvirt/radvd") < 0) goto error; - /* migration from old to new location is only applicable for - * privileged mode - unprivileged mode directories haven't - * changed location. - */ - if (networkMigrateStateFiles(network_driver) < 0) - goto error; } else { configdir = virGetUserConfigDirectory(); rundir = virGetUserRuntimeDirectory(); -- 2.20.1

2 1

[libvirt] [PATCH] network: remove stale function
by Laine Stump 10 Jan '19

10 Jan '19

networkMigrateStateFiles was added nearly 5 years ago when the network state directory was moved from /var/lib/libvirt to /var/run/libvirt just prior to libvirt-1.2.4). It was only required to maintain proper state information for networks that were active during an upgrade that didn't involve rebooting the host. At this point the likelyhood of anyone upgrading their libvirt from pre-1.2.4 directly to 5.0.0 or later *without rebooting the host* is probably so close to 0 that no properly informed bookie would take *any* odds on it happening, so it seems appropriate to remove this pointless code. Signed-off-by: Laine Stump <laine(a)laine.org> --- src/network/bridge_driver.c | 92 ------------------------------------- 1 file changed, 92 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index aed80c04d5..8a16e50feb 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -559,92 +559,6 @@ firewalld_dbus_filter_bridge(DBusConnection *connection ATTRIBUTE_UNUSED, #endif -static int -networkMigrateStateFiles(virNetworkDriverStatePtr driver) -{ - /* Due to a change in location of network state xml beginning in - * libvirt 1.2.4 (from /var/lib/libvirt/network to - * /var/run/libvirt/network), we must check for state files in two - * locations. Anything found in the old location must be written - * to the new location, then erased from the old location. (Note - * that we read/write the file rather than calling rename() - * because the old and new state directories are likely in - * different filesystems). - */ - int ret = -1; - const char *oldStateDir = LOCALSTATEDIR "/lib/libvirt/network"; - DIR *dir; - int direrr; - struct dirent *entry; - char *oldPath = NULL, *newPath = NULL; - char *contents = NULL; - int rc; - - if ((rc = virDirOpenIfExists(&dir, oldStateDir)) <= 0) - return rc; - - if (virFileMakePath(driver->stateDir) < 0) { - virReportSystemError(errno, _("cannot create directory %s"), - driver->stateDir); - goto cleanup; - } - - while ((direrr = virDirRead(dir, &entry, oldStateDir)) > 0) { - if (entry->d_type != DT_UNKNOWN && - entry->d_type != DT_REG) - continue; - - if (virAsprintf(&oldPath, "%s/%s", - oldStateDir, entry->d_name) < 0) - goto cleanup; - - if (entry->d_type == DT_UNKNOWN) { - struct stat st; - - if (lstat(oldPath, &st) < 0) { - virReportSystemError(errno, - _("failed to stat network status file '%s'"), - oldPath); - goto cleanup; - } - - if (!S_ISREG(st.st_mode)) { - VIR_FREE(oldPath); - continue; - } - } - - if (virFileReadAll(oldPath, 1024*1024, &contents) < 0) - goto cleanup; - - if (virAsprintf(&newPath, "%s/%s", - driver->stateDir, entry->d_name) < 0) - goto cleanup; - if (virFileWriteStr(newPath, contents, S_IRUSR | S_IWUSR) < 0) { - virReportSystemError(errno, - _("failed to write network status file '%s'"), - newPath); - goto cleanup; - } - - unlink(oldPath); - VIR_FREE(oldPath); - VIR_FREE(newPath); - VIR_FREE(contents); - } - if (direrr < 0) - goto cleanup; - - ret = 0; - cleanup: - VIR_DIR_CLOSE(dir); - VIR_FREE(oldPath); - VIR_FREE(newPath); - VIR_FREE(contents); - return ret; -} - - /** * networkStateInitialize: * @@ -691,12 +605,6 @@ networkStateInitialize(bool privileged, LOCALSTATEDIR "/lib/libvirt/radvd") < 0) goto error; - /* migration from old to new location is only applicable for - * privileged mode - unprivileged mode directories haven't - * changed location. - */ - if (networkMigrateStateFiles(network_driver) < 0) - goto error; } else { configdir = virGetUserConfigDirectory(); rundir = virGetUserRuntimeDirectory(); -- 2.20.1

2 1

[libvirt] [PATCH v2 0/6] Allow adding mountOpts to the storage pool mount command
by John Ferlan 09 Jan '19

09 Jan '19

v1: https://www.redhat.com/archives/libvir-list/2018-December/msg00558.html Kept the subject the same, but the concept has been adjusted to follow issues pointed out by jtomko vis-a-vis allowing arbitrary options via XML. This series adds both the NFS and the RBD adjustments that were essentially in the referenced series from review. Changes since v1: * Patch 1: (NEW) Implements a bare-bones infrastructure for storage pool XML namespace. Could be split again, but separately the patches were too small IMO. * Patch 2: (NEW) Implementation of providing XML Namespace functions. The details of the operation are in the subsequent patch. I could combine 2 and 3, but perhaps it's easier to review separated. * Patch 3: (REWORK) Rework the previous series patch1 in order to utilize the Storage Pool XML Namespace. Adjust the description of the configuration and modify the storagepoolxml2xmltest appropriately. * Patch 4: (REWORK) Utilize the XML Namespace data to generate the command line which doesn't change since v1. * Patch 5: (REWORK) Rework the virsh code in order to generate the proper syntax to utilize Storage Pool XML Namespaces. * Patch 6: (NEW) Well, new as in this series, but it's essentially a rework of what was posted in the series jtomko referenced. The code will "prove" (to a degree) that the concept can work for multiple pool types. The "downside" is that there's no (easy) way that I could find to generate output to show the commands are executed. John Ferlan (6): conf: Introduce virStoragePoolXMLNamespace nfs: Add infrastructure to manage XML namespace options docs,tests: Add schema, description, and tests for NFS namespace storage: Add NFS storage pool mount options to command line virsh: Add source-mount-opts for pool commands rbd: Utilize storage pool namespace to manage config options docs/formatstorage.html.in | 87 ++++++++++ docs/schemas/storagepool.rng | 43 +++++ src/conf/storage_conf.c | 51 +++++- src/conf/storage_conf.h | 24 +++ src/libvirt_private.syms | 1 + src/storage/storage_backend_fs.c | 127 ++++++++++++++ src/storage/storage_backend_rbd.c | 159 +++++++++++++++++- src/storage/storage_util.c | 36 ++++ src/storage/storage_util.h | 14 ++ tests/Makefile.am | 4 +- .../pool-netfs-mountopts.argv | 1 + tests/storagepoolxml2argvtest.c | 4 + .../pool-netfs-mountopts.xml | 24 +++ .../pool-rbd-configopts.xml | 17 ++ .../pool-netfs-mountopts.xml | 24 +++ .../pool-rbd-configopts.xml | 20 +++ tests/storagepoolxml2xmltest.c | 7 + tools/virsh-pool.c | 39 ++++- tools/virsh.pod | 5 + 19 files changed, 680 insertions(+), 7 deletions(-) create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-mountopts.argv create mode 100644 tests/storagepoolxml2xmlin/pool-netfs-mountopts.xml create mode 100644 tests/storagepoolxml2xmlin/pool-rbd-configopts.xml create mode 100644 tests/storagepoolxml2xmlout/pool-netfs-mountopts.xml create mode 100644 tests/storagepoolxml2xmlout/pool-rbd-configopts.xml -- 2.20.1

3 20