[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] tools/libxenguest: Fix migration's debug option


  • To: Xen-devel <xen-devel@xxxxxxxxxxxxxxxxxxxx>
  • From: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
  • Date: Fri, 2 Jul 2021 20:03:42 +0100
  • Authentication-results: esa1.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none
  • Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Ian Jackson <iwj@xxxxxxxxxxxxxx>, Wei Liu <wl@xxxxxxx>, Olaf Hering <olaf@xxxxxxxxx>
  • Delivery-date: Fri, 02 Jul 2021 19:03:54 +0000
  • Ironport-hdrordr: A9a23:CAGIEql2HENup4MFrxNEeSw2tFXpDfIk3DAbv31ZSRFFG/Fxl6 iV/cjztCWE7gr5N0tQ+uxoVJPufZq+z+8T3WByB8bBYOCOggLBR+sOgbcKqweQfxEWndQ86U 4PScZD4aXLfD1Hsfo=
  • Ironport-sdr: Y3L9KClQ1ZJnN9B06enohAJUu2Ta2Qkokk56xo83VZvvCU8ypoUZxh3VQZeCVgmIM1GFuuLzV/ EWgF2qO8KKmygTzDozzfUR51wsBm+eu6fqwWtSlqaQ3+FkjM3+1izAwHB7ioYUvitAJkULp6G8 JOr5OrOh7DaHg47dmDdzyxsQSrGxItvwXNJt6VnW0xz6/kWcdBeojyrl6Di2jil2CN8souhyWr Xt14Q8QwAmTLPErsnxwktX+InRZOCcCUCjm1t7LTIdEQ2ieqBQfqx6a6BzHvyJ93Dzr0JksZ+N Ki4=
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

The code has gone through many refactors, but the first refactor was the one
which broke it by inverting the check with respect to checkpointed streams.

Fixes: 7449fb36c6c8 ("migration/save: pass checkpointed_stream from libxl to 
libxc")
Reported-by: Olaf Hering <olaf@xxxxxxxxx>
Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
CC: Ian Jackson <iwj@xxxxxxxxxxxxxx>
CC: Wei Liu <wl@xxxxxxx>
CC: Olaf Hering <olaf@xxxxxxxxx>

`xl migrate --debug` might not be perfect, but this at least brings it back to
mostly working.

I don't think dropping it is a sensible move.  In particular, it is invaluable
for testing the logdirty infrastructure when migrating a memtest VM.

If anyone has a clever idea to fix the grant problem, then we can.  It is
after all a debug option, without any specific prescribed behaviour.
---
 tools/libs/guest/xg_sr_save.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/libs/guest/xg_sr_save.c b/tools/libs/guest/xg_sr_save.c
index 2ba7c3200cd5..f0e2bd048d37 100644
--- a/tools/libs/guest/xg_sr_save.c
+++ b/tools/libs/guest/xg_sr_save.c
@@ -752,7 +752,7 @@ static int send_domain_memory_live(struct xc_sr_context 
*ctx)
     if ( rc )
         goto out;
 
-    if ( ctx->save.debug && ctx->stream_type != XC_STREAM_PLAIN )
+    if ( ctx->save.debug && ctx->stream_type == XC_STREAM_PLAIN )
     {
         rc = verify_frames(ctx);
         if ( rc )
-- 
2.11.0




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.