qemu: deprecate QEMU_CAPS_IPV6_MIGRATION

Implied by QEMU >= 1.2.0.
Signed-off-by: NJán Tomko <jtomko@redhat.com>
Reviewed-by: NAndrea Bolognani <abologna@redhat.com>

src/qemu/qemu_capabilities.c

@@ -3625,7 +3625,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);

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 */

src/qemu/qemu_migration.c

@@ -2085,7 +2085,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 };
@@ -2095,16 +2094,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"));
@@ -2115,7 +2107,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
              */

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>