yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
218e99
From 0fb4264531471230dfe37f1c04d38cd46e38027a Mon Sep 17 00:00:00 2001
218e99
From: Laszlo Ersek <lersek@redhat.com>
218e99
Date: Mon, 12 Aug 2013 15:59:32 +0200
218e99
Subject: cpu: Turn cpu_paging_enabled() into a CPUState hook
218e99
218e99
RH-Author: Laszlo Ersek <lersek@redhat.com>
218e99
Message-id: <1376323180-12863-3-git-send-email-lersek@redhat.com>
218e99
Patchwork-id: 53161
218e99
O-Subject: [RHEL-7 qemu-kvm PATCH 02/10] cpu: Turn cpu_paging_enabled() into a CPUState hook
218e99
Bugzilla: 981582
218e99
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
218e99
RH-Acked-by: Radim Krcmar <rkrcmar@redhat.com>
218e99
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
218e99
218e99
Relocate assignment of x86 get_arch_id to have all hooks in one place.
218e99
218e99
Reviewed-by: Jens Freimann <jfrei@linux.vnet.ibm.com>
218e99
Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
218e99
Signed-off-by: Andreas Färber <afaerber@suse.de>
218e99
(cherry picked from commit 444d55907871f88276a654fc7fdc8c7db95f4b59)
218e99
218e99
Conflicts (due to RHEL-7 commit c93d9248, "target-i386: Disable PMU CPUID
218e99
leaf by default"):
218e99
218e99
	target-i386/cpu.c
218e99
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
218e99
218e99
diff --git a/include/qom/cpu.h b/include/qom/cpu.h
218e99
index 46465e9..490f5f1 100644
218e99
--- a/include/qom/cpu.h
218e99
+++ b/include/qom/cpu.h
218e99
@@ -48,6 +48,7 @@ typedef struct CPUState CPUState;
218e99
  * @reset: Callback to reset the #CPUState to its initial state.
218e99
  * @do_interrupt: Callback for interrupt handling.
218e99
  * @get_arch_id: Callback for getting architecture-dependent CPU ID.
218e99
+ * @get_paging_enabled: Callback for inquiring whether paging is enabled.
218e99
  * @vmsd: State description for migration.
218e99
  *
218e99
  * Represents a CPU family or model.
218e99
@@ -62,6 +63,7 @@ typedef struct CPUClass {
218e99
     void (*reset)(CPUState *cpu);
218e99
     void (*do_interrupt)(CPUState *cpu);
218e99
     int64_t (*get_arch_id)(CPUState *cpu);
218e99
+    bool (*get_paging_enabled)(const CPUState *cpu);
218e99
 
218e99
     const struct VMStateDescription *vmsd;
218e99
     int (*write_elf64_note)(WriteCoreDumpFunction f, CPUState *cpu,
218e99
@@ -138,6 +140,14 @@ struct CPUState {
218e99
 };
218e99
 
218e99
 /**
218e99
+ * cpu_paging_enabled:
218e99
+ * @cpu: The CPU whose state is to be inspected.
218e99
+ *
218e99
+ * Returns: %true if paging is enabled, %false otherwise.
218e99
+ */
218e99
+bool cpu_paging_enabled(const CPUState *cpu);
218e99
+
218e99
+/**
218e99
  * cpu_write_elf64_note:
218e99
  * @f: pointer to a function that writes memory to a file
218e99
  * @cpu: The CPU whose memory is to be dumped
218e99
diff --git a/include/sysemu/memory_mapping.h b/include/sysemu/memory_mapping.h
218e99
index 1256125..6f01524 100644
218e99
--- a/include/sysemu/memory_mapping.h
218e99
+++ b/include/sysemu/memory_mapping.h
218e99
@@ -31,7 +31,6 @@ typedef struct MemoryMappingList {
218e99
 } MemoryMappingList;
218e99
 
218e99
 int cpu_get_memory_mapping(MemoryMappingList *list, CPUArchState *env);
218e99
-bool cpu_paging_enabled(CPUArchState *env);
218e99
 
218e99
 /*
218e99
  * add or merge the memory region [phys_addr, phys_addr + length) into the
218e99
diff --git a/memory_mapping-stub.c b/memory_mapping-stub.c
218e99
index 24d5d67..6c0dfeb 100644
218e99
--- a/memory_mapping-stub.c
218e99
+++ b/memory_mapping-stub.c
218e99
@@ -25,9 +25,3 @@ int cpu_get_memory_mapping(MemoryMappingList *list,
218e99
 {
218e99
     return -1;
218e99
 }
218e99
-
218e99
-bool cpu_paging_enabled(CPUArchState *env)
218e99
-{
218e99
-    return true;
218e99
-}
218e99
-
218e99
diff --git a/memory_mapping.c b/memory_mapping.c
218e99
index ff45b3a..0790aac 100644
218e99
--- a/memory_mapping.c
218e99
+++ b/memory_mapping.c
218e99
@@ -170,7 +170,7 @@ static CPUArchState *find_paging_enabled_cpu(CPUArchState *start_cpu)
218e99
     CPUArchState *env;
218e99
 
218e99
     for (env = start_cpu; env != NULL; env = env->next_cpu) {
218e99
-        if (cpu_paging_enabled(env)) {
218e99
+        if (cpu_paging_enabled(ENV_GET_CPU(env))) {
218e99
             return env;
218e99
         }
218e99
     }
218e99
diff --git a/qom/cpu.c b/qom/cpu.c
218e99
index 04aefbb..9f6da0f 100644
218e99
--- a/qom/cpu.c
218e99
+++ b/qom/cpu.c
218e99
@@ -50,6 +50,18 @@ bool cpu_exists(int64_t id)
218e99
     return data.found;
218e99
 }
218e99
 
218e99
+bool cpu_paging_enabled(const CPUState *cpu)
218e99
+{
218e99
+    CPUClass *cc = CPU_GET_CLASS(cpu);
218e99
+
218e99
+    return cc->get_paging_enabled(cpu);
218e99
+}
218e99
+
218e99
+static bool cpu_common_get_paging_enabled(const CPUState *cpu)
218e99
+{
218e99
+    return true;
218e99
+}
218e99
+
218e99
 /* CPU hot-plug notifiers */
218e99
 static NotifierList cpu_added_notifiers =
218e99
     NOTIFIER_LIST_INITIALIZER(cpu_add_notifiers);
218e99
@@ -176,6 +188,7 @@ static void cpu_class_init(ObjectClass *klass, void *data)
218e99
     k->class_by_name = cpu_common_class_by_name;
218e99
     k->reset = cpu_common_reset;
218e99
     k->get_arch_id = cpu_common_get_arch_id;
218e99
+    k->get_paging_enabled = cpu_common_get_paging_enabled;
218e99
     k->write_elf32_qemunote = cpu_common_write_elf32_qemunote;
218e99
     k->write_elf32_note = cpu_common_write_elf32_note;
218e99
     k->write_elf64_qemunote = cpu_common_write_elf64_qemunote;
218e99
diff --git a/target-i386/arch_memory_mapping.c b/target-i386/arch_memory_mapping.c
218e99
index 24884bd..39def3d 100644
218e99
--- a/target-i386/arch_memory_mapping.c
218e99
+++ b/target-i386/arch_memory_mapping.c
218e99
@@ -241,7 +241,7 @@ static void walk_pml4e(MemoryMappingList *list,
218e99
 
218e99
 int cpu_get_memory_mapping(MemoryMappingList *list, CPUArchState *env)
218e99
 {
218e99
-    if (!cpu_paging_enabled(env)) {
218e99
+    if (!cpu_paging_enabled(ENV_GET_CPU(env))) {
218e99
         /* paging is disabled */
218e99
         return 0;
218e99
     }
218e99
@@ -273,7 +273,3 @@ int cpu_get_memory_mapping(MemoryMappingList *list, CPUArchState *env)
218e99
     return 0;
218e99
 }
218e99
 
218e99
-bool cpu_paging_enabled(CPUArchState *env)
218e99
-{
218e99
-    return env->cr[0] & CR0_PG_MASK;
218e99
-}
218e99
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
218e99
index 2bcc21e..dfa2a86 100644
218e99
--- a/target-i386/cpu.c
218e99
+++ b/target-i386/cpu.c
218e99
@@ -2509,11 +2509,19 @@ static int64_t x86_cpu_get_arch_id(CPUState *cs)
218e99
     return env->cpuid_apic_id;
218e99
 }
218e99
 
218e99
+
218e99
 static Property x86_cpu_properties[] = {
218e99
     DEFINE_PROP_BOOL("pmu", X86CPU, enable_pmu, false),
218e99
     DEFINE_PROP_END_OF_LIST()
218e99
 };
218e99
 
218e99
+static bool x86_cpu_get_paging_enabled(const CPUState *cs)
218e99
+{
218e99
+    X86CPU *cpu = X86_CPU(cs);
218e99
+
218e99
+    return cpu->env.cr[0] & CR0_PG_MASK;
218e99
+}
218e99
+
218e99
 static void x86_cpu_common_class_init(ObjectClass *oc, void *data)
218e99
 {
218e99
     X86CPUClass *xcc = X86_CPU_CLASS(oc);
218e99
@@ -2529,6 +2537,8 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data)
218e99
     cc->reset = x86_cpu_reset;
218e99
 
218e99
     cc->do_interrupt = x86_cpu_do_interrupt;
218e99
+    cc->get_arch_id = x86_cpu_get_arch_id;
218e99
+    cc->get_paging_enabled = x86_cpu_get_paging_enabled;
218e99
 #ifndef CONFIG_USER_ONLY
218e99
     cc->write_elf64_note = x86_cpu_write_elf64_note;
218e99
     cc->write_elf64_qemunote = x86_cpu_write_elf64_qemunote;
218e99
@@ -2536,8 +2546,6 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data)
218e99
     cc->write_elf32_qemunote = x86_cpu_write_elf32_qemunote;
218e99
 #endif
218e99
     cpu_class_set_vmsd(cc, &vmstate_x86_cpu);
218e99
-
218e99
-    cc->get_arch_id = x86_cpu_get_arch_id;
218e99
 }
218e99
 
218e99
 static const TypeInfo x86_cpu_type_info = {