diff options
author | Glauber Costa <glommer@redhat.com> | 2009-10-15 13:50:36 -0300 |
---|---|---|
committer | Marcelo Tosatti <mtosatti@redhat.com> | 2009-10-19 16:08:02 -0200 |
commit | b4052aa24d5aae911aec6d925c484dbccfe7026c (patch) | |
tree | 8b05538a2f0dee4a6e090b34f4843e3dc8a72610 /qemu-kvm.c | |
parent | change function signatures so that they don't take a vcpu argument (diff) | |
download | qemu-kvm-b4052aa24d5aae911aec6d925c484dbccfe7026c.tar.gz qemu-kvm-b4052aa24d5aae911aec6d925c484dbccfe7026c.tar.bz2 qemu-kvm-b4052aa24d5aae911aec6d925c484dbccfe7026c.zip |
get rid of vcpu structure
We have no use for it anymore. Only trace of it was in vcpu_create.
Make it disappear.
Signed-off-by: Glauber Costa <glommer@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'qemu-kvm.c')
-rw-r--r-- | qemu-kvm.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/qemu-kvm.c b/qemu-kvm.c index 2ddd08e03..b58a45729 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) |