qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Vincent KHERBACHE <vincent.kherbache@inria.fr>
To: qemu-devel@nongnu.org
Cc: pbonzini@redhat.com, gleb@redhat.com
Subject: [Qemu-devel]  [PATCH] kvm: fix kvm_set_migration_log() behavior
Date: Tue, 18 Feb 2014 13:33:38 +0100	[thread overview]
Message-ID: <1392726818-14606-1-git-send-email-vincent.kherbache@inria.fr> (raw)

The test (!!(mem->flags & KVM_MEM_LOG_DIRTY_PAGES) == enable) is wrong because 
the condition is valid when enable = 0 and current dirty log memory flag is set.
As a consequence kvm_log_global_stop() does not stop the KVM dirty log
tracking: kvm_set_migration_log(0) didn't do its job.
So instead I propose to use kvm_slot_dirty_pages_log_change() which correctly
compare the memory flags (old/new).

Signed-off-by: Vincent KHERBACHE <vincent.kherbache@inria.fr>
---
 kvm-all.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/kvm-all.c b/kvm-all.c
index 2ca9143..f104f87 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -355,7 +355,7 @@ static int kvm_set_migration_log(int enable)
 {
     KVMState *s = kvm_state;
     KVMSlot *mem;
-    int i, err;
+    int i, err = 0;
 
     s->migration_log = enable;
 
@@ -365,15 +365,9 @@ static int kvm_set_migration_log(int enable)
         if (!mem->memory_size) {
             continue;
         }
-        if (!!(mem->flags & KVM_MEM_LOG_DIRTY_PAGES) == enable) {
-            continue;
-        }
-        err = kvm_set_user_memory_region(s, mem);
-        if (err) {
-            return err;
-        }
+        err = kvm_slot_dirty_pages_log_change(mem, (bool)enable);
     }
-    return 0;
+    return err;
 }
 
 /* get kvm's dirty pages bitmap and update qemu's */
-- 
1.8.3.1

             reply	other threads:[~2014-02-18 12:34 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-18 12:33 Vincent KHERBACHE [this message]
2014-02-18 13:23 ` [Qemu-devel] [PATCH] kvm: fix kvm_set_migration_log() behavior Eric Blake
2014-02-18 14:34   ` Vincent KHERBACHE
2014-02-18 16:16 ` Paolo Bonzini
2014-02-18 17:58   ` Vincent KHERBACHE

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1392726818-14606-1-git-send-email-vincent.kherbache@inria.fr \
    --to=vincent.kherbache@inria.fr \
    --cc=gleb@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).