[v13,25/26] setup and control colo proxy on secondary side

Commit Message

Changlong Xie March 25, 2016, 6:44 a.m. UTC

From: Wen Congyang <[e-mail]>

Signed-off-by: Yang Hongyang <[e-mail]>
Signed-off-by: Wen Congyang <[e-mail]>
Signed-off-by: Changlong Xie <[e-mail]>
---
 tools/libxl/libxl_colo_restore.c | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

Comments

Ian Jackson March 30, 2016, 2:24 p.m. UTC | #1

Changlong Xie writes ("[PATCH v13 25/26] setup and control colo proxy on secondary side"):
> From: Wen Congyang <[e-mail]>
> 
> Signed-off-by: Yang Hongyang <[e-mail]>
> Signed-off-by: Wen Congyang <[e-mail]>
> Signed-off-by: Changlong Xie <[e-mail]>

I think I acked this in v12.  I guess you probably overlooked that,
but your v13 00/25 says

  p25, Add A-B

Can you please check that you didn't mistakenly add the acked-by to
the wrong patch ?

Thanks,
Ian.

Changlong Xie March 31, 2016, 2:19 a.m. UTC | #2

On 03/30/2016 10:24 PM, Ian Jackson wrote:
> Changlong Xie writes ("[PATCH v13 25/26] setup and control colo proxy on secondary side"):
>> From: Wen Congyang <[e-mail]>
>>
>> Signed-off-by: Yang Hongyang <[e-mail]>
>> Signed-off-by: Wen Congyang <[e-mail]>
>> Signed-off-by: Changlong Xie <[e-mail]>
>
> I think I acked this in v12.  I guess you probably overlooked that,
> but your v13 00/25 says
>
>    p25, Add A-B
>
> Can you please check that you didn't mistakenly add the acked-by to
> the wrong patch ?

Hi Ian

I've checked all patches. It's my fault, i just forgot to add A-B in 
this patch.

Thanks
	-Xie
>
> Thanks,
> Ian.
>
>
> .
>

Patch

diff --git a/tools/libxl/libxl_colo_restore.c b/tools/libxl/libxl_colo_restore.c
index 2ab69ed..c8ad796 100644
--- a/tools/libxl/libxl_colo_restore.c
+++ b/tools/libxl/libxl_colo_restore.c
@@ -37,9 +37,11 @@  struct libxl__colo_restore_checkpoint_state {
                      int);
 };
 
+extern const libxl__checkpoint_device_instance_ops colo_restore_device_nic;
 extern const libxl__checkpoint_device_instance_ops colo_restore_device_qdisk;
 
 static const libxl__checkpoint_device_instance_ops *colo_restore_ops[] = {
+    &colo_restore_device_nic,
     &colo_restore_device_qdisk,
     NULL,
 };
@@ -140,8 +142,14 @@  static int init_device_subkind(libxl__checkpoint_devices_state *cds)
     int rc;
     STATE_AO_GC(cds->ao);
 
+    rc = init_subkind_colo_nic(cds);
+    if (rc) goto out;
+
     rc = init_subkind_qdisk(cds);
-    if (rc)  goto out;
+    if (rc) {
+        cleanup_subkind_colo_nic(cds);
+        goto out;
+    }
 
     rc = 0;
 out:
@@ -153,6 +161,7 @@  static void cleanup_device_subkind(libxl__checkpoint_devices_state *cds)
     /* cleanup device subkind-specific state in the libxl ctx */
     STATE_AO_GC(cds->ao);
 
+    cleanup_subkind_colo_nic(cds);
     cleanup_subkind_qdisk(cds);
 }
 
@@ -343,6 +352,8 @@  static void colo_restore_teardown_devices_done(libxl__egc *egc,
     if (crcs->teardown_devices)
         cleanup_device_subkind(cds);
 
+    colo_proxy_teardown(&crs->cps);
+
     rc = crcs->saved_rc;
     if (!rc) {
         crcs->callback = do_failover_done;
@@ -596,6 +607,8 @@  static void colo_restore_preresume_cb(libxl__egc *egc,
         }
     }
 
+    colo_proxy_preresume(&crs->cps);
+
     colo_restore_resume_vm(egc, crcs);
 
     return;
@@ -632,6 +645,8 @@  static void colo_resume_vm_done(libxl__egc *egc,
 
     crcs->status = LIBXL_COLO_RESUMED;
 
+    colo_proxy_postresume(&crs->cps);
+
     /* avoid calling stream->completion_callback() more than once */
     if (crs->saved_cb) {
         dcs->callback = crs->saved_cb;
@@ -753,13 +768,20 @@  static void colo_setup_checkpoint_devices(libxl__egc *egc,
 
     STATE_AO_GC(crs->ao);
 
-    /* TODO: nic support */
-    cds->device_kind_flags = (1 << LIBXL__DEVICE_KIND_VBD);
+    cds->device_kind_flags = (1 << LIBXL__DEVICE_KIND_VIF) |
+                             (1 << LIBXL__DEVICE_KIND_VBD);
     cds->callback = colo_restore_setup_cds_done;
     cds->ao = ao;
     cds->domid = crs->domid;
     cds->ops = colo_restore_ops;
 
+    crs->cps.ao = ao;
+    if (colo_proxy_setup(&crs->cps)) {
+        LOG(ERROR, "COLO: failed to setup colo proxy for guest with domid %u",
+            cds->domid);
+        goto out;
+    }
+
     if (init_device_subkind(cds))
         goto out;