* [kvm-ppc-devel] [PATCH 1 of 3] Move address types to their own
2007-12-03 21:30 [kvm-ppc-devel] [PATCH 0 of 3] Portability: allow for non-x86 Hollis Blanchard
@ 2007-12-03 21:30 ` Hollis Blanchard
2007-12-04 13:35 ` [kvm-ppc-devel] [kvm-devel] [PATCH 1 of 3] Move address types Carsten Otte
2007-12-03 21:30 ` [kvm-ppc-devel] [PATCH 2 of 3] Move IO device definitions to its Hollis Blanchard
` (2 subsequent siblings)
3 siblings, 1 reply; 9+ messages in thread
From: Hollis Blanchard @ 2007-12-03 21:30 UTC (permalink / raw)
To: Avi Kivity
Cc: kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f,
kvm-ppc-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
---
2 files changed, 43 insertions(+), 19 deletions(-)
drivers/kvm/kvm.h | 21 ++-------------------
drivers/kvm/types.h | 41 +++++++++++++++++++++++++++++++++++++++++
diff --git a/drivers/kvm/kvm.h b/drivers/kvm/kvm.h
--- a/drivers/kvm/kvm.h
+++ b/drivers/kvm/kvm.h
@@ -19,6 +19,8 @@
#include <linux/kvm.h>
#include <linux/kvm_para.h>
+
+#include "types.h"
#define KVM_MAX_VCPUS 4
#define KVM_ALIAS_SLOTS 4
@@ -38,25 +40,6 @@
* vcpu->requests bit members
*/
#define KVM_REQ_TLB_FLUSH 0
-
-/*
- * Address types:
- *
- * gva - guest virtual address
- * gpa - guest physical address
- * gfn - guest frame number
- * hva - host virtual address
- * hpa - host physical address
- * hfn - host frame number
- */
-
-typedef unsigned long gva_t;
-typedef u64 gpa_t;
-typedef unsigned long gfn_t;
-
-typedef unsigned long hva_t;
-typedef u64 hpa_t;
-typedef unsigned long hfn_t;
#define NR_PTE_CHAIN_ENTRIES 5
diff --git a/drivers/kvm/types.h b/drivers/kvm/types.h
new file mode 100644
--- /dev/null
+++ b/drivers/kvm/types.h
@@ -0,0 +1,41 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef __KVM_TYPES_H__
+#define __KVM_TYPES_H__
+
+#include <asm/types.h>
+
+/*
+ * Address types:
+ *
+ * gva - guest virtual address
+ * gpa - guest physical address
+ * gfn - guest frame number
+ * hva - host virtual address
+ * hpa - host physical address
+ * hfn - host frame number
+ */
+
+typedef unsigned long gva_t;
+typedef u64 gpa_t;
+typedef unsigned long gfn_t;
+
+typedef unsigned long hva_t;
+typedef u64 hpa_t;
+typedef unsigned long hfn_t;
+
+#endif /* __KVM_TYPES_H__ */
-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell. From the desktop to the data center, Linux is going
mainstream. Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
kvm-ppc-devel mailing list
kvm-ppc-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-ppc-devel
^ permalink raw reply [flat|nested] 9+ messages in thread* [kvm-ppc-devel] [PATCH 2 of 3] Move IO device definitions to its
2007-12-03 21:30 [kvm-ppc-devel] [PATCH 0 of 3] Portability: allow for non-x86 Hollis Blanchard
2007-12-03 21:30 ` [kvm-ppc-devel] [PATCH 1 of 3] Move address types to their own Hollis Blanchard
@ 2007-12-03 21:30 ` Hollis Blanchard
2007-12-04 13:41 ` [kvm-ppc-devel] [kvm-devel] [PATCH 2 of 3] Move IO device Carsten Otte
2007-12-03 21:30 ` [kvm-ppc-devel] [PATCH 3 of 3] Stop including x86-specific headers Hollis Blanchard
2007-12-05 10:14 ` [kvm-ppc-devel] [kvm-devel] [PATCH 0 of 3] Portability: allow Avi Kivity
3 siblings, 1 reply; 9+ messages in thread
From: Hollis Blanchard @ 2007-12-03 21:30 UTC (permalink / raw)
To: Avi Kivity
Cc: kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f,
kvm-ppc-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
---
4 files changed, 65 insertions(+), 42 deletions(-)
drivers/kvm/iodev.h | 63 ++++++++++++++++++++++++++++++++++++++++++++++++
drivers/kvm/irq.h | 1
drivers/kvm/kvm.h | 42 --------------------------------
drivers/kvm/kvm_main.c | 1
diff --git a/drivers/kvm/iodev.h b/drivers/kvm/iodev.h
new file mode 100644
--- /dev/null
+++ b/drivers/kvm/iodev.h
@@ -0,0 +1,63 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __KVM_IODEV_H__
+#define __KVM_IODEV_H__
+
+#include "types.h"
+
+struct kvm_io_device {
+ void (*read)(struct kvm_io_device *this,
+ gpa_t addr,
+ int len,
+ void *val);
+ void (*write)(struct kvm_io_device *this,
+ gpa_t addr,
+ int len,
+ const void *val);
+ int (*in_range)(struct kvm_io_device *this, gpa_t addr);
+ void (*destructor)(struct kvm_io_device *this);
+
+ void *private;
+};
+
+static inline void kvm_iodevice_read(struct kvm_io_device *dev,
+ gpa_t addr,
+ int len,
+ void *val)
+{
+ dev->read(dev, addr, len, val);
+}
+
+static inline void kvm_iodevice_write(struct kvm_io_device *dev,
+ gpa_t addr,
+ int len,
+ const void *val)
+{
+ dev->write(dev, addr, len, val);
+}
+
+static inline int kvm_iodevice_inrange(struct kvm_io_device *dev, gpa_t addr)
+{
+ return dev->in_range(dev, addr);
+}
+
+static inline void kvm_iodevice_destructor(struct kvm_io_device *dev)
+{
+ if (dev->destructor)
+ dev->destructor(dev);
+}
+
+#endif /* __KVM_IODEV_H__ */
diff --git a/drivers/kvm/irq.h b/drivers/kvm/irq.h
--- a/drivers/kvm/irq.h
+++ b/drivers/kvm/irq.h
@@ -23,6 +23,7 @@
#define __IRQ_H
#include "kvm.h"
+#include "iodev.h"
typedef void irq_request_func(void *opaque, int level);
diff --git a/drivers/kvm/kvm.h b/drivers/kvm/kvm.h
--- a/drivers/kvm/kvm.h
+++ b/drivers/kvm/kvm.h
@@ -167,48 +167,6 @@ struct kvm_vcpu_stat {
u32 insn_emulation;
u32 insn_emulation_fail;
};
-
-struct kvm_io_device {
- void (*read)(struct kvm_io_device *this,
- gpa_t addr,
- int len,
- void *val);
- void (*write)(struct kvm_io_device *this,
- gpa_t addr,
- int len,
- const void *val);
- int (*in_range)(struct kvm_io_device *this, gpa_t addr);
- void (*destructor)(struct kvm_io_device *this);
-
- void *private;
-};
-
-static inline void kvm_iodevice_read(struct kvm_io_device *dev,
- gpa_t addr,
- int len,
- void *val)
-{
- dev->read(dev, addr, len, val);
-}
-
-static inline void kvm_iodevice_write(struct kvm_io_device *dev,
- gpa_t addr,
- int len,
- const void *val)
-{
- dev->write(dev, addr, len, val);
-}
-
-static inline int kvm_iodevice_inrange(struct kvm_io_device *dev, gpa_t addr)
-{
- return dev->in_range(dev, addr);
-}
-
-static inline void kvm_iodevice_destructor(struct kvm_io_device *dev)
-{
- if (dev->destructor)
- dev->destructor(dev);
-}
/*
* It would be nice to use something smarter than a linear search, TBD...
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
--- a/drivers/kvm/kvm_main.c
+++ b/drivers/kvm/kvm_main.c
@@ -18,6 +18,7 @@
#include "kvm.h"
#include "x86.h"
#include "irq.h"
+#include "iodev.h"
#include <linux/kvm.h>
#include <linux/module.h>
-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell. From the desktop to the data center, Linux is going
mainstream. Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
kvm-ppc-devel mailing list
kvm-ppc-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-ppc-devel
^ permalink raw reply [flat|nested] 9+ messages in thread* [kvm-ppc-devel] [PATCH 3 of 3] Stop including x86-specific headers
2007-12-03 21:30 [kvm-ppc-devel] [PATCH 0 of 3] Portability: allow for non-x86 Hollis Blanchard
2007-12-03 21:30 ` [kvm-ppc-devel] [PATCH 1 of 3] Move address types to their own Hollis Blanchard
2007-12-03 21:30 ` [kvm-ppc-devel] [PATCH 2 of 3] Move IO device definitions to its Hollis Blanchard
@ 2007-12-03 21:30 ` Hollis Blanchard
2007-12-04 13:37 ` [kvm-ppc-devel] [kvm-devel] [PATCH 3 of 3] Stop including Carsten Otte
2007-12-05 10:14 ` [kvm-ppc-devel] [kvm-devel] [PATCH 0 of 3] Portability: allow Avi Kivity
3 siblings, 1 reply; 9+ messages in thread
From: Hollis Blanchard @ 2007-12-03 21:30 UTC (permalink / raw)
To: Avi Kivity
Cc: kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f,
kvm-ppc-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
---
5 files changed, 19 insertions(+), 9 deletions(-)
drivers/kvm/i8259.c | 1 +
drivers/kvm/irq.h | 7 ++++++-
drivers/kvm/kvm.h | 9 ++++-----
drivers/kvm/kvm_main.c | 3 ---
drivers/kvm/x86.h | 8 ++++++++
diff --git a/drivers/kvm/i8259.c b/drivers/kvm/i8259.c
--- a/drivers/kvm/i8259.c
+++ b/drivers/kvm/i8259.c
@@ -27,6 +27,7 @@
*/
#include <linux/mm.h>
#include "irq.h"
+#include "kvm.h"
/*
* set irq level. If an edge is detected, then the IRR is set to 1
diff --git a/drivers/kvm/irq.h b/drivers/kvm/irq.h
--- a/drivers/kvm/irq.h
+++ b/drivers/kvm/irq.h
@@ -22,8 +22,13 @@
#ifndef __IRQ_H
#define __IRQ_H
-#include "kvm.h"
+#include <linux/mm_types.h>
+#include <linux/hrtimer.h>
+#include <asm/kvm.h>
#include "iodev.h"
+
+struct kvm;
+struct kvm_vcpu;
typedef void irq_request_func(void *opaque, int level);
diff --git a/drivers/kvm/kvm.h b/drivers/kvm/kvm.h
--- a/drivers/kvm/kvm.h
+++ b/drivers/kvm/kvm.h
@@ -287,11 +287,6 @@ static inline int irqchip_in_kernel(stru
{
return pic_irqchip(kvm) != NULL;
}
-
-struct descriptor_table {
- u16 limit;
- unsigned long base;
-} __attribute__((packed));
/* The guest did something we don't support. */
#define pr_unimpl(vcpu, fmt, ...) \
@@ -457,4 +452,8 @@ struct kvm_stats_debugfs_item {
};
extern struct kvm_stats_debugfs_item debugfs_entries[];
+#if defined(CONFIG_X86)
+#include "x86.h"
#endif
+
+#endif
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
--- a/drivers/kvm/kvm_main.c
+++ b/drivers/kvm/kvm_main.c
@@ -16,8 +16,6 @@
*/
#include "kvm.h"
-#include "x86.h"
-#include "irq.h"
#include "iodev.h"
#include <linux/kvm.h>
@@ -46,7 +44,6 @@
#include <asm/processor.h>
#include <asm/io.h>
#include <asm/uaccess.h>
-#include <asm/desc.h>
#include <asm/pgtable.h>
MODULE_AUTHOR("Qumranet");
diff --git a/drivers/kvm/x86.h b/drivers/kvm/x86.h
--- a/drivers/kvm/x86.h
+++ b/drivers/kvm/x86.h
@@ -12,12 +12,15 @@
#define KVM_X86_H
#include "kvm.h"
+#include "irq.h"
#include <linux/types.h>
#include <linux/mm.h>
#include <linux/kvm.h>
#include <linux/kvm_para.h>
+
+#include <asm/desc.h>
#define CR3_PAE_RESERVED_BITS ((X86_CR3_PWT | X86_CR3_PCD) - 1)
#define CR3_NONPAE_RESERVED_BITS ((PAGE_SIZE-1) & ~(X86_CR3_PWT | X86_CR3_PCD))
@@ -155,6 +158,11 @@ struct kvm_vcpu {
struct x86_emulate_ctxt emulate_ctxt;
};
+
+struct descriptor_table {
+ u16 limit;
+ unsigned long base;
+} __attribute__((packed));
struct kvm_x86_ops {
int (*cpu_has_kvm_support)(void); /* __init */
-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell. From the desktop to the data center, Linux is going
mainstream. Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
kvm-ppc-devel mailing list
kvm-ppc-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-ppc-devel
^ permalink raw reply [flat|nested] 9+ messages in thread