[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH qom-cpu 01/11] cpu: Move kvm_fd into CPUState
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH qom-cpu 01/11] cpu: Move kvm_fd into CPUState |
Date: |
Sun, 2 Dec 2012 05:50:41 +0100 |
Signed-off-by: Andreas Färber <address@hidden>
---
cpu-defs.h | 1 -
include/qemu/cpu.h | 4 ++++
kvm-all.c | 8 +++++---
3 Dateien geändert, 9 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-)
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;
}
--
1.7.10.4
- [Qemu-devel] [PATCH qom-cpu 00/11] QOM CPUState, part 6: CPU_COMMON for KVM, Andreas Färber, 2012/12/01
- [Qemu-devel] [PATCH qom-cpu 01/11] cpu: Move kvm_fd into CPUState,
Andreas Färber <=
- [Qemu-devel] [PATCH qom-cpu 02/11] kvm: Pass CPUState to kvm_arch_*, Andreas Färber, 2012/12/01
- [Qemu-devel] [PATCH qom-cpu 04/11] ppc: Pass PowerPCCPU to ppc_set_irq(), Andreas Färber, 2012/12/01
- [Qemu-devel] [PATCH qom-cpu 05/11] ppc: Pass PowerPCCPU to [h]decr callbacks, Andreas Färber, 2012/12/01
- [Qemu-devel] [PATCH qom-cpu 06/11] ppc: Pass PowerPCCPU to [h]decr timer callbacks, Andreas Färber, 2012/12/01
- [Qemu-devel] [PATCH qom-cpu 07/11] ppc_booke: Pass PowerPCCPU to {decr, fit, wdt} timer callbacks, Andreas Färber, 2012/12/01
- [Qemu-devel] [PATCH qom-cpu 08/11] ppc4xx_devs: Return PowerPCCPU from ppc4xx_init(), Andreas Färber, 2012/12/01
- [Qemu-devel] [PATCH qom-cpu 03/11] kvm: Pass CPUState to kvm_vcpu_ioctl(), Andreas Färber, 2012/12/01
- [Qemu-devel] [PATCH qom-cpu 09/11] ppc_booke: Pass PowerPCCPU to ppc_booke_timers_init(), Andreas Färber, 2012/12/01
- [Qemu-devel] [PATCH qom-cpu 11/11] cpu: Move kvm_run into CPUState, Andreas Färber, 2012/12/01