September 2020 - Devel - libvirt List Archives

[PATCH] qemuxml2argvtest: Append newline to tested error messages
by Peter Krempa 24 Sep '20

24 Sep '20

'virTestCompareToFile' automatically fixes newline if it is not present in the input string but is present in the file. In this case we need to append the erorr messages with a newline so that VIR_TEST_REGENERATE_OUTPUT produces files which will pass syntax-check. Fixes: 9ec77eef2df Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- tests/qemuxml2argvtest.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index a3c91fd5de..2b97eb80a4 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -621,9 +621,11 @@ testCompareXMLToArgv(const void *data) VIR_TEST_DEBUG("no error was reported for expected parse error"); goto cleanup; } - if (flags & FLAG_EXPECT_PARSE_ERROR && - virTestCompareToFile(err->message, info->errfile) >= 0) - goto ok; + if (flags & FLAG_EXPECT_PARSE_ERROR) { + g_autofree char *tmperr = g_strdup_printf("%s\n", NULLSTR(err->message)); + if (virTestCompareToFile(tmperr, info->errfile) >= 0) + goto ok; + } goto cleanup; } if (flags & FLAG_EXPECT_PARSE_ERROR) { @@ -663,9 +665,11 @@ testCompareXMLToArgv(const void *data) VIR_TEST_DEBUG("no error was reported for expected failure"); goto cleanup; } - if (flags & FLAG_EXPECT_FAILURE && - virTestCompareToFile(err->message, info->errfile) >= 0) - goto ok; + if (flags & FLAG_EXPECT_FAILURE) { + g_autofree char *tmperr = g_strdup_printf("%s\n", NULLSTR(err->message)); + if (virTestCompareToFile(tmperr, info->errfile) >= 0) + goto ok; + } goto cleanup; } if (flags & FLAG_EXPECT_FAILURE) { -- 2.26.2

2 1

[PATCH] cpu_map: Add EPYC-Rome model
by Markus Schade 24 Sep '20

24 Sep '20

Hi everyone, I'd like to add support for the EPYC-Rome CPU model from qemu. The following patch adds the model to cpu_map. While this allows to use the model, I am aware that some tests are required as well. However I am not certain what exactly is needed. I am happy to provide CPU flags or any required information from an EPYC 7502 system Signed-off-by: Markus Schade <markus.schade(a)hetzner.com> diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index 1486a29c65..fec01f324c 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -66,6 +66,7 @@ <include filename="x86_Opteron_G5.xml"/> <include filename="x86_EPYC.xml"/> <include filename="x86_EPYC-IBPB.xml"/> + <include filename="x86_EPYC-Rome.xml"/>  <include filename="x86_Dhyana.xml"/> diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index 19daa7157b..b86612b6e0 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -32,6 +32,7 @@ cpumap_data = [ 'x86_Dhyana.xml', 'x86_EPYC-IBPB.xml', 'x86_EPYC.xml', + 'x86_EPYC-Rome.xml', 'x86_features.xml', 'x86_Haswell-IBRS.xml', 'x86_Haswell-noTSX-IBRS.xml', diff --git a/src/cpu_map/x86_EPYC-Rome.xml b/src/cpu_map/x86_EPYC-Rome.xml new file mode 100644 index 0000000000..41d4123917 --- /dev/null +++ b/src/cpu_map/x86_EPYC-Rome.xml @@ -0,0 +1,81 @@ +<cpus> + <model name='EPYC-Rome'> + <decode host='on' guest='on'/> + <signature family='23' model='49'/> + <vendor name='AMD'/> + <feature name='3dnowprefetch'/> + <feature name='abm'/> + <feature name='adx'/> + <feature name='aes'/> + <feature name='amd-stibp'/> + <feature name='apic'/> + <feature name='arat'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='bmi1'/> + <feature name='bmi2'/> + <feature name='clflush'/> + <feature name='clflushopt'/> + <feature name='clwb'/> + <feature name='clzero'/> + <feature name='cmov'/> + <feature name='cr8legacy'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fxsr'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='misalignsse'/> + <feature name='mmx'/> + <feature name='mmxext'/> + <feature name='monitor'/> + <feature name='movbe'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='osvw'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pclmuldq'/> + <feature name='pdpe1gb'/> + <feature name='perfctr_core'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdpid'/> + <feature name='rdrand'/> + <feature name='rdseed'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <feature name='sha-ni'/> + <feature name='smap'/> + <feature name='smep'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='sse4.1'/> + <feature name='sse4.2'/> + <feature name='sse4a'/> + <feature name='ssse3'/> + <feature name='svm'/> + <feature name='syscall'/> + <feature name='tsc'/> + <feature name='vme'/> + <feature name='wbnoinvd'/> + <feature name='xgetbv1'/> + <feature name='xsave'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaveopt'/> + </model> +</cpus>

2 1

[PATCH] util: stop probing for IFF_VNET_HDR
by Daniel P. Berrangé 24 Sep '20

24 Sep '20

This flag was added by Linux with: commit f43798c27684ab925adde7d8acc34c78c6e50df8 Author: Rusty Russell <rusty(a)rustcorp.com.au> Date: Thu Jul 3 03:48:02 2008 -0700 tun: Allow GSO using virtio_net_hdr so we can assume all Linux distros we support have this flag available and thus the compile time check is sufficient. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/util/virnetdevtap.c | 63 +---------------------------------------- 1 file changed, 1 insertion(+), 62 deletions(-) diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index cbce5c71b7..77c4d1c52c 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -183,66 +183,6 @@ virNetDevTapGetRealDeviceName(char *ifname G_GNUC_UNUSED) } -/** - * virNetDevProbeVnetHdr: - * @tapfd: a tun/tap file descriptor - * - * Check whether it is safe to enable the IFF_VNET_HDR flag on the - * tap interface. - * - * Setting IFF_VNET_HDR enables QEMU's virtio_net driver to allow - * guests to pass larger (GSO) packets, with partial checksums, to - * the host. This greatly increases the achievable throughput. - * - * It is only useful to enable this when we're setting up a virtio - * interface. And it is only *safe* to enable it when we know for - * sure that a) qemu has support for IFF_VNET_HDR and b) the running - * kernel implements the TUNGETIFF ioctl(), which qemu needs to query - * the supplied tapfd. - * - * Returns 1 if VnetHdr is supported, 0 if not supported - */ -#ifdef IFF_VNET_HDR -static int -virNetDevProbeVnetHdr(int tapfd) -{ -# if defined(IFF_VNET_HDR) && defined(TUNGETFEATURES) && defined(TUNGETIFF) - unsigned int features; - struct ifreq dummy; - - if (ioctl(tapfd, TUNGETFEATURES, &features) != 0) { - VIR_INFO("Not enabling IFF_VNET_HDR; " - "TUNGETFEATURES ioctl() not implemented"); - return 0; - } - - if (!(features & IFF_VNET_HDR)) { - VIR_INFO("Not enabling IFF_VNET_HDR; " - "TUNGETFEATURES ioctl() reports no IFF_VNET_HDR"); - return 0; - } - - /* The kernel will always return -1 at this point. - * If TUNGETIFF is not implemented then errno == EBADFD. - */ - if (ioctl(tapfd, TUNGETIFF, &dummy) != -1 || errno != EBADFD) { - VIR_INFO("Not enabling IFF_VNET_HDR; " - "TUNGETIFF ioctl() not implemented"); - return 0; - } - - VIR_INFO("Enabling IFF_VNET_HDR"); - - return 1; -# else - (void) tapfd; - VIR_INFO("Not enabling IFF_VNET_HDR; disabled at build time"); - return 0; -# endif -} -#endif - - #ifdef TUNSETIFF /** * virNetDevTapGenerateName: @@ -363,8 +303,7 @@ int virNetDevTapCreate(char **ifname, } # ifdef IFF_VNET_HDR - if ((flags & VIR_NETDEV_TAP_CREATE_VNET_HDR) && - virNetDevProbeVnetHdr(fd)) + if (flags & VIR_NETDEV_TAP_CREATE_VNET_HDR) ifr.ifr_flags |= IFF_VNET_HDR; # endif -- 2.26.2

2 2

[PATCH 0/2] qemuSnapshotDiskContext(Cleanup|New): fix few bugs
by Peter Krempa 24 Sep '20

24 Sep '20

Oops. Peter Krempa (2): qemuSnapshotDiskContextCleanup: Don't leak snapctxt qemuSnapshotDiskContextNew: Don't set 'ndd' src/qemu/qemu_snapshot.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.26.2

2 3

[PATCH 0/6] qemu: snapshot: Refactors prior to introduction of <transient> disk support
by Peter Krempa 24 Sep '20

24 Sep '20

We'll be installing overlays on top of <transient> disks via the snapshot code. Prepare some aspects. Peter Krempa (6): qemu: snapshot: Rename 'qemuSnapshotCreateDiskActive' to 'qemuSnapshotCreateActiveExternalDisks' qemuSnapshotDiskUpdateSource: Extract 'driver' and 'blockdev' from 'vm' qemuSnapshotDiskPrepare/Cleanup: simplify passing of 'driver' and 'blockdev' qemu: snapshot: Introduce qemuSnapshotDiskContext qemuSnapshotCreateActiveExternalDisks: Extract actual snapshot creation to 'qemuSnapshotDiskCreate' qemuSnapshotDiskPrepare: rename to qemuSnapshotDiskPrepareActiveExternal src/qemu/qemu_snapshot.c | 215 ++++++++++++++++++++++----------------- 1 file changed, 124 insertions(+), 91 deletions(-) -- 2.26.2

2 8

[libvirt PATCH 00/14] Various cleanups
by Ján Tomko 24 Sep '20

24 Sep '20

Some reported by cppcheck, maybe even Coverity, the rest I noticed while looking at the code. Ján Tomko (14): tools: virshCheckpointListCollect: remove unused names vbox: remove VBoxCGlueTerm vbox: StartMachine: overwrite ret less often Remove pointless assignments Remove pointless initializations virsh: virshStreamSourceSkip: remove unused 'off' Do not check whether unsigned variables are negative libxl: remove unused 'bits' from struct guest_arch api: virDomainMemoryStats: use 'ret' variable storage: createFileDir: remove useless 'err' variable storage: createFileDir: use less ternary operators vbox: reduce variable scope in vboxDumpStorageControllers storage: storageBackendWipeLocal: reduce variable scope Reduce scope of some variables examples/c/admin/logging.c | 2 +- src/libvirt-domain.c | 8 ++--- src/libvirt-host.c | 4 +-- src/libxl/libxl_capabilities.c | 1 - src/libxl/libxl_driver.c | 2 +- src/node_device/node_device_driver.c | 3 +- src/openvz/openvz_driver.c | 2 +- src/storage/storage_backend_mpath.c | 3 +- src/storage/storage_util.c | 33 ++++++++++---------- src/test/test_driver.c | 2 +- src/vbox/vbox_XPCOMCGlue.c | 19 ------------ src/vbox/vbox_XPCOMCGlue.h | 1 - src/vbox/vbox_common.c | 46 +++++++++++++--------------- tests/virnumamock.c | 2 +- tests/virrandommock.c | 2 +- tools/virsh-checkpoint.c | 5 --- tools/virsh-pool.c | 3 +- tools/virsh-util.c | 3 +- 18 files changed, 53 insertions(+), 88 deletions(-) -- 2.26.2

3 30

[PATCH] tests: Adjust libxlxml2domconfigtest to work with Xen < 4.10
by Jim Fehlig 24 Sep '20

24 Sep '20

Commit f253dc90f5 introduced a test regression in environments with Xen < 4.10. The logic in libxl_conf.c correctly maps ACPI and APIC from virDomainObj to libxl_domain_conf based on LIBXL_HAVE_BUILDINFO_APIC, but the tests did not account for the different libxl_domain_conf JSON representations. One approach to fixing the test regression is to duplicate JSON test data files, having one set for Xen <= 4.9 and another for Xen 4.10 and greater. To avoid duplicate data files, this patch takes the approach of modifying the libxl_domain_conf object based on LIBXL_HAVE_BUILDINFO_APIC, before retrieving the JSON representation. It allows using the same test data files for all supported versions of Xen by adjusting the intermediate form of libxl_domain_conf object as needed. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- tests/libxlxml2domconfigtest.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c index c4d5db9a7b..d58be1211b 100644 --- a/tests/libxlxml2domconfigtest.c +++ b/tests/libxlxml2domconfigtest.c @@ -97,6 +97,20 @@ testCompareXMLToDomConfig(const char *xmlfile, "Failed to create libxl_domain_config from JSON doc"); goto cleanup; } + + /* + * In order to have common test files between Xen 4.9 and newer Xen versions, + * tweak the expected libxl_domain_config object before getting a json + * representation. + */ +# ifndef LIBXL_HAVE_BUILDINFO_APIC + if (expectconfig.c_info.type == LIBXL_DOMAIN_TYPE_HVM) { + libxl_defbool_unset(&expectconfig.b_info.acpi); + libxl_defbool_set(&expectconfig.b_info.u.hvm.apic, true); + libxl_defbool_set(&expectconfig.b_info.u.hvm.acpi, true); + } +# endif + if (!(expectjson = libxl_domain_config_to_json(cfg->ctx, &expectconfig))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", "Failed to retrieve JSON doc for libxl_domain_config"); -- 2.28.0

2 1

[libvirt PATCH v2] qemu: substitute missing model name for host-passthrough
by Tim Wiederhake 24 Sep '20

24 Sep '20

From: Collin Walling <walling(a)linux.ibm.com> Before: $ uname -m s390x $ cat passthrough-cpu.xml <cpu check="none" mode="host-passthrough" /> $ virsh hypervisor-cpu-compare passthrough-cpu.xml error: Failed to compare hypervisor CPU with passthrough-cpu.xml error: internal error: unable to execute QEMU command 'query-cpu-model-comp arison': Invalid parameter type for 'modelb.name', expected: string After: $ virsh hypervisor-cpu-compare passthrough-cpu.xml CPU described in passthrough-cpu.xml is identical to the CPU provided by hy pervisor on the host Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- src/qemu/qemu_driver.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ae715c01d7..1cecef01f7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12336,6 +12336,15 @@ qemuConnectCompareHypervisorCPU(virConnectPtr conn, if (virCPUDefParseXMLString(xmlCPU, VIR_CPU_TYPE_AUTO, &cpu) < 0) goto cleanup; + if (!cpu->model) { + if (cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH) { + cpu->model = g_strdup("host"); + } else { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("cpu parameter is missing a model name")); + goto cleanup; + } + } ret = qemuConnectCPUModelComparison(qemuCaps, cfg->libDir, cfg->user, cfg->group, hvCPU, cpu, failIncompatible); -- 2.26.2

3 6

[PATCH] apparmor: Allow /usr/libexec for libxl-save-helper and pygrub
by Jim Fehlig 24 Sep '20

24 Sep '20

Like other distros, openSUSE Tumbleweed recently changed libexecdir from /usr/lib to /usr/libexec. Add it as an allowed path for libxl-save-helper and pygrub. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- I considered including /usr/lib64, but I don't think any distros are installing xen libexecdir targets to /usr/lib64. Happy to include it if I'm wrong :-). src/security/apparmor/usr.sbin.libvirtd.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/security/apparmor/usr.sbin.libvirtd.in b/src/security/apparmor/usr.sbin.libvirtd.in index f2030764cd..bf4563e1e8 100644 --- a/src/security/apparmor/usr.sbin.libvirtd.in +++ b/src/security/apparmor/usr.sbin.libvirtd.in @@ -86,8 +86,8 @@ profile libvirtd @sbindir@/libvirtd flags=(attach_disconnected) { /{usr/,}lib/udev/scsi_id PUx, /usr/{lib,lib64}/xen-common/bin/xen-toolstack PUx, /usr/{lib,lib64}/xen/bin/* Ux, - /usr/lib/xen-*/bin/libxl-save-helper PUx, - /usr/lib/xen-*/bin/pygrub PUx, + /usr/{lib,libexec}/xen-*/bin/libxl-save-helper PUx, + /usr/{lib,libexec}/xen-*/bin/pygrub PUx, /usr/{lib,lib64,lib/qemu,libexec}/vhost-user-gpu PUx, /usr/{lib,lib64,lib/qemu,libexec}/virtiofsd PUx, -- 2.28.0

3 6

[PATCH] RFC: fix error message in virMigrate3 if connection is broken
by Nikolay Shirokovskiy 24 Sep '20

24 Sep '20

Currently virDomainMigrate3 reports "this function is not supported by the connection driver: virDomainMigrate3" if connection to destination for example is broken. This is a bit misleading. This is a result of we treat errors as unsupported feature in VIR_DRV_SUPPORTS_FEATURE macro. So let's handle errors instead. In order to keep logic clean as before there are new helper functions virDrvSupportsFeature/virDrvNSupportsFeature. They allow to keep if/else if structure of feature tests. I guess all the other occurences of VIR_DRV_SUPPORTS_FEATURE need to be replaced with one these new helper functions so that we detect error early and not have issues similar to virDomainMigrate3. I'm going to fix the other places if this RFC is approved. --- src/datatypes.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++ src/datatypes.h | 7 +++++ src/libvirt-domain.c | 76 +++++++++++++++++++++++++++++++--------------------- 3 files changed, 123 insertions(+), 30 deletions(-) diff --git a/src/datatypes.c b/src/datatypes.c index 1db38c5..3fb71f4 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -1257,3 +1257,73 @@ virAdmClientDispose(void *obj) virObjectUnref(clt->srv); } + + +/* + * Tests if feature is supported by connection. If testing failed + * due to error then function returns true as well and set @err flag + * to true. Thus positive result should be checked for an error. + * If @err is already set to true then no checking is done and + * the function returns true immediately so that previous error + * is not overwritten. + * + * Returns: + * true feature is supported or testing hit error + * false feature is not supported + */ +bool +virDrvSupportsFeature(virConnectPtr conn, + virDrvFeature feature, + bool *err) +{ + int rc; + + if (*err) + return true; + + if (!conn->driver->connectSupportsFeature) + return false; + + if ((rc = conn->driver->connectSupportsFeature(conn, feature)) < 0) { + *err = true; + return true; + } + + return rc > 0 ? true : false; +} + + +/* + * Tests if feature is NOT supported by connection. If testing failed + * due to error then function returns true as well and set @err flag + * to true. Thus positive result should be checked for an error. + * If @err is already set to true then no checking is done and + * the function returns true immediately so that previous error + * is not overwritten. + * + * Note that this function is not merge negation of virDrvSupportsFeature. + * + * Returns: + * true feature is not supported or testing hit error + * false feature is supported + */ +bool +virDrvNSupportsFeature(virConnectPtr conn, + virDrvFeature feature, + bool *err) +{ + int rc; + + if (*err) + return true; + + if (!conn->driver->connectSupportsFeature) + return true; + + if ((rc = conn->driver->connectSupportsFeature(conn, feature)) < 0) { + *err = true; + return true; + } + + return rc > 0 ? false : true; +} diff --git a/src/datatypes.h b/src/datatypes.h index ade3779..e468d92 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -871,3 +871,10 @@ int virAdmConnectCloseCallbackDataRegister(virAdmConnectCloseCallbackDataPtr cbd virFreeCallback freecb); int virAdmConnectCloseCallbackDataUnregister(virAdmConnectCloseCallbackDataPtr cbdata, virAdmConnectCloseFunc cb); + +bool virDrvSupportsFeature(virConnectPtr conn, + virDrvFeature feature, + bool *err); +bool virDrvNSupportsFeature(virConnectPtr conn, + virDrvFeature feature, + bool *err); diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index cde86c7..f4f626a 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -3846,6 +3846,7 @@ virDomainMigrate3(virDomainPtr domain, const char *dname = NULL; const char *dxml = NULL; unsigned long long bandwidth = 0; + bool err = false; VIR_DOMAIN_DEBUG(domain, "dconn=%p, params=%p, nparms=%u flags=0x%x", dconn, params, nparams, flags); @@ -3878,18 +3879,20 @@ virDomainMigrate3(virDomainPtr domain, } if (flags & VIR_MIGRATE_OFFLINE) { - if (!VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, - VIR_DRV_FEATURE_MIGRATION_OFFLINE)) { - virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("offline migration is not supported by " - "the source host")); + if (virDrvNSupportsFeature(domain->conn, + VIR_DRV_FEATURE_MIGRATION_OFFLINE, &err)) { + if (!err) + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("offline migration is not supported by " + "the source host")); goto error; } - if (!VIR_DRV_SUPPORTS_FEATURE(dconn->driver, dconn, - VIR_DRV_FEATURE_MIGRATION_OFFLINE)) { - virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("offline migration is not supported by " - "the destination host")); + if (virDrvNSupportsFeature(dconn, + VIR_DRV_FEATURE_MIGRATION_OFFLINE, &err)) { + if (!err) + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("offline migration is not supported by " + "the destination host")); goto error; } } @@ -3900,20 +3903,25 @@ virDomainMigrate3(virDomainPtr domain, * migration from newer source to an older destination that * rejects the flag. */ if (flags & VIR_MIGRATE_CHANGE_PROTECTION && - !VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, - VIR_DRV_FEATURE_MIGRATE_CHANGE_PROTECTION)) { - virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("cannot enforce change protection")); + virDrvNSupportsFeature(domain->conn, + VIR_DRV_FEATURE_MIGRATE_CHANGE_PROTECTION, + &err)) { + if (!err) + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("cannot enforce change protection")); goto error; } flags &= ~VIR_MIGRATE_CHANGE_PROTECTION; /* Prefer extensible API but fall back to older migration APIs if params * only contains parameters which were supported by the older API. */ - if (VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, - VIR_DRV_FEATURE_MIGRATION_PARAMS) && - VIR_DRV_SUPPORTS_FEATURE(dconn->driver, dconn, - VIR_DRV_FEATURE_MIGRATION_PARAMS)) { + if (virDrvSupportsFeature(domain->conn, + VIR_DRV_FEATURE_MIGRATION_PARAMS, &err) && + virDrvSupportsFeature(dconn, + VIR_DRV_FEATURE_MIGRATION_PARAMS, &err)) { + if (err) + goto error; + VIR_DEBUG("Using migration protocol 3 with extensible parameters"); ddomain = virDomainMigrateVersion3Params(domain, dconn, params, nparams, flags); @@ -3939,17 +3947,22 @@ virDomainMigrate3(virDomainPtr domain, goto error; } - if (VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, - VIR_DRV_FEATURE_MIGRATION_V3) && - VIR_DRV_SUPPORTS_FEATURE(dconn->driver, dconn, - VIR_DRV_FEATURE_MIGRATION_V3)) { + if (virDrvSupportsFeature(domain->conn, + VIR_DRV_FEATURE_MIGRATION_V3, &err) && + virDrvSupportsFeature(dconn, VIR_DRV_FEATURE_MIGRATION_V3, &err)) { + if (err) + goto error; + VIR_DEBUG("Using migration protocol 3"); ddomain = virDomainMigrateVersion3(domain, dconn, dxml, flags, dname, uri, bandwidth); - } else if (VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, - VIR_DRV_FEATURE_MIGRATION_V2) && - VIR_DRV_SUPPORTS_FEATURE(dconn->driver, dconn, - VIR_DRV_FEATURE_MIGRATION_V2)) { + } else if (virDrvSupportsFeature(domain->conn, + VIR_DRV_FEATURE_MIGRATION_V2, &err) && + virDrvSupportsFeature(dconn, + VIR_DRV_FEATURE_MIGRATION_V2, &err)) { + if (err) + goto error; + VIR_DEBUG("Using migration protocol 2"); if (dxml) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", @@ -3959,10 +3972,13 @@ virDomainMigrate3(virDomainPtr domain, } ddomain = virDomainMigrateVersion2(domain, dconn, flags, dname, uri, bandwidth); - } else if (VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, - VIR_DRV_FEATURE_MIGRATION_V1) && - VIR_DRV_SUPPORTS_FEATURE(dconn->driver, dconn, - VIR_DRV_FEATURE_MIGRATION_V1)) { + } else if (virDrvSupportsFeature(domain->conn, + VIR_DRV_FEATURE_MIGRATION_V1, &err) && + virDrvSupportsFeature(dconn, + VIR_DRV_FEATURE_MIGRATION_V1, &err)) { + if (err) + goto error; + VIR_DEBUG("Using migration protocol 1"); if (dxml) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", -- 1.8.3.1

2 2