From: Avi Kivity <[email protected]> Avoid calling the native versions since we mangle the desc_struct type.
Signed-off-by: Avi Kivity <[email protected]> diff --git a/sync b/sync index 4b61bae..ac8ea05 100755 --- a/sync +++ b/sync @@ -37,7 +37,7 @@ def __hack(data): 'on_each_cpu relay_open request_irq free_irq ' 'init_srcu_struct cleanup_srcu_struct srcu_read_lock ' 'srcu_read_unlock synchronize_srcu srcu_batches_completed ' - 'do_machine_check eventfd_signal' + 'do_machine_check eventfd_signal get_desc_base get_desc_limit ' ) anon_inodes = anon_inodes_exit = False mce = False diff --git a/x86/external-module-compat.h b/x86/external-module-compat.h index 8f7c4ff..2545ce9 100644 --- a/x86/external-module-compat.h +++ b/x86/external-module-compat.h @@ -422,6 +422,16 @@ struct kvm_desc_ptr { unsigned long address; } __attribute__((packed)); +static inline unsigned long kvm_get_desc_base(const struct kvm_desc_struct *desc) +{ + return desc->base0 | ((desc->base1) << 16) | ((desc->base2) << 24); +} + +static inline unsigned long kvm_get_desc_limit(const struct kvm_desc_struct *desc) +{ + return desc->limit0 | (desc->limit << 16); +} + #include <asm/msr.h> #ifndef MSR_FS_BASE #define MSR_FS_BASE 0xc0000100 -- To unsubscribe from this list: send the line "unsubscribe kvm-commits" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
