From 7f73afe6e9e5d63f4c29dd03b4686dd75d0aa646 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Fri, 30 Sep 2011 18:37:59 +0300 Subject: [PATCH] kvm tools: Move segment_to_flat() to kvm/segment.h Signed-off-by: Pekka Enberg --- tools/kvm/include/kvm/kvm.h | 6 +----- tools/kvm/include/kvm/segment.h | 5 +++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/kvm/include/kvm/kvm.h b/tools/kvm/include/kvm/kvm.h index bb40c4c13567..79fa97d00111 100644 --- a/tools/kvm/include/kvm/kvm.h +++ b/tools/kvm/include/kvm/kvm.h @@ -2,6 +2,7 @@ #define KVM__KVM_H #include "kvm/interrupt.h" +#include "kvm/segment.h" #include #include @@ -92,11 +93,6 @@ static inline bool host_ptr_in_ram(struct kvm *kvm, void *p) return kvm->ram_start <= p && p < (kvm->ram_start + kvm->ram_size); } -static inline u32 segment_to_flat(u16 selector, u16 offset) -{ - return ((u32)selector << 4) + (u32) offset; -} - static inline void *guest_flat_to_host(struct kvm *kvm, unsigned long offset) { return kvm->ram_start + offset; diff --git a/tools/kvm/include/kvm/segment.h b/tools/kvm/include/kvm/segment.h index 362e46d00b14..9387a820f137 100644 --- a/tools/kvm/include/kvm/segment.h +++ b/tools/kvm/include/kvm/segment.h @@ -3,6 +3,11 @@ #include +static inline u32 segment_to_flat(u16 selector, u16 offset) +{ + return ((u32)selector << 4) + (u32) offset; +} + static inline u16 flat_to_seg16(u32 address) { return address >> 4; -- 2.39.5