|
 |
958e1b |
From 2611b6a31041da5b9ed3793152d309aae77932bb Mon Sep 17 00:00:00 2001
|
|
|
958e1b |
From: "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com>
|
|
|
958e1b |
Date: Wed, 22 Oct 2014 09:46:35 +0200
|
|
|
958e1b |
Subject: [PATCH 4/6] Introduce cpu_clean_all_dirty
|
|
|
958e1b |
|
|
|
958e1b |
Message-id: <1413971197-4624-4-git-send-email-dgilbert@redhat.com>
|
|
|
958e1b |
Patchwork-id: 61791
|
|
|
958e1b |
O-Subject: [RHEL-7.1 qemu-kvm PATCH 3/5] Introduce cpu_clean_all_dirty
|
|
|
958e1b |
Bugzilla: 1098602 1130428
|
|
|
958e1b |
RH-Acked-by: Marcelo Tosatti <mtosatti@redhat.com>
|
|
|
958e1b |
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
958e1b |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
958e1b |
|
|
|
958e1b |
From: Marcelo Tosatti <mtosatti@redhat.com>
|
|
|
958e1b |
|
|
|
958e1b |
Introduce cpu_clean_all_dirty, to force subsequent cpu_synchronize_all_states
|
|
|
958e1b |
to read in-kernel register state.
|
|
|
958e1b |
|
|
|
958e1b |
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
|
|
|
958e1b |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
958e1b |
(cherry picked from commit de9d61e83d43be9069e6646fa9d57a3f47779d28)
|
|
|
958e1b |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
958e1b |
|
|
|
958e1b |
Conflicts:
|
|
|
958e1b |
cpus.c
|
|
|
958e1b |
kvm-all.c
|
|
|
958e1b |
|
|
|
958e1b |
dgilbert: Had to replace CPU_FOREACH by a loop
|
|
|
958e1b |
|
|
|
958e1b |
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
958e1b |
---
|
|
|
958e1b |
cpus.c | 9 +++++++++
|
|
|
958e1b |
include/sysemu/cpus.h | 1 +
|
|
|
958e1b |
include/sysemu/kvm.h | 8 ++++++++
|
|
|
958e1b |
kvm-all.c | 5 +++++
|
|
|
958e1b |
4 files changed, 23 insertions(+)
|
|
|
958e1b |
|
|
|
958e1b |
diff --git a/cpus.c b/cpus.c
|
|
|
958e1b |
index caccf5a..3948cdf 100644
|
|
|
958e1b |
--- a/cpus.c
|
|
|
958e1b |
+++ b/cpus.c
|
|
|
958e1b |
@@ -437,6 +437,15 @@ bool cpu_is_stopped(CPUState *cpu)
|
|
|
958e1b |
return !runstate_is_running() || cpu->stopped;
|
|
|
958e1b |
}
|
|
|
958e1b |
|
|
|
958e1b |
+void cpu_clean_all_dirty(void)
|
|
|
958e1b |
+{
|
|
|
958e1b |
+ CPUArchState *cpu;
|
|
|
958e1b |
+
|
|
|
958e1b |
+ for (cpu = first_cpu; cpu; cpu = cpu->next_cpu) {
|
|
|
958e1b |
+ cpu_clean_state(ENV_GET_CPU(cpu));
|
|
|
958e1b |
+ }
|
|
|
958e1b |
+}
|
|
|
958e1b |
+
|
|
|
958e1b |
static int do_vm_stop(RunState state)
|
|
|
958e1b |
{
|
|
|
958e1b |
int ret = 0;
|
|
|
958e1b |
diff --git a/include/sysemu/cpus.h b/include/sysemu/cpus.h
|
|
|
958e1b |
index 6502488..4f8a3df 100644
|
|
|
958e1b |
--- a/include/sysemu/cpus.h
|
|
|
958e1b |
+++ b/include/sysemu/cpus.h
|
|
|
958e1b |
@@ -10,6 +10,7 @@ void cpu_stop_current(void);
|
|
|
958e1b |
void cpu_synchronize_all_states(void);
|
|
|
958e1b |
void cpu_synchronize_all_post_reset(void);
|
|
|
958e1b |
void cpu_synchronize_all_post_init(void);
|
|
|
958e1b |
+void cpu_clean_all_dirty(void);
|
|
|
958e1b |
|
|
|
958e1b |
void qtest_clock_warp(int64_t dest);
|
|
|
958e1b |
|
|
|
958e1b |
diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
|
|
|
958e1b |
index e722027..0c6833f 100644
|
|
|
958e1b |
--- a/include/sysemu/kvm.h
|
|
|
958e1b |
+++ b/include/sysemu/kvm.h
|
|
|
958e1b |
@@ -274,6 +274,7 @@ int kvm_physical_memory_addr_from_host(KVMState *s, void *ram_addr,
|
|
|
958e1b |
|
|
|
958e1b |
void kvm_cpu_synchronize_post_reset(CPUState *cpu);
|
|
|
958e1b |
void kvm_cpu_synchronize_post_init(CPUState *cpu);
|
|
|
958e1b |
+void kvm_cpu_clean_state(CPUState *cpu);
|
|
|
958e1b |
|
|
|
958e1b |
static inline void cpu_synchronize_post_reset(CPUState *cpu)
|
|
|
958e1b |
{
|
|
|
958e1b |
@@ -289,6 +290,13 @@ static inline void cpu_synchronize_post_init(CPUState *cpu)
|
|
|
958e1b |
}
|
|
|
958e1b |
}
|
|
|
958e1b |
|
|
|
958e1b |
+static inline void cpu_clean_state(CPUState *cpu)
|
|
|
958e1b |
+{
|
|
|
958e1b |
+ if (kvm_enabled()) {
|
|
|
958e1b |
+ kvm_cpu_clean_state(cpu);
|
|
|
958e1b |
+ }
|
|
|
958e1b |
+}
|
|
|
958e1b |
+
|
|
|
958e1b |
int kvm_irqchip_add_msi_route(KVMState *s, MSIMessage msg);
|
|
|
958e1b |
int kvm_irqchip_update_msi_route(KVMState *s, int virq, MSIMessage msg);
|
|
|
958e1b |
void kvm_irqchip_release_virq(KVMState *s, int virq);
|
|
|
958e1b |
diff --git a/kvm-all.c b/kvm-all.c
|
|
|
958e1b |
index f7f621b..fc6e3ab 100644
|
|
|
958e1b |
--- a/kvm-all.c
|
|
|
958e1b |
+++ b/kvm-all.c
|
|
|
958e1b |
@@ -1615,6 +1615,11 @@ void kvm_cpu_synchronize_post_init(CPUState *cpu)
|
|
|
958e1b |
cpu->kvm_vcpu_dirty = false;
|
|
|
958e1b |
}
|
|
|
958e1b |
|
|
|
958e1b |
+void kvm_cpu_clean_state(CPUState *cpu)
|
|
|
958e1b |
+{
|
|
|
958e1b |
+ cpu->kvm_vcpu_dirty = false;
|
|
|
958e1b |
+}
|
|
|
958e1b |
+
|
|
|
958e1b |
int kvm_cpu_exec(CPUArchState *env)
|
|
|
958e1b |
{
|
|
|
958e1b |
CPUState *cpu = ENV_GET_CPU(env);
|
|
|
958e1b |
--
|
|
|
958e1b |
1.8.3.1
|
|
|
958e1b |
|