[libvirt] [libvirt PATCH v2 38/44] Deprecate QEMU_CAPS_IPV6_MIGRATION

Implied by QEMU >= 1.2.0. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_migration.c | 10 +--------- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 - 28 files changed, 2 insertions(+), 36 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index ca8fdf62a8..ce9fad52a3 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3629,7 +3629,6 @@ static qemuMonitorCallbacks callbacks = { static void virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) { - virQEMUCapsSet(qemuCaps, QEMU_CAPS_IPV6_MIGRATION); virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_OPT); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DUMP_GUEST_CORE); virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC_SHARE_POLICY); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 645156c42f..c57554db4f 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -237,7 +237,7 @@ typedef enum { QEMU_CAPS_SCSI_MEGASAS, /* -device megasas */ /* 135 */ - QEMU_CAPS_IPV6_MIGRATION, /* -incoming [::] */ + X_QEMU_CAPS_IPV6_MIGRATION, /* -incoming [::] */ QEMU_CAPS_MACHINE_OPT, /* -machine xxxx*/ QEMU_CAPS_MACHINE_USB_OPT, /* -machine xxx,usb=on/off */ QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, /* -tpmdev passthrough */ diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index e5231555de..d301f3c2ba 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2304,7 +2304,6 @@ qemuMigrationDstPrepare(virDomainObjPtr vm, } else { bool encloseAddress = false; bool hostIPv6Capable = false; - bool qemuIPv6Capable = false; struct addrinfo *info = NULL; struct addrinfo hints = { .ai_flags = AI_ADDRCONFIG, .ai_socktype = SOCK_STREAM }; @@ -2314,16 +2313,9 @@ qemuMigrationDstPrepare(virDomainObjPtr vm, freeaddrinfo(info); hostIPv6Capable = true; } - qemuIPv6Capable = virQEMUCapsGet(priv->qemuCaps, - QEMU_CAPS_IPV6_MIGRATION); if (listenAddress) { if (virSocketAddrNumericFamily(listenAddress) == AF_INET6) { - if (!qemuIPv6Capable) { - virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("qemu isn't capable of IPv6")); - goto cleanup; - } if (!hostIPv6Capable) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", _("host isn't capable of IPv6")); @@ -2334,7 +2326,7 @@ qemuMigrationDstPrepare(virDomainObjPtr vm, } else { /* listenAddress is a hostname or IPv4 */ } - } else if (qemuIPv6Capable && hostIPv6Capable) { + } else if (hostIPv6Capable) { /* Listen on :: instead of 0.0.0.0 if QEMU understands it * and there is at least one IPv6 address configured */ diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index 21f0d7ded8..37baf9e19a 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -68,7 +68,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='ipv6-migration'/> <flag name='machine-opt'/> <flag name='machine-usb-opt'/> <flag name='pci-bridge'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index a903d80e2c..230503fcd4 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -69,7 +69,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='ipv6-migration'/> <flag name='machine-opt'/> <flag name='machine-usb-opt'/> <flag name='pci-bridge'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index 197f43846d..db783df5dd 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -69,7 +69,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='ipv6-migration'/> <flag name='machine-opt'/> <flag name='machine-usb-opt'/> <flag name='pci-bridge'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index c8d2daa778..30876c65ec 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -69,7 +69,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='ipv6-migration'/> <flag name='machine-opt'/> <flag name='machine-usb-opt'/> <flag name='tpm-passthrough'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index 1d9b663268..d900d9e34c 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -53,7 +53,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='ipv6-migration'/> <flag name='machine-opt'/> <flag name='machine-usb-opt'/> <flag name='pci-bridge'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 4b717bf5f0..23a9127edd 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -52,7 +52,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='ipv6-migration'/> <flag name='machine-opt'/> <flag name='machine-usb-opt'/> <flag name='nvram'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index 225f3803cb..d4a04ef112 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -35,7 +35,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='virtio-ccw'/> - <flag name='ipv6-migration'/> <flag name='machine-opt'/> <flag name='machine-usb-opt'/> <flag name='pci-bridge'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 0573cd4718..ea2d38b233 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -69,7 +69,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='ipv6-migration'/> <flag name='machine-opt'/> <flag name='machine-usb-opt'/> <flag name='tpm-passthrough'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index 32d4fefc97..0c4a118bd0 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -35,7 +35,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='virtio-ccw'/> - <flag name='ipv6-migration'/> <flag name='machine-opt'/> <flag name='machine-usb-opt'/> <flag name='pci-bridge'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index 4e151ba151..aec0244c28 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -53,7 +53,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='ipv6-migration'/> <flag name='machine-opt'/> <flag name='machine-usb-opt'/> <flag name='pci-bridge'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index 19cd3efa1a..29822cda82 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -52,7 +52,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='ipv6-migration'/> <flag name='machine-opt'/> <flag name='machine-usb-opt'/> <flag name='nvram'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index 586b682900..beeca334eb 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -35,7 +35,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='virtio-ccw'/> - <flag name='ipv6-migration'/> <flag name='machine-opt'/> <flag name='machine-usb-opt'/> <flag name='pci-bridge'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 166c7d4739..2dc1922d9f 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -67,7 +67,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='ipv6-migration'/> <flag name='machine-opt'/> <flag name='machine-usb-opt'/> <flag name='tpm-passthrough'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index ff5f820eb1..e6be20b2ba 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -69,7 +69,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='ipv6-migration'/> <flag name='machine-opt'/> <flag name='machine-usb-opt'/> <flag name='tpm-passthrough'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index e9aef8e36f..321e3dccbe 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -69,7 +69,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='ipv6-migration'/> <flag name='machine-opt'/> <flag name='machine-usb-opt'/> <flag name='tpm-passthrough'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 815ad2e7f1..09289e65b2 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -55,7 +55,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='ipv6-migration'/> <flag name='machine-opt'/> <flag name='machine-usb-opt'/> <flag name='pci-bridge'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index da7de1d7fb..2dba28228a 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -52,7 +52,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='ipv6-migration'/> <flag name='machine-opt'/> <flag name='machine-usb-opt'/> <flag name='nvram'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index 77cc540d7d..f5c6ecd6aa 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -69,7 +69,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='ipv6-migration'/> <flag name='machine-opt'/> <flag name='machine-usb-opt'/> <flag name='tpm-passthrough'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index cfdee30b3f..22a87c596e 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -35,7 +35,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='virtio-ccw'/> - <flag name='ipv6-migration'/> <flag name='machine-opt'/> <flag name='machine-usb-opt'/> <flag name='pci-bridge'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index ba7a5ebb58..a386d75ce7 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -69,7 +69,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='ipv6-migration'/> <flag name='machine-opt'/> <flag name='machine-usb-opt'/> <flag name='tpm-passthrough'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index c547abef73..9a682f3f06 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -35,7 +35,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='virtio-ccw'/> - <flag name='ipv6-migration'/> <flag name='machine-opt'/> <flag name='machine-usb-opt'/> <flag name='pci-bridge'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 4d4e66160d..c4488303fa 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -69,7 +69,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='ipv6-migration'/> <flag name='machine-opt'/> <flag name='machine-usb-opt'/> <flag name='tpm-passthrough'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index c37d90fac5..a9760cebda 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -51,7 +51,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='ipv6-migration'/> <flag name='machine-opt'/> <flag name='machine-usb-opt'/> <flag name='nvram'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index 665122e72a..f2a591787b 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -35,7 +35,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='virtio-ccw'/> - <flag name='ipv6-migration'/> <flag name='machine-opt'/> <flag name='machine-usb-opt'/> <flag name='pci-bridge'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 5c0e8cddf5..6f743a02ea 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -69,7 +69,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='ipv6-migration'/> <flag name='machine-opt'/> <flag name='machine-usb-opt'/> <flag name='tpm-passthrough'/> -- 2.16.1