8021Qbh: use preassociate-rr during the migration prepare stage

This patch introduces PREASSOCIATE-RR during incoming VM migration on the
destination host. This is similar to the usage of PREASSOCIATE during
migration in 8021qbg libvirt code today. PREASSOCIATE-RR is a VDP operation.
With the latest at IEEE, 8021qbh will need to support VDP operations.
A corresponding enic driver patch to support PREASSOCIATE-RR for 8021qbh
will be posted for net-next-2.6 inclusion soon.

diff --git a/src/util/macvtap.c b/src/util/macvtap.c
index 2d3ff8714d206daab8462db924bf4c0f15151b68..346eaf69c5ac3820c2f6e4310c63b89a5294885f 100644 (file)
--- a/src/util/macvtap.c
+++ b/src/util/macvtap.c
@@ -87,6 +87,7 @@ enum virVirtualPortOp {
     ASSOCIATE = 0x1,
     DISASSOCIATE = 0x2,
     PREASSOCIATE = 0x3,
+    PREASSOCIATE_RR = 0x4,
 };
 
 
@@ -1452,6 +1453,7 @@ doPortProfileOp8021Qbh(const char *ifname,
     }
 
     switch (virtPortOp) {
+    case PREASSOCIATE_RR:
     case ASSOCIATE:
         rc = virGetHostUUID(hostuuid);
         if (rc)
@@ -1465,7 +1467,9 @@ doPortProfileOp8021Qbh(const char *ifname,
                                    vm_uuid,
                                    hostuuid,
                                    vf,
-                                   PORT_REQUEST_ASSOCIATE);
+                                   (virtPortOp == PREASSOCIATE_RR) ?
+                                    PORT_REQUEST_PREASSOCIATE_RR
+                                    : PORT_REQUEST_ASSOCIATE);
         if (rc == -ETIMEDOUT)
             /* Association timed out, disassociate */
             doPortProfileOpCommon(nltarget_kernel, NULL, ifindex,
@@ -1553,10 +1557,11 @@ vpAssociatePortProfileId(const char *macvtap_ifname,
         break;
 
     case VIR_VIRTUALPORT_8021QBH:
-        /* avoid associating twice */
-        if (vmOp != VIR_VM_OP_MIGRATE_IN_FINISH)
-            rc = doPortProfileOp8021Qbh(linkdev, macvtap_macaddr,
-                                        virtPort, vmuuid, ASSOCIATE);
+        rc = doPortProfileOp8021Qbh(linkdev, macvtap_macaddr,
+                                    virtPort, vmuuid,
+                                    (vmOp == VIR_VM_OP_MIGRATE_IN_START)
+                                      ? PREASSOCIATE_RR
+                                      : ASSOCIATE);
         if (vmOp != VIR_VM_OP_MIGRATE_IN_START && !rc)
             ifaceUp(linkdev);
         break;