[PATCH v2 13/23] x86: provide stubs, declarations and macros in hvm.h

[Wei Liu <wei.liu2@citrix.com>]

Make sure hvm_enabled evaluate to false then provide necessary stubs,
declarations and macros to make Xen build.

The is_viridian_domain macro can't be turned into an inline function
easily, so instead its caller is modified to avoid unused variable
warning.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 xen/arch/x86/traps.c          |   4 +-
 xen/include/asm-x86/hvm/hvm.h | 149 ++++++++++++++++++++++++++++++++++-
 2 files changed, 148 insertions(+), 5 deletions(-)

diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c
index ddff346..27b9651 100644
--- a/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
@@ -771,9 +771,9 @@ static void do_trap(struct cpu_user_regs *regs)
 /* Returns 0 if not handled, and non-0 for success. */
 int rdmsr_hypervisor_regs(uint32_t idx, uint64_t *val)
 {
-    struct domain *d = current->domain;
     /* Optionally shift out of the way of Viridian architectural MSRs. */
-    uint32_t base = is_viridian_domain(d) ? 0x40000200 : 0x40000000;
+    uint32_t base = is_viridian_domain(current->domain)
+        ? 0x40000200 : 0x40000000;
 
     switch ( idx - base )
     {
diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h
index 9c73cbf..7820586 100644
--- a/xen/include/asm-x86/hvm/hvm.h
+++ b/xen/include/asm-x86/hvm/hvm.h
@@ -235,7 +235,10 @@ struct hvm_function_table {
 };
 
 extern struct hvm_function_table hvm_funcs;
-extern bool_t hvm_enabled;
+
+#ifdef CONFIG_HVM
+extern bool hvm_enabled;
+
 extern s8 hvm_port80_allowed;
 
 extern const struct hvm_function_table *start_svm(void);
@@ -268,8 +271,8 @@ u64 hvm_get_guest_tsc_fixed(struct vcpu *v, u64 at_tsc);
 #define hvm_tsc_scaling_ratio(d) \
     ((d)->arch.hvm_domain.tsc_scaling_ratio)
 
-u64 hvm_scale_tsc(const struct domain *d, u64 tsc);
-u64 hvm_get_tsc_scaling_ratio(u32 gtsc_khz);
+uint64_t hvm_scale_tsc(const struct domain *d, uint64_t tsc);
+uint64_t hvm_get_tsc_scaling_ratio(uint32_t gtsc_khz);
 
 void hvm_init_guest_time(struct domain *d);
 void hvm_set_guest_time(struct vcpu *v, u64 guest_time);
@@ -675,6 +678,146 @@ unsigned long hvm_cr4_guest_valid_bits(const struct domain *d, bool restore);
         d_->arch.hvm_domain.pi_ops.vcpu_block(v_);          \
 })
 
+#else /* CONFIG_HVM */
+
+#define hvm_enabled false
+
+static inline int hvm_guest_x86_mode(struct vcpu *v)
+{
+    ASSERT_UNREACHABLE();
+    return -1;
+}
+
+static inline bool hvm_is_singlestep_supported(void)
+{
+    ASSERT_UNREACHABLE();
+    return false;
+}
+
+static inline int vmsi_deliver(
+    struct domain *d, int vector,
+    uint8_t dest, uint8_t dest_mode,
+    uint8_t delivery_mode, uint8_t trig_mode)
+{
+    ASSERT_UNREACHABLE();
+    return -EINVAL;
+}
+
+static inline bool nhvm_vmcx_hap_enabled(struct vcpu *v)
+{
+    return false;
+}
+
+static inline bool hvm_hap_supported(void)
+{
+    return false;
+}
+
+static inline void hvm_set_info_guest(struct vcpu *v)
+{
+    ASSERT_UNREACHABLE();
+}
+
+static inline void hvm_cpuid_policy_changed(struct vcpu *v)
+{
+    ASSERT_UNREACHABLE();
+}
+
+static inline void hvm_flush_guest_tlbs(void)
+{
+    ASSERT_UNREACHABLE();
+}
+
+static inline void hvm_invlpg(struct vcpu *v, unsigned long linear)
+{
+    ASSERT_UNREACHABLE();
+}
+
+static inline int hvm_cpu_up(void)
+{
+    return 0;
+}
+
+static inline void hvm_cpu_down(void)
+{
+}
+
+static inline unsigned long hvm_get_shadow_gs_base(struct vcpu *v)
+{
+    ASSERT_UNREACHABLE();
+    return 0;
+}
+
+static inline void hvm_set_tsc_offset(struct vcpu *v, uint64_t offset,
+                                      uint64_t at_tsc)
+{
+    ASSERT_UNREACHABLE();
+}
+
+static inline void hvm_update_host_cr3(struct vcpu *v)
+{
+    ASSERT_UNREACHABLE();
+}
+
+static inline unsigned int hvm_get_cpl(struct vcpu *v)
+{
+    ASSERT_UNREACHABLE();
+    return -1;
+}
+
+static inline int hvm_event_pending(struct vcpu *v)
+{
+    return 0;
+}
+
+static inline void hvm_inject_hw_exception(unsigned int vector, int errcode)
+{
+    ASSERT_UNREACHABLE();
+}
+
+static inline void hvm_update_guest_cr3(struct vcpu *v, bool noflush)
+{
+    ASSERT_UNREACHABLE();
+}
+
+#define hvm_long_mode_active(v) (false)
+#define hvm_pae_enabled(v) (false)
+#define hvm_get_guest_time(v) (0)
+#define is_viridian_domain(d) (false)
+#define has_viridian_time_ref_count(d) (false)
+#define hvm_tsc_scaling_supported (false)
+#define hap_has_1gb (false)
+#define hap_has_2mb (false)
+
+#define hvm_paging_enabled(v) (false)
+#define hvm_nx_enabled(v) (false)
+#define hvm_wp_enabled(v) (false)
+#define hvm_smap_enabled(v) (false)
+#define hvm_smep_enabled(v) (false)
+#define hvm_pku_enabled(v) (false)
+
+#define arch_vcpu_block(v) ((void)v)
+
+int hvm_vcpu_initialise(struct vcpu *v);
+void hvm_vcpu_destroy(struct vcpu *v);
+int hvm_domain_initialise(struct domain *d);
+void hvm_domain_destroy(struct domain *d);
+void hvm_domain_soft_reset(struct domain *d);
+void hvm_domain_relinquish_resources(struct domain *d);
+uint64_t hvm_scale_tsc(const struct domain *d, uint64_t tsc);
+uint64_t hvm_get_tsc_scaling_ratio(uint32_t gtsc_khz);
+
+void hvm_get_segment_register(struct vcpu *v, enum x86_segment seg,
+                              struct segment_register *reg);
+
+void hvm_set_rdtsc_exiting(struct domain *d, bool_t enable);
+void hvm_toggle_singlestep(struct vcpu *v);
+void hvm_mapped_guest_frames_mark_dirty(struct domain *);
+void hvm_hypercall_page_initialise(struct domain *d,
+                                   void *hypercall_page);
+
+#endif /* CONFIG_HVM */
+
 #endif /* __ASM_X86_HVM_HVM_H__ */
 
 /*
-- 
git-series 0.9.1

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel