From: Brendan Cully Subject: [PATCH] ioemu: allow logdirty commands while paused (unbreaks 60dbe1+8f09f4) Date: Tue, 22 Sep 2009 10:44:44 -0700 Message-ID: <1253642015.30281.TMDA@zakopane.cs.ubc.ca> Return-path: Resent-Message-ID: <20090922175334.GD6655@kremvax.cs.ubc.ca> Resent-To: Xen Developers List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com List-Id: xen-devel@lists.xenproject.org 60dbe1+8f09f4 breaks HVM live migration: 60dbe1 causes xc_save to attempt to disable logdirty mode while qemu is paused. 8f09f4 disables most commands, including logdirty, while the domain is paused. So xc_save times out waiting for qemu to respond to the logdirty disable command, and live migration fails. Logdirty commands issued while paused should not affect the stability of ioemu. Signed-off-by: Brendan Cully --- xenstore.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xenstore.c b/xenstore.c index e091259..4dcc4d1 100644 --- a/xenstore.c +++ b/xenstore.c @@ -864,6 +864,11 @@ void xenstore_process_event(void *opaque) goto out; } + if (!strcmp(vec[XS_WATCH_TOKEN], "logdirty")) { + xenstore_process_logdirty_event(); + goto out; + } + /* if we are paused don't process anything else */ if (xen_pause_requested) goto out; @@ -874,11 +879,6 @@ void xenstore_process_event(void *opaque) xenstore_watch_callbacks[i].cb(vec[XS_WATCH_TOKEN], xenstore_watch_callbacks[i].opaque); - if (!strcmp(vec[XS_WATCH_TOKEN], "logdirty")) { - xenstore_process_logdirty_event(); - goto out; - } - if (strncmp(vec[XS_WATCH_TOKEN], "hd", 2) || strlen(vec[XS_WATCH_TOKEN]) != 3) goto out; -- 1.6.0.4