* KVM guest: fix build with CONFIG_KVM_GUEST=n
@ 2011-07-19 15:46 Marcelo Tosatti
2011-07-19 16:57 ` Randy Dunlap
0 siblings, 1 reply; 2+ messages in thread
From: Marcelo Tosatti @ 2011-07-19 15:46 UTC (permalink / raw)
To: kvm; +Cc: Randy Dunlap
Fix build with CONFIG_KVM_GUEST=n.
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
diff --git a/arch/x86/include/asm/kvm_para.h b/arch/x86/include/asm/kvm_para.h
index 35d732d..734c376 100644
--- a/arch/x86/include/asm/kvm_para.h
+++ b/arch/x86/include/asm/kvm_para.h
@@ -94,7 +94,6 @@ struct kvm_vcpu_pv_apf_data {
extern void kvmclock_init(void);
extern int kvm_register_clock(char *txt);
-extern void kvm_disable_steal_time(void);
/* This instruction is vmcall. On non-VT architectures, it will generate a
@@ -193,6 +192,7 @@ void __init kvm_guest_init(void);
void kvm_async_pf_task_wait(u32 token);
void kvm_async_pf_task_wake(u32 token);
u32 kvm_read_and_reset_pf_reason(void);
+extern void kvm_disable_steal_time(void);
#else
#define kvm_guest_init() do { } while (0)
#define kvm_async_pf_task_wait(T) do {} while(0)
@@ -201,6 +201,11 @@ static inline u32 kvm_read_and_reset_pf_reason(void)
{
return 0;
}
+
+static inline void kvm_disable_steal_time(void)
+{
+ return;
+}
#endif
#endif /* __KERNEL__ */
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: KVM guest: fix build with CONFIG_KVM_GUEST=n
2011-07-19 15:46 KVM guest: fix build with CONFIG_KVM_GUEST=n Marcelo Tosatti
@ 2011-07-19 16:57 ` Randy Dunlap
0 siblings, 0 replies; 2+ messages in thread
From: Randy Dunlap @ 2011-07-19 16:57 UTC (permalink / raw)
To: Marcelo Tosatti; +Cc: kvm
On Tue, 19 Jul 2011 12:46:22 -0300 Marcelo Tosatti wrote:
>
> Fix build with CONFIG_KVM_GUEST=n.
>
> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Thanks.
>
> diff --git a/arch/x86/include/asm/kvm_para.h b/arch/x86/include/asm/kvm_para.h
> index 35d732d..734c376 100644
> --- a/arch/x86/include/asm/kvm_para.h
> +++ b/arch/x86/include/asm/kvm_para.h
> @@ -94,7 +94,6 @@ struct kvm_vcpu_pv_apf_data {
>
> extern void kvmclock_init(void);
> extern int kvm_register_clock(char *txt);
> -extern void kvm_disable_steal_time(void);
>
>
> /* This instruction is vmcall. On non-VT architectures, it will generate a
> @@ -193,6 +192,7 @@ void __init kvm_guest_init(void);
> void kvm_async_pf_task_wait(u32 token);
> void kvm_async_pf_task_wake(u32 token);
> u32 kvm_read_and_reset_pf_reason(void);
> +extern void kvm_disable_steal_time(void);
> #else
> #define kvm_guest_init() do { } while (0)
> #define kvm_async_pf_task_wait(T) do {} while(0)
> @@ -201,6 +201,11 @@ static inline u32 kvm_read_and_reset_pf_reason(void)
> {
> return 0;
> }
> +
> +static inline void kvm_disable_steal_time(void)
> +{
> + return;
> +}
> #endif
>
> #endif /* __KERNEL__ */
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-07-19 16:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-19 15:46 KVM guest: fix build with CONFIG_KVM_GUEST=n Marcelo Tosatti
2011-07-19 16:57 ` Randy Dunlap
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox