yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
0a122b
From 66ab02bc657f102955f3077914bbaf00bc6546e9 Mon Sep 17 00:00:00 2001
0a122b
From: Juan Quintela <quintela@redhat.com>
0a122b
Date: Tue, 14 Jan 2014 15:07:15 +0100
0a122b
Subject: [PATCH 04/40] exec: use accessor function to know if memory is dirty
0a122b
MIME-Version: 1.0
0a122b
Content-Type: text/plain; charset=UTF-8
0a122b
Content-Transfer-Encoding: 8bit
0a122b
0a122b
RH-Author: Juan Quintela <quintela@redhat.com>
0a122b
Message-id: <1389712071-23303-5-git-send-email-quintela@redhat.com>
0a122b
Patchwork-id: 56662
0a122b
O-Subject: [RHEL7 qemu-kvm PATCH 04/40] exec: use accessor function to know if memory is dirty
0a122b
Bugzilla: 997559
0a122b
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
0a122b
RH-Acked-by: Orit Wasserman <owasserm@redhat.com>
0a122b
RH-Acked-by: Dr. David Alan Gilbert (git) <dgilbert@redhat.com>
0a122b
0a122b
Signed-off-by: Juan Quintela <quintela@redhat.com>
0a122b
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
0a122b
Reviewed-by: Eric Blake <eblake@redhat.com>
0a122b
(cherry picked from commit 06567942e5e92cc649b608205d5d31ff3ac21c58)
0a122b
0a122b
Conflicts:
0a122b
	exec.c
0a122b
0a122b
Conflict is due to the following comming irrelevant to migration:
0a122b
0a122b
ommit 4917cf44326a1bda2fd7f27303aff7a25ad86518
0a122b
Author: Andreas Färber <afaerber@suse.de>
0a122b
Date:   Mon May 27 05:17:50 2013 +0200
0a122b
0a122b
    cpu: Replace cpu_single_env with CPUState current_cpu
0a122b
0a122b
Signed-off-by: Juan Quintela <quintela@trasno.org>
0a122b
---
0a122b
 exec.c | 2 +-
0a122b
 1 file changed, 1 insertion(+), 1 deletion(-)
0a122b
0a122b
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
0a122b
---
0a122b
 exec.c |    2 +-
0a122b
 1 files changed, 1 insertions(+), 1 deletions(-)
0a122b
0a122b
diff --git a/exec.c b/exec.c
0a122b
index 571cea4..389888d 100644
0a122b
--- a/exec.c
0a122b
+++ b/exec.c
0a122b
@@ -1505,7 +1505,7 @@ static void notdirty_mem_write(void *opaque, hwaddr ram_addr,
0a122b
     cpu_physical_memory_set_dirty_flags(ram_addr, dirty_flags);
0a122b
     /* we remove the notdirty callback only if the code has been
0a122b
        flushed */
0a122b
-    if (dirty_flags == 0xff)
0a122b
+    if (cpu_physical_memory_is_dirty(ram_addr))
0a122b
         tlb_set_dirty(cpu_single_env, cpu_single_env->mem_io_vaddr);
0a122b
 }
0a122b
 
0a122b
-- 
0a122b
1.7.1
0a122b