diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2015-06-18 18:28:45 +0200 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-07-06 17:59:43 +0200 |
commit | 8571ed35cfa50ed6b2aaee484dfa4f58176ebe00 (patch) | |
tree | 549ad07218cd5d0af17131da698f90b6309f11df | |
parent | 714f78c587ba628169b8ae6f91866c52fe6a799f (diff) | |
download | qemu-8571ed35cfa50ed6b2aaee484dfa4f58176ebe00.zip qemu-8571ed35cfa50ed6b2aaee484dfa4f58176ebe00.tar.gz qemu-8571ed35cfa50ed6b2aaee484dfa4f58176ebe00.tar.bz2 |
kvm-all: move internal types to kvm_int.h
i386 code will have to define a different KVMMemoryListener. Create
an internal header so that KVMSlot is not exposed outside.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r-- | include/sysemu/kvm_int.h | 30 | ||||
-rw-r--r-- | kvm-all.c | 18 |
2 files changed, 31 insertions, 17 deletions
diff --git a/include/sysemu/kvm_int.h b/include/sysemu/kvm_int.h new file mode 100644 index 0000000..e8dcbd7 --- /dev/null +++ b/include/sysemu/kvm_int.h @@ -0,0 +1,30 @@ +/* + * Internal definitions for a target's KVM support + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + * + */ + +#ifndef QEMU_KVM_INT_H +#define QEMU_KVM_INT_H + +#include "sysemu/sysemu.h" +#include "sysemu/accel.h" +#include "sysemu/kvm.h" + +typedef struct KVMSlot +{ + hwaddr start_addr; + ram_addr_t memory_size; + void *ram; + int slot; + int flags; +} KVMSlot; + +#define TYPE_KVM_ACCEL ACCEL_CLASS_NAME("kvm") + +#define KVM_STATE(obj) \ + OBJECT_CHECK(KVMState, (obj), TYPE_KVM_ACCEL) + +#endif @@ -24,13 +24,11 @@ #include "qemu/atomic.h" #include "qemu/option.h" #include "qemu/config-file.h" -#include "sysemu/sysemu.h" -#include "sysemu/accel.h" #include "hw/hw.h" #include "hw/pci/msi.h" #include "hw/s390x/adapter.h" #include "exec/gdbstub.h" -#include "sysemu/kvm.h" +#include "sysemu/kvm_int.h" #include "qemu/bswap.h" #include "exec/memory.h" #include "exec/ram_addr.h" @@ -60,15 +58,6 @@ #define KVM_MSI_HASHTAB_SIZE 256 -typedef struct KVMSlot -{ - hwaddr start_addr; - ram_addr_t memory_size; - void *ram; - int slot; - int flags; -} KVMSlot; - struct KVMState { AccelState parent_obj; @@ -106,11 +95,6 @@ struct KVMState #endif }; -#define TYPE_KVM_ACCEL ACCEL_CLASS_NAME("kvm") - -#define KVM_STATE(obj) \ - OBJECT_CHECK(KVMState, (obj), TYPE_KVM_ACCEL) - KVMState *kvm_state; bool kvm_kernel_irqchip; bool kvm_async_interrupts_allowed; |