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

Avi Kivity
2008-06-29T11:50:36Z

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