[PATCH 2 of 3] Move KVM TRACE DEFINITIONS to common header

2008-07-01 Thread Hollis Blanchard 
Move KVM trace definitions from x86 specific kvm headers to common kvm
headers to create a cross-architecture numbering scheme for trace
events. This means the kvmtrace_format userspace tool won't need to know
which architecture produced the log file being processed.

Signed-off-by: Jerone Young [EMAIL PROTECTED]
Signed-off-by: Hollis Blanchard [EMAIL PROTECTED]

---

Avi, you said you already applied #1, and this is the revised #2. There
is no need to apply #3; I've combined those macro definitions with the
PowerPC-specific patches that use them.

diff --git a/include/asm-x86/kvm.h b/include/asm-x86/kvm.h
--- a/include/asm-x86/kvm.h
+++ b/include/asm-x86/kvm.h
@@ -208,26 +208,4 @@ struct kvm_pit_state {
 struct kvm_pit_state {
struct kvm_pit_channel_state channels[3];
 };
-
-#define KVM_TRC_INJ_VIRQ (KVM_TRC_HANDLER + 0x02)
-#define KVM_TRC_REDELIVER_EVT(KVM_TRC_HANDLER + 0x03)
-#define KVM_TRC_PEND_INTR(KVM_TRC_HANDLER + 0x04)
-#define KVM_TRC_IO_READ  (KVM_TRC_HANDLER + 0x05)
-#define KVM_TRC_IO_WRITE (KVM_TRC_HANDLER + 0x06)
-#define KVM_TRC_CR_READ  (KVM_TRC_HANDLER + 0x07)
-#define KVM_TRC_CR_WRITE (KVM_TRC_HANDLER + 0x08)
-#define KVM_TRC_DR_READ  (KVM_TRC_HANDLER + 0x09)
-#define KVM_TRC_DR_WRITE (KVM_TRC_HANDLER + 0x0A)
-#define KVM_TRC_MSR_READ (KVM_TRC_HANDLER + 0x0B)
-#define KVM_TRC_MSR_WRITE(KVM_TRC_HANDLER + 0x0C)
-#define KVM_TRC_CPUID(KVM_TRC_HANDLER + 0x0D)
-#define KVM_TRC_INTR (KVM_TRC_HANDLER + 0x0E)
-#define KVM_TRC_NMI  (KVM_TRC_HANDLER + 0x0F)
-#define KVM_TRC_VMMCALL  (KVM_TRC_HANDLER + 0x10)
-#define KVM_TRC_HLT  (KVM_TRC_HANDLER + 0x11)
-#define KVM_TRC_CLTS (KVM_TRC_HANDLER + 0x12)
-#define KVM_TRC_LMSW (KVM_TRC_HANDLER + 0x13)
-#define KVM_TRC_APIC_ACCESS  (KVM_TRC_HANDLER + 0x14)
-#define KVM_TRC_TDP_FAULT(KVM_TRC_HANDLER + 0x15)
-
 #endif
diff --git a/include/asm-x86/kvm_host.h b/include/asm-x86/kvm_host.h
--- a/include/asm-x86/kvm_host.h
+++ b/include/asm-x86/kvm_host.h
@@ -685,24 +685,6 @@ enum {
TASK_SWITCH_GATE = 3,
 };
 
-#define KVMTRACE_5D(evt, vcpu, d1, d2, d3, d4, d5, name) \
-   trace_mark(kvm_trace_##name, %u %p %u %u %u %u %u %u, KVM_TRC_##evt, \
-   vcpu, 5, d1, d2, d3, d4, d5)
-#define KVMTRACE_4D(evt, vcpu, d1, d2, d3, d4, name) \
-   trace_mark(kvm_trace_##name, %u %p %u %u %u %u %u %u, KVM_TRC_##evt, \
-   vcpu, 4, d1, d2, d3, d4, 0)
-#define KVMTRACE_3D(evt, vcpu, d1, d2, d3, name) \
-   trace_mark(kvm_trace_##name, %u %p %u %u %u %u %u %u, KVM_TRC_##evt, \
-   vcpu, 3, d1, d2, d3, 0, 0)
-#define KVMTRACE_2D(evt, vcpu, d1, d2, name) \
-   trace_mark(kvm_trace_##name, %u %p %u %u %u %u %u %u, KVM_TRC_##evt, \
-   vcpu, 2, d1, d2, 0, 0, 0)
-#define KVMTRACE_1D(evt, vcpu, d1, name) \
-   trace_mark(kvm_trace_##name, %u %p %u %u %u %u %u %u, KVM_TRC_##evt, \
-   vcpu, 1, d1, 0, 0, 0, 0)
-#define KVMTRACE_0D(evt, vcpu, name) \
-   trace_mark(kvm_trace_##name, %u %p %u %u %u %u %u %u, KVM_TRC_##evt, \
-   vcpu, 0, 0, 0, 0, 0, 0)
 
 #ifdef CONFIG_64BIT
 #define KVM_EX_ENTRY .quad
diff --git a/include/linux/kvm.h b/include/linux/kvm.h
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@ -450,4 +450,25 @@ struct kvm_trace_rec {
 #define KVM_GET_MP_STATE  _IOR(KVMIO,  0x98, struct kvm_mp_state)
 #define KVM_SET_MP_STATE  _IOW(KVMIO,  0x99, struct kvm_mp_state)
 
+#define KVM_TRC_INJ_VIRQ (KVM_TRC_HANDLER + 0x02)
+#define KVM_TRC_REDELIVER_EVT(KVM_TRC_HANDLER + 0x03)
+#define KVM_TRC_PEND_INTR(KVM_TRC_HANDLER + 0x04)
+#define KVM_TRC_IO_READ  (KVM_TRC_HANDLER + 0x05)
+#define KVM_TRC_IO_WRITE (KVM_TRC_HANDLER + 0x06)
+#define KVM_TRC_CR_READ  (KVM_TRC_HANDLER + 0x07)
+#define KVM_TRC_CR_WRITE (KVM_TRC_HANDLER + 0x08)
+#define KVM_TRC_DR_READ  (KVM_TRC_HANDLER + 0x09)
+#define KVM_TRC_DR_WRITE (KVM_TRC_HANDLER + 0x0A)
+#define KVM_TRC_MSR_READ (KVM_TRC_HANDLER + 0x0B)
+#define KVM_TRC_MSR_WRITE(KVM_TRC_HANDLER + 0x0C)
+#define KVM_TRC_CPUID(KVM_TRC_HANDLER + 0x0D)
+#define KVM_TRC_INTR (KVM_TRC_HANDLER + 0x0E)
+#define KVM_TRC_NMI  (KVM_TRC_HANDLER + 0x0F)
+#define KVM_TRC_VMMCALL  (KVM_TRC_HANDLER + 0x10)
+#define KVM_TRC_HLT  (KVM_TRC_HANDLER + 0x11)
+#define KVM_TRC_CLTS (KVM_TRC_HANDLER + 0x12)
+#define KVM_TRC_LMSW (KVM_TRC_HANDLER + 0x13)
+#define KVM_TRC_APIC_ACCESS  (KVM_TRC_HANDLER + 0x14)
+#define KVM_TRC_TDP_FAULT(KVM_TRC_HANDLER + 0x15)
+
 #endif
diff --git a/include/linux/kvm_host.h

Re: [PATCH 2 of 3] Move KVM TRACE DEFINITIONS to common header

2008-06-29 Thread Avi Kivity 

Jerone Young wrote:

3 files changed, 40 insertions(+), 40 deletions(-)
include/asm-x86/kvm.h  |   22 --
include/asm-x86/kvm_host.h |   18 --
include/linux/kvm_host.h   |   40 


This patch moves moves definitions required to use kvm trace from x86 specific 
kvm headers to common kvm headers.

  


I applied patch 1, but:


vcpu, 0, 0, 0, 0, 0, 0)
 
 #ifdef CONFIG_64BIT

 #define KVM_EX_ENTRY .quad
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -322,6 +322,46 @@ extern struct dentry *kvm_debugfs_dir;
 #ifdef CONFIG_KVM_TRACE
 int kvm_trace_ioctl(unsigned int ioctl, unsigned long arg);
 void kvm_trace_cleanup(void);
+#define KVM_TRC_INJ_VIRQ (KVM_TRC_HANDLER + 0x02)
+#define KVM_TRC_REDELIVER_EVT(KVM_TRC_HANDLER + 0x03)
+#define KVM_TRC_PEND_INTR(KVM_TRC_HANDLER + 0x04)
+#define KVM_TRC_IO_READ  (KVM_TRC_HANDLER + 0x05)
+#define KVM_TRC_IO_WRITE (KVM_TRC_HANDLER + 0x06)
+#define KVM_TRC_CR_READ  (KVM_TRC_HANDLER + 0x07)
+#define KVM_TRC_CR_WRITE (KVM_TRC_HANDLER + 0x08)
+#define KVM_TRC_DR_READ  (KVM_TRC_HANDLER + 0x09)
+#define KVM_TRC_DR_WRITE (KVM_TRC_HANDLER + 0x0A)
+#define KVM_TRC_MSR_READ (KVM_TRC_HANDLER + 0x0B)
+#define KVM_TRC_MSR_WRITE(KVM_TRC_HANDLER + 0x0C)
+#define KVM_TRC_CPUID(KVM_TRC_HANDLER + 0x0D)
+#define KVM_TRC_INTR (KVM_TRC_HANDLER + 0x0E)
+#define KVM_TRC_NMI  (KVM_TRC_HANDLER + 0x0F)
+#define KVM_TRC_VMMCALL  (KVM_TRC_HANDLER + 0x10)
+#define KVM_TRC_HLT  (KVM_TRC_HANDLER + 0x11)
+#define KVM_TRC_CLTS (KVM_TRC_HANDLER + 0x12)
+#define KVM_TRC_LMSW (KVM_TRC_HANDLER + 0x13)
+#define KVM_TRC_APIC_ACCESS  (KVM_TRC_HANDLER + 0x14)
+#define KVM_TRC_TDP_FAULT(KVM_TRC_HANDLER + 0x15)
 #else
 static inline
 int kvm_trace_ioctl(unsigned int ioctl, unsigned long arg)
  


This hides the defines from the public interface.  The KVM_TRC_* 
constants should be in kvm.h.



--
error compiling committee.c: too many arguments to function

--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 2 of 3] Move KVM TRACE DEFINITIONS to common header

2008-06-19 Thread Jerone Young 
3 files changed, 40 insertions(+), 40 deletions(-)
include/asm-x86/kvm.h  |   22 --
include/asm-x86/kvm_host.h |   18 --
include/linux/kvm_host.h   |   40 


This patch moves moves definitions required to use kvm trace from x86 specific 
kvm headers to common kvm headers.

Signed-off-by: Jerone Young [EMAIL PROTECTED]

diff --git a/include/asm-x86/kvm.h b/include/asm-x86/kvm.h
--- a/include/asm-x86/kvm.h
+++ b/include/asm-x86/kvm.h
@@ -208,26 +208,4 @@ struct kvm_pit_state {
 struct kvm_pit_state {
struct kvm_pit_channel_state channels[3];
 };
-
-#define KVM_TRC_INJ_VIRQ (KVM_TRC_HANDLER + 0x02)
-#define KVM_TRC_REDELIVER_EVT(KVM_TRC_HANDLER + 0x03)
-#define KVM_TRC_PEND_INTR(KVM_TRC_HANDLER + 0x04)
-#define KVM_TRC_IO_READ  (KVM_TRC_HANDLER + 0x05)
-#define KVM_TRC_IO_WRITE (KVM_TRC_HANDLER + 0x06)
-#define KVM_TRC_CR_READ  (KVM_TRC_HANDLER + 0x07)
-#define KVM_TRC_CR_WRITE (KVM_TRC_HANDLER + 0x08)
-#define KVM_TRC_DR_READ  (KVM_TRC_HANDLER + 0x09)
-#define KVM_TRC_DR_WRITE (KVM_TRC_HANDLER + 0x0A)
-#define KVM_TRC_MSR_READ (KVM_TRC_HANDLER + 0x0B)
-#define KVM_TRC_MSR_WRITE(KVM_TRC_HANDLER + 0x0C)
-#define KVM_TRC_CPUID(KVM_TRC_HANDLER + 0x0D)
-#define KVM_TRC_INTR (KVM_TRC_HANDLER + 0x0E)
-#define KVM_TRC_NMI  (KVM_TRC_HANDLER + 0x0F)
-#define KVM_TRC_VMMCALL  (KVM_TRC_HANDLER + 0x10)
-#define KVM_TRC_HLT  (KVM_TRC_HANDLER + 0x11)
-#define KVM_TRC_CLTS (KVM_TRC_HANDLER + 0x12)
-#define KVM_TRC_LMSW (KVM_TRC_HANDLER + 0x13)
-#define KVM_TRC_APIC_ACCESS  (KVM_TRC_HANDLER + 0x14)
-#define KVM_TRC_TDP_FAULT(KVM_TRC_HANDLER + 0x15)
-
 #endif
diff --git a/include/asm-x86/kvm_host.h b/include/asm-x86/kvm_host.h
--- a/include/asm-x86/kvm_host.h
+++ b/include/asm-x86/kvm_host.h
@@ -683,24 +683,6 @@ enum {
TASK_SWITCH_GATE = 3,
 };
 
-#define KVMTRACE_5D(evt, vcpu, d1, d2, d3, d4, d5, name) \
-   trace_mark(kvm_trace_##name, %u %p %u %u %u %u %u %u, KVM_TRC_##evt, \
-   vcpu, 5, d1, d2, d3, d4, d5)
-#define KVMTRACE_4D(evt, vcpu, d1, d2, d3, d4, name) \
-   trace_mark(kvm_trace_##name, %u %p %u %u %u %u %u %u, KVM_TRC_##evt, \
-   vcpu, 4, d1, d2, d3, d4, 0)
-#define KVMTRACE_3D(evt, vcpu, d1, d2, d3, name) \
-   trace_mark(kvm_trace_##name, %u %p %u %u %u %u %u %u, KVM_TRC_##evt, \
-   vcpu, 3, d1, d2, d3, 0, 0)
-#define KVMTRACE_2D(evt, vcpu, d1, d2, name) \
-   trace_mark(kvm_trace_##name, %u %p %u %u %u %u %u %u, KVM_TRC_##evt, \
-   vcpu, 2, d1, d2, 0, 0, 0)
-#define KVMTRACE_1D(evt, vcpu, d1, name) \
-   trace_mark(kvm_trace_##name, %u %p %u %u %u %u %u %u, KVM_TRC_##evt, \
-   vcpu, 1, d1, 0, 0, 0, 0)
-#define KVMTRACE_0D(evt, vcpu, name) \
-   trace_mark(kvm_trace_##name, %u %p %u %u %u %u %u %u, KVM_TRC_##evt, \
-   vcpu, 0, 0, 0, 0, 0, 0)
 
 #ifdef CONFIG_64BIT
 #define KVM_EX_ENTRY .quad
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -322,6 +322,46 @@ extern struct dentry *kvm_debugfs_dir;
 #ifdef CONFIG_KVM_TRACE
 int kvm_trace_ioctl(unsigned int ioctl, unsigned long arg);
 void kvm_trace_cleanup(void);
+
+#define KVMTRACE_5D(evt, vcpu, d1, d2, d3, d4, d5, name) \
+   trace_mark(kvm_trace_##name, %u %p %u %u %u %u %u %u, KVM_TRC_##evt, \
+   vcpu, 5, d1, d2, d3, d4, d5)
+#define KVMTRACE_4D(evt, vcpu, d1, d2, d3, d4, name) \
+   trace_mark(kvm_trace_##name, %u %p %u %u %u %u %u %u, KVM_TRC_##evt, \
+   vcpu, 4, d1, d2, d3, d4, 0)
+#define KVMTRACE_3D(evt, vcpu, d1, d2, d3, name) \
+   trace_mark(kvm_trace_##name, %u %p %u %u %u %u %u %u, KVM_TRC_##evt, \
+   vcpu, 3, d1, d2, d3, 0, 0)
+#define KVMTRACE_2D(evt, vcpu, d1, d2, name) \
+   trace_mark(kvm_trace_##name, %u %p %u %u %u %u %u %u, KVM_TRC_##evt, \
+   vcpu, 2, d1, d2, 0, 0, 0)
+#define KVMTRACE_1D(evt, vcpu, d1, name) \
+   trace_mark(kvm_trace_##name, %u %p %u %u %u %u %u %u, KVM_TRC_##evt, \
+   vcpu, 1, d1, 0, 0, 0, 0)
+#define KVMTRACE_0D(evt, vcpu, name) \
+   trace_mark(kvm_trace_##name, %u %p %u %u %u %u %u %u, KVM_TRC_##evt, \
+   vcpu, 0, 0, 0, 0, 0, 0)
+
+#define KVM_TRC_INJ_VIRQ (KVM_TRC_HANDLER + 0x02)
+#define KVM_TRC_REDELIVER_EVT(KVM_TRC_HANDLER + 0x03)
+#define KVM_TRC_PEND_INTR(KVM_TRC_HANDLER