Merge branch 'misc.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / arch / x86 / kvm / xen.c

diff --git a/arch/x86/kvm/xen.c b/arch/x86/kvm/xen.c
index ae17250..9ea9c3d 100644 (file)
--- a/arch/x86/kvm/xen.c
+++ b/arch/x86/kvm/xen.c
@@ -25,15 +25,14 @@ static int kvm_xen_shared_info_init(struct kvm *kvm, gfn_t gfn)
 {
        gpa_t gpa = gfn_to_gpa(gfn);
        int wc_ofs, sec_hi_ofs;
-       int ret;
+       int ret = 0;
        int idx = srcu_read_lock(&kvm->srcu);
 
-       ret = kvm_gfn_to_hva_cache_init(kvm, &kvm->arch.xen.shinfo_cache,
-                                       gpa, PAGE_SIZE);
-       if (ret)
+       if (kvm_is_error_hva(gfn_to_hva(kvm, gfn))) {
+               ret = -EFAULT;
                goto out;
-
-       kvm->arch.xen.shinfo_set = true;
+       }
+       kvm->arch.xen.shinfo_gfn = gfn;
 
        /* Paranoia checks on the 32-bit struct layout */
        BUILD_BUG_ON(offsetof(struct compat_shared_info, wc) != 0x900);
@@ -245,7 +244,7 @@ int kvm_xen_hvm_set_attr(struct kvm *kvm, struct kvm_xen_hvm_attr *data)
 
        case KVM_XEN_ATTR_TYPE_SHARED_INFO:
                if (data->u.shared_info.gfn == GPA_INVALID) {
-                       kvm->arch.xen.shinfo_set = false;
+                       kvm->arch.xen.shinfo_gfn = GPA_INVALID;
                        r = 0;
                        break;
                }
@@ -283,10 +282,7 @@ int kvm_xen_hvm_get_attr(struct kvm *kvm, struct kvm_xen_hvm_attr *data)
                break;
 
        case KVM_XEN_ATTR_TYPE_SHARED_INFO:
-               if (kvm->arch.xen.shinfo_set)
-                       data->u.shared_info.gfn = gpa_to_gfn(kvm->arch.xen.shinfo_cache.gpa);
-               else
-                       data->u.shared_info.gfn = GPA_INVALID;
+               data->u.shared_info.gfn = gpa_to_gfn(kvm->arch.xen.shinfo_gfn);
                r = 0;
                break;
 
@@ -646,6 +642,11 @@ int kvm_xen_hvm_config(struct kvm *kvm, struct kvm_xen_hvm_config *xhc)
        return 0;
 }
 
+void kvm_xen_init_vm(struct kvm *kvm)
+{
+       kvm->arch.xen.shinfo_gfn = GPA_INVALID;
+}
+
 void kvm_xen_destroy_vm(struct kvm *kvm)
 {
        if (kvm->arch.xen_hvm_config.msr)