[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/7] kvm-all: move internal types to kvm_int.h
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 3/7] kvm-all: move internal types to kvm_int.h |
Date: |
Mon, 18 May 2015 17:28:36 +0200 |
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 <address@hidden>
---
include/sysemu/kvm_int.h | 30 ++++++++++++++++++++++++++++++
kvm-all.c | 18 +-----------------
2 files changed, 31 insertions(+), 17 deletions(-)
create mode 100644 include/sysemu/kvm_int.h
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
diff --git a/kvm-all.c b/kvm-all.c
index bb9477c..4499ff8 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -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;
@@ -107,11 +96,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;
--
1.8.3.1
- [Qemu-devel] [PATCH 0/7] kvm-i386: QEMU support for SMRAM, Paolo Bonzini, 2015/05/18
- [Qemu-devel] [PATCH 2/7] kvm-all: remove useless typedef, Paolo Bonzini, 2015/05/18
- [Qemu-devel] [PATCH 1/7] kvm-all: put kvm_mem_flags to more work, Paolo Bonzini, 2015/05/18
- [Qemu-devel] [PATCH 3/7] kvm-all: move internal types to kvm_int.h,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 5/7] kvm-all: add support for multiple address spaces, Paolo Bonzini, 2015/05/18
- [Qemu-devel] [PATCH 4/7] kvm-all: make KVM's memory listener more generic, Paolo Bonzini, 2015/05/18
- [Qemu-devel] [PATCH 6/7] kvm-all: kvm_irqchip_create is not expected to fail, Paolo Bonzini, 2015/05/18
- [Qemu-devel] [PATCH 7/7] target-i386: register a separate KVM address space including SMRAM regions, Paolo Bonzini, 2015/05/18