[v2,2/3] get rid of vcpu structure

Commit Message

Glauber Costa Oct. 15, 2009, 4:50 p.m. UTC

None

Patch

diff --git a/qemu-kvm.c b/qemu-kvm.c
index 700d030..7943281 100644
--- a/qemu-kvm.c
+++ b/qemu-kvm.c
@@ -440,16 +440,13 @@  static void kvm_create_vcpu(CPUState *env, int id)
 {
     long mmap_size;
     int r;
-    kvm_vcpu_context_t vcpu_ctx = qemu_malloc(sizeof(struct kvm_vcpu_context));
 
     r = kvm_vm_ioctl(kvm_state, KVM_CREATE_VCPU, id);
     if (r < 0) {
         fprintf(stderr, "kvm_create_vcpu: %m\n");
-        goto err;
+        return;
     }
 
-    vcpu_ctx->fd = r;
-
     env->kvm_fd = r;
     env->kvm_state = kvm_state;
 
@@ -459,7 +456,7 @@  static void kvm_create_vcpu(CPUState *env, int id)
         goto err_fd;
     }
     env->kvm_run =
-        mmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_SHARED, vcpu_ctx->fd,
+        mmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_SHARED, env->kvm_fd,
              0);
     if (env->kvm_run == MAP_FAILED) {
         fprintf(stderr, "mmap vcpu area: %m\n");
@@ -468,9 +465,7 @@  static void kvm_create_vcpu(CPUState *env, int id)
 
     return;
   err_fd:
-    close(vcpu_ctx->fd);
-  err:
-    free(vcpu_ctx);
+    close(env->kvm_fd);
 }
 
 static int kvm_set_boot_vcpu_id(kvm_context_t kvm, uint32_t id)
diff --git a/qemu-kvm.h b/qemu-kvm.h
index abcb98d..588bc80 100644
--- a/qemu-kvm.h
+++ b/qemu-kvm.h
@@ -76,12 +76,7 @@  struct kvm_context {
     int max_gsi;
 };
 
-struct kvm_vcpu_context {
-    int fd;
-};
-
 typedef struct kvm_context *kvm_context_t;
-typedef struct kvm_vcpu_context *kvm_vcpu_context_t;
 
 #include "kvm.h"
 int kvm_alloc_kernel_memory(kvm_context_t kvm, unsigned long memory,