- Devel - libvirt List Archives

[libvirt] [PATCH 00/10] conf/caps: Modernize and clean up handling of domain caps
by Peter Krempa 12 Nov '19

12 Nov '19

Peter Krempa (10): qemu: caps: Rework memory allocation in virQEMUCapsFillDomainFeatureSEVCaps qemu: caps: Make capability filler functions void conf: domaincaps: Fix broken attempt at being const-correct conf: storagecaps: Fix broken attempt at being const-correct conf: Rename virDomainCapsFeature to virDomainProcessCapsFeature conf: caps: Automaticaly free 'cpus_str' conf: domain: Split up formatting of <memtune> and <memoryBacking> conf: turn virDomainMemtuneFormat void conf: caps: Modernize virCapabilitiesFormatCaches conf: capabilities: Modernize virCapabilitiesFormatMemoryBandwidth src/conf/capabilities.c | 36 +++++---------- src/conf/domain_capabilities.c | 32 ++++++------- src/conf/domain_capabilities.h | 4 +- src/conf/domain_conf.c | 30 ++++++------ src/conf/domain_conf.h | 82 ++++++++++++++++----------------- src/conf/storage_capabilities.c | 4 +- src/conf/storage_capabilities.h | 2 +- src/libvirt_private.syms | 2 +- src/lxc/lxc_cgroup.c | 2 +- src/lxc/lxc_container.c | 20 ++++---- src/lxc/lxc_native.c | 4 +- src/qemu/qemu_capabilities.c | 81 +++++++++++--------------------- 12 files changed, 132 insertions(+), 167 deletions(-) -- 2.23.0

3 17

[libvirt] [PATCH 0/6] qemu: Fix "Property '.pconfig' not found" error
by Jiri Denemark 12 Nov '19

12 Nov '19

The pconfig feature was enabled in QEMU by accident in 3.1.0. All other newer versions do not support it and it was removed from the Icelake-Server CPU model in QEMU. We don't normally change our CPU models even when QEMU does so to avoid breaking migrations between different versions of libvirt. But we can safely do so in this specific case. QEMU never supported enabling pconfig so any domain which was able to start has pconfig disabled. With a small compatibility hack which explicitly disables pconfig when CPU model equals Icelake-Server in migratable domain definition, only one migration scenario stays broken (and there's nothing we can do about it): from any host to a host with libvirt < 5.10.0 and QEMU > 3.1.0. https://bugzilla.redhat.com/show_bug.cgi?id=1749672 Jiri Denemark (6): cpu_conf: Pass policy to CPU feature filtering callbacks qemuxml2*test: Add tests for Icelake-Server,-pconfig qemu: Drop disabled CPU features unknown to QEMU cpu_map: Drop comments about ospke cputest: Add data for Ice Lake Server CPU cpu_map: Drop pconfig from Icelake-Server CPU model src/conf/cpu_conf.c | 6 +- src/conf/cpu_conf.h | 1 + src/cpu/cpu_x86.c | 13 +- src/cpu/cpu_x86.h | 2 + src/cpu_map/x86_Cascadelake-Server.xml | 2 - src/cpu_map/x86_Icelake-Client.xml | 2 - src/cpu_map/x86_Icelake-Server.xml | 3 - src/qemu/qemu_capabilities.c | 1 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_domain.c | 23 + src/qemu/qemu_domain.h | 3 + src/qemu/qemu_migration_cookie.c | 3 + src/qemu/qemu_process.c | 32 + tests/cputest.c | 1 + .../x86_64-cpuid-Ice-Lake-Server-disabled.xml | 7 + .../x86_64-cpuid-Ice-Lake-Server-enabled.xml | 10 + .../x86_64-cpuid-Ice-Lake-Server-guest.xml | 35 + .../x86_64-cpuid-Ice-Lake-Server-host.xml | 36 + .../x86_64-cpuid-Ice-Lake-Server-json.xml | 16 + .../x86_64-cpuid-Ice-Lake-Server.json | 1142 +++++++++++++++++ .../x86_64-cpuid-Ice-Lake-Server.sig | 4 + .../x86_64-cpuid-Ice-Lake-Server.xml | 65 + ...u-Icelake-Server-pconfig.x86_64-3.1.0.args | 34 + ...-Icelake-Server-pconfig.x86_64-latest.args | 34 + .../cpu-Icelake-Server-pconfig.xml | 22 + tests/qemuxml2argvtest.c | 3 + ...pu-Icelake-Server-pconfig.x86_64-3.1.0.xml | 31 + ...u-Icelake-Server-pconfig.x86_64-latest.xml | 31 + tests/qemuxml2xmltest.c | 3 + 29 files changed, 1555 insertions(+), 11 deletions(-) create mode 100644 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-json.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server.json create mode 100644 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server.xml create mode 100644 tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.xml create mode 100644 tests/qemuxml2xmloutdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.xml create mode 100644 tests/qemuxml2xmloutdata/cpu-Icelake-Server-pconfig.x86_64-latest.xml -- 2.24.0

2 8

[libvirt] [PATCH 0/2] First round of out-of-tree build fixes
by Michal Privoznik 12 Nov '19

12 Nov '19

Some low hanging fruit here. There are more serious issues that I yet have to figure out: 1) docs/ is broken. Just open any site from your build directory. Our main.js lives in the source dir but we are trying to load it relative to build dir 2) Generation of acl.html is broken - it assumes aclperms.htmlinc file lives under $srcdir which is not true anymore => page that's generated is useless 3) I've tried to update Gentoo live ebuild, but it failed to compile: Making all in src make[2]: Entering directory '/var/tmp/portage/app-emulation/libvirt-9999/work/libvirt-9999_build/src' ... /usr/bin/perl /var/tmp/portage/app-emulation/libvirt-9999/work/libvirt-9999/src/access/genpolkit.pl < /var/tmp/portage/app-emulation/libvirt-9999/work/libvirt-9999/src/access/viraccessperm.h > access/org.libvirt.api.policy || rm -f access/org.libvirt.api.policy /usr/bin/perl -w /var/tmp/portage/app-emulation/libvirt-9999/work/libvirt-9999/src/rpc/gendispatch.pl --mode=aclheader \ remote REMOTE /var/tmp/portage/app-emulation/libvirt-9999/work/libvirt-9999/src/remote/remote_protocol.x \ > access/viraccessapicheck.h /bin/sh: access/org.libvirt.api.policy: No such file or directory The libvirt-9999_build/src/access dir doesn't exist (I'm surprised it wasn't created automatically by autotools since src/ was). I'll have to investigate further. Michal Prívozník (2): src: Make check-aclrules work again make check-driverimpls work again src/Makefile.am | 7 ++----- src/bhyve/Makefile.inc.am | 4 ++-- src/esx/Makefile.inc.am | 2 +- src/hyperv/Makefile.inc.am | 2 +- src/interface/Makefile.inc.am | 4 ++-- src/libxl/Makefile.inc.am | 4 ++-- src/lxc/Makefile.inc.am | 4 ++-- src/network/Makefile.inc.am | 4 ++-- src/node_device/Makefile.inc.am | 8 ++++---- src/nwfilter/Makefile.inc.am | 4 ++-- src/openvz/Makefile.inc.am | 2 +- src/phyp/Makefile.inc.am | 2 +- src/qemu/Makefile.inc.am | 4 ++-- src/remote/Makefile.inc.am | 2 +- src/secret/Makefile.inc.am | 4 ++-- src/storage/Makefile.inc.am | 4 ++-- src/test/Makefile.inc.am | 2 +- src/vbox/Makefile.inc.am | 4 ++-- src/vmware/Makefile.inc.am | 2 +- src/vz/Makefile.inc.am | 4 ++-- 20 files changed, 35 insertions(+), 38 deletions(-) -- 2.23.0

2 7

[libvirt] [PATCH] storage: Don't get src in each loop since src is not changed
by 李义 12 Nov '19

12 Nov '19

The src of pool is not changed in each loop, so don't VIR_FREE(src) and get when next iteration. Signed-off-by: Yi Li <yili(a)winhong.com> --- src/storage/storage_backend_fs.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 02b8248..27c1098 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -258,10 +258,10 @@ virStorageBackendFileSystemIsMounted(virStoragePoolObjPtr pool) goto cleanup; } - while ((getmntent_r(mtab, &ent, buf, sizeof(buf))) != NULL) { - if (!(src = virStorageBackendFileSystemGetPoolSource(pool))) - goto cleanup; + if ((src = virStorageBackendFileSystemGetPoolSource(pool)) == NULL) + goto cleanup; + while ((getmntent_r(mtab, &ent, buf, sizeof(buf))) != NULL) { /* compare both mount destinations and sources to be sure the mounted * FS pool is really the one we're looking for */ @@ -273,8 +273,6 @@ virStorageBackendFileSystemIsMounted(virStoragePoolObjPtr pool) ret = 1; goto cleanup; } - - VIR_FREE(src); } ret = 0; -- 2.7.5

2 1

[libvirt] [PATCH 0/4] consolidate cgroup code that is duplicated between
by Mao Zhongyi 12 Nov '19

12 Nov '19

Both QEMU and LXC drivers have some duplicate code when dealing with cgroups, this serials mainly consolidate the same chunk of src/qemu/qemu_cgroup.c and src/lxc/lxc_cgroup.c into src/util/cgroup.c. Mao Zhongyi (4): lxc: remove duplicate header files qemu: remove duplicate header files util: consolidate QEMU and LXC block io related duplicate code util: consolidate QEMU and LXC memory related duplicate code src/libvirt_private.syms | 2 + src/lxc/lxc_cgroup.c | 85 +------------------------------------ src/qemu/qemu_cgroup.c | 62 +-------------------------- src/util/vircgroup.c | 91 ++++++++++++++++++++++++++++++++++++++++ src/util/vircgroup.h | 4 ++ 5 files changed, 101 insertions(+), 143 deletions(-) -- 2.17.1

2 7

[libvirt] [dbus PATCH] meson: fix construction of data directories
by Pavel Hrdina 12 Nov '19

12 Nov '19

We need to use prefix for all directories and there is no need to check if the user provided path starts with '/' as that is done automatically by the join_paths() function or '/' operator. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- meson.build | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/meson.build b/meson.build index 472e4e2..b293b8c 100644 --- a/meson.build +++ b/meson.build @@ -9,12 +9,30 @@ project( ], ) +prefix = get_option('prefix') +datadir = prefix / get_option('datadir') +sbindir = prefix / get_option('sbindir') + +opt_dirs = [ + 'dbus_interfaces', + 'dbus_services', + 'dbus_system_services', + 'dbus_system_policies', + 'polkit_rules', +] + +foreach opt_dir : opt_dirs + value = get_option(opt_dir) + varname = '@0@_dir'.format(opt_dir) + set_variable(varname, datadir / value) +endforeach + conf = configuration_data() conf.set('MESON_VERSION', '0.49.0') conf.set('PACKAGE', meson.project_name()) conf.set('VERSION', meson.project_version()) conf.set('build_root', meson.build_root()) -conf.set('sbindir', get_option('sbindir')) +conf.set('sbindir', sbindir) conf.set('source_root', meson.source_root()) @@ -40,24 +58,6 @@ git = run_command('test', '-d', '.git').returncode() == 0 conf.set('SYSTEM_USER', get_option('system_user')) -opt_dirs = [ - 'dbus_interfaces', - 'dbus_services', - 'dbus_system_services', - 'dbus_system_policies', - 'polkit_rules', -] - -foreach opt_dir : opt_dirs - value = get_option(opt_dir) - varname = '@0@_dir'.format(opt_dir) - if opt_dir.startswith('/') - set_variable(varname, value) - else - set_variable(varname, join_paths(get_option('datadir'), value)) - endif -endforeach - # Compile flags -- 2.21.0

2 1

[libvirt] [PATCH] qemu: snapshot: split out preparation of a snapshot with blockdev
by Peter Krempa 11 Nov '19

11 Nov '19

Separate the blockdev code since it makes the original function lenghty. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_driver.c | 96 ++++++++++++++++++++++++------------------ 1 file changed, 56 insertions(+), 40 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index abfb540d80..45363b0d6d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15228,6 +15228,58 @@ qemuDomainSnapshotDiskCleanup(qemuDomainSnapshotDiskDataPtr data, } +static int +qemuDomainSnapshotDiskPrepareOneBlockdev(virQEMUDriverPtr driver, + virDomainObjPtr vm, + qemuDomainSnapshotDiskDataPtr dd, + virQEMUDriverConfigPtr cfg, + bool reuse, + virHashTablePtr blockNamedNodeData, + qemuDomainAsyncJob asyncJob) +{ + qemuDomainObjPrivatePtr priv = vm->privateData; + g_autoptr(virStorageSource) terminator = NULL; + int rc; + + /* create a terminator for the snapshot disks so that qemu does not try + * to open them at first */ + if (!(terminator = virStorageSourceNew())) + return -1; + + if (qemuDomainPrepareStorageSourceBlockdev(dd->disk, dd->src, + priv, cfg) < 0) + return -1; + + if (!(dd->crdata = qemuBuildStorageSourceChainAttachPrepareBlockdevTop(dd->src, + terminator, + priv->qemuCaps))) + return -1; + + if (reuse) { + if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) + return -1; + + rc = qemuBlockStorageSourceAttachApply(qemuDomainGetMonitor(vm), + dd->crdata->srcdata[0]); + + if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) + return -1; + } else { + if (qemuBlockStorageSourceCreateDetectSize(blockNamedNodeData, + dd->src, dd->disk->src) < 0) + return -1; + + if (qemuBlockStorageSourceCreate(vm, dd->src, dd->disk->src, + NULL, dd->crdata->srcdata[0], + asyncJob) < 0) + return -1; + } + + dd->blockdevadded = true; + return 0; +} + + static int qemuDomainSnapshotDiskPrepareOne(virQEMUDriverPtr driver, virDomainObjPtr vm, @@ -15240,12 +15292,9 @@ qemuDomainSnapshotDiskPrepareOne(virQEMUDriverPtr driver, bool blockdev, qemuDomainAsyncJob asyncJob) { - qemuDomainObjPrivatePtr priv = vm->privateData; virDomainDiskDefPtr persistdisk; - g_autoptr(virStorageSource) terminator = NULL; bool supportsCreate; bool supportsBacking; - int rc; dd->disk = disk; @@ -15314,43 +15363,10 @@ qemuDomainSnapshotDiskPrepareOne(virQEMUDriverPtr driver, dd->prepared = true; - if (blockdev) { - /* create a terminator for the snapshot disks so that qemu does not try - * to open them at first */ - if (!(terminator = virStorageSourceNew())) - return -1; - - if (qemuDomainPrepareStorageSourceBlockdev(dd->disk, dd->src, - priv, cfg) < 0) - return -1; - - if (!(dd->crdata = qemuBuildStorageSourceChainAttachPrepareBlockdevTop(dd->src, - terminator, - priv->qemuCaps))) - return -1; - - if (reuse) { - if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) - return -1; - - rc = qemuBlockStorageSourceAttachApply(qemuDomainGetMonitor(vm), - dd->crdata->srcdata[0]); - - if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) - return -1; - } else { - if (qemuBlockStorageSourceCreateDetectSize(blockNamedNodeData, - dd->src, dd->disk->src) < 0) - return -1; - - if (qemuBlockStorageSourceCreate(vm, dd->src, dd->disk->src, - NULL, dd->crdata->srcdata[0], - asyncJob) < 0) - return -1; - } - - dd->blockdevadded = true; - } + if (blockdev && + qemuDomainSnapshotDiskPrepareOneBlockdev(driver, vm, dd, cfg, reuse, + blockNamedNodeData, asyncJob) < 0) + return -1; return 0; } -- 2.23.0

2 1

[libvirt] [PATCH] qemu: command: Use XML based disk bus convertor in error message
by Peter Krempa 11 Nov '19

11 Nov '19

The qemu driver has an internal implementation for converting disk bus to string for use with qemu. This should not be used in error messages though as we want to report the string based on the XML value. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f37aecda37..3806cbbaf9 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1303,7 +1303,7 @@ qemuCheckDiskConfig(virDomainDiskDefPtr disk, disk->bus != VIR_DOMAIN_DISK_BUS_SCSI) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("disk device='lun' is not supported for bus='%s'"), - virDomainDiskQEMUBusTypeToString(disk->bus)); + virDomainDiskBusTypeToString(disk->bus)); return -1; } -- 2.23.0

2 1

[libvirt] [PATCH] util: pci: Remove always-false condition
by Peter Krempa 11 Nov '19

11 Nov '19

Commit d19c21429fd modified the condition so that it checks whether the value is more than 0xFFFFFFFF. Since addr->domain is an unsigned int, it will never be more than that. Remove the whole check src/util/virpci.c:1291:22: error: result of comparison 'unsigned int' > 4294967295 is always false [-Werror,-Wtautological-type-limit-compare] if (addr->domain > 0xFFFFFFFF) { ~~~~~~~~~~~~ ^ ~~~~~~~~~~ Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- This was caught by new clang: $ clang -v clang version 9.0.0 (Fedora 9.0.0-1.fc31) This "fix" is the naive approach which assumes the original patch was correct. src/util/virpci.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index f9e39e79d8..cd560d683b 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -1288,14 +1288,6 @@ bool virPCIDeviceAddressIsValid(virPCIDeviceAddressPtr addr, bool report) { - if (addr->domain > 0xFFFFFFFF) { - if (report) - virReportError(VIR_ERR_XML_ERROR, - _("Invalid PCI address domain='0x%x', " - "must be <= 0xFFFF"), - addr->domain); - return false; - } if (addr->bus > 0xFF) { if (report) virReportError(VIR_ERR_XML_ERROR, -- 2.23.0

1 1

[libvirt] [PATCH 0/2] Couple of fixes for exported stuff
by Peter Krempa 11 Nov '19

11 Nov '19

Peter Krempa (2): datatypes: Fix comment for the _virNetwork struct syms: Add 'global:' keyword to LIBVIRT_5.8 section src/datatypes.h | 2 +- src/libvirt_public.syms | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) -- 2.23.0

2 4