[kvm-devel] [PATCH]7/10 KVM Portability:Moving the filed tss_addr to kvm_x86.

[Zhang, Xiantao]

>From e3c2f0fcf9264d03a90a788fe5770ac9b8ce44d9 Mon Sep 17 00:00:00 2001
From: Zhang Xiantao <[EMAIL PROTECTED]>
Date: Tue, 20 Nov 2007 23:31:38 +0800
Subject: [PATCH] KVM Portability: Splitting kvm structure.
Moving the filed tss_addr to kvm_x86.
Signed-off-by: Zhang Xiantao <[EMAIL PROTECTED]>
---
 drivers/kvm/kvm.h |    1 -
 drivers/kvm/vmx.c |   10 +++++++---
 drivers/kvm/x86.h |    1 +
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/kvm/kvm.h b/drivers/kvm/kvm.h
index bcfa555..d8fdd7b 100644
--- a/drivers/kvm/kvm.h
+++ b/drivers/kvm/kvm.h
@@ -224,7 +224,6 @@ struct kvm {
        struct kvm_io_bus mmio_bus;
        struct kvm_io_bus pio_bus;
        int round_robin_prev_vcpu;
-       unsigned int tss_addr;
        struct page *apic_access_page;
        struct kvm_vm_stat stat;
 };
diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c
index 4ad60c9..02593ad 100644
--- a/drivers/kvm/vmx.c
+++ b/drivers/kvm/vmx.c
@@ -1141,12 +1141,15 @@ static void enter_pmode(struct kvm_vcpu *vcpu)
 
 static gva_t rmode_tss_base(struct kvm *kvm)
 {
-       if (!kvm->tss_addr) {
+
+       struct kvm_x86 *kvm_x86 = to_kvm_x86(kvm);
+
+       if (!kvm_x86->tss_addr) {
                gfn_t base_gfn = kvm->memslots[0].base_gfn +
                                 kvm->memslots[0].npages - 3;
                return base_gfn << PAGE_SHIFT;
        }
-       return kvm->tss_addr;
+       return kvm_x86->tss_addr;
 }
 
 static void fix_rmode_seg(int seg, struct kvm_save_segment *save)
@@ -1775,11 +1778,12 @@ static int vmx_set_tss_addr(struct kvm *kvm,
unsigned int addr)
                .memory_size = PAGE_SIZE * 3,
                .flags = 0,
        };
+       struct kvm_x86 *kvm_x86 = to_kvm_x86(kvm);
 
        ret = kvm_set_memory_region(kvm, &tss_mem, 0);
        if (ret)
                return ret;
-       kvm->tss_addr = addr;
+       kvm_x86->tss_addr = addr;
        return 0;
 }
 
diff --git a/drivers/kvm/x86.h b/drivers/kvm/x86.h
index d16d9a3..ebd5ae0 100644
--- a/drivers/kvm/x86.h
+++ b/drivers/kvm/x86.h
@@ -259,6 +259,7 @@ struct kvm_x86 {
        struct hlist_head mmu_page_hash[KVM_NUM_MMU_PAGES];
        struct kvm_pic *vpic;
        struct kvm_ioapic *vioapic;
+       unsigned int tss_addr;
 };
 
 static inline struct kvm_x86 *to_kvm_x86(struct kvm *kvm)
-- 
1.5.1.2

0007-KVM-Portability-Splitting-kvm-structure.patch
Description: 0007-KVM-Portability-Splitting-kvm-structure.patch

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
kvm-devel mailing list
kvm-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-devel