[qom-cpu,01/11] cpu: Move kvm_fd into CPUState

Commit Message

Andreas Färber Dec. 2, 2012, 4:50 a.m. UTC

Signed-off-by: Andreas Färber <[e-mail]>
---
 cpu-defs.h         |    1 -
 include/qemu/cpu.h |    4 ++++
 kvm-all.c          |    8 +++++---
 3 Dateien geändert, 9 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-)

Comments

Andreas Färber Dec. 2, 2012, 4:56 a.m. UTC | #1

Am 02.12.2012 05:50, schrieb Andreas Färber:
> diff --git a/include/qemu/cpu.h b/include/qemu/cpu.h
> index 61b7698..6c66fc0 100644
> --- a/include/qemu/cpu.h
> +++ b/include/qemu/cpu.h
> @@ -77,6 +77,10 @@ struct CPUState {
>      bool stop;
>      bool stopped;
>  
> +#if !defined(CONFIG_USER_ONLY)
> +    int kvm_fd;
> +#endif
> +
>      /* TODO Move common fields from CPUArchState here. */
>  };
>  

First nit found myself: I strive to set good examples, so this field
addition should've been accompanied by a documentation update. ;)

I'll defer a v2 until other people have had a chance to review though.

Andreas

Patch

diff --git a/cpu-defs.h b/cpu-defs.h
index 3669241..6373a80 100644
--- a/cpu-defs.h
+++ b/cpu-defs.h
@@ -207,7 +207,6 @@  typedef struct CPUWatchpoint {
     const char *cpu_model_str;                                          \
     struct KVMState *kvm_state;                                         \
     struct kvm_run *kvm_run;                                            \
-    int kvm_fd;                                                         \
     int kvm_vcpu_dirty;
 
 #endif
diff --git a/include/qemu/cpu.h b/include/qemu/cpu.h
index 61b7698..6c66fc0 100644
--- a/include/qemu/cpu.h
+++ b/include/qemu/cpu.h
@@ -77,6 +77,10 @@  struct CPUState {
     bool stop;
     bool stopped;
 
+#if !defined(CONFIG_USER_ONLY)
+    int kvm_fd;
+#endif
+
     /* TODO Move common fields from CPUArchState here. */
 };
 
diff --git a/kvm-all.c b/kvm-all.c
index 8e9a8d8..8a00df7 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -216,6 +216,7 @@  static void kvm_reset_vcpu(void *opaque)
 
 int kvm_init_vcpu(CPUArchState *env)
 {
+    CPUState *cpu = ENV_GET_CPU(env);
     KVMState *s = kvm_state;
     long mmap_size;
     int ret;
@@ -228,7 +229,7 @@  int kvm_init_vcpu(CPUArchState *env)
         goto err;
     }
 
-    env->kvm_fd = ret;
+    cpu->kvm_fd = ret;
     env->kvm_state = s;
     env->kvm_vcpu_dirty = 1;
 
@@ -240,7 +241,7 @@  int kvm_init_vcpu(CPUArchState *env)
     }
 
     env->kvm_run = mmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_SHARED,
-                        env->kvm_fd, 0);
+                        cpu->kvm_fd, 0);
     if (env->kvm_run == MAP_FAILED) {
         ret = -errno;
         DPRINTF("mmap'ing vcpu state failed\n");
@@ -1652,6 +1653,7 @@  int kvm_vm_ioctl(KVMState *s, int type, ...)
 
 int kvm_vcpu_ioctl(CPUArchState *env, int type, ...)
 {
+    CPUState *cpu = ENV_GET_CPU(env);
     int ret;
     void *arg;
     va_list ap;
@@ -1660,7 +1662,7 @@  int kvm_vcpu_ioctl(CPUArchState *env, int type, ...)
     arg = va_arg(ap, void *);
     va_end(ap);
 
-    ret = ioctl(env->kvm_fd, type, arg);
+    ret = ioctl(cpu->kvm_fd, type, arg);
     if (ret == -1) {
         ret = -errno;
     }