kvm tools: Move segment_to_flat() to kvm/segment.h

Signed-off-by: Pekka Enberg <penberg@kernel.org>

diff --git a/tools/kvm/include/kvm/kvm.h b/tools/kvm/include/kvm/kvm.h
index bb40c4c13567e2ff48aa844cbfbe13a62837850f..79fa97d00111dfca90aa5c6a6efb5943570bad0e 100644 (file)
--- 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 <stdbool.h>
 #include <linux/types.h>
@@ -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 362e46d00b1488ddd348ce5b26378755503891cc..9387a820f13710045c44366729f2bc4e23bcb1c3 100644 (file)
--- a/tools/kvm/include/kvm/segment.h
+++ b/tools/kvm/include/kvm/segment.h
@@ -3,6 +3,11 @@
 
 #include <linux/types.h>
 
+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;