[Xen-changelog] [xen-unstable] [IA64] vti save-restore: preparation opt_feature support

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Alex Williamson <alex.williamson@xxxxxx>
# Date 1195575283 25200
# Node ID 6fc79cb7934d9ad98ae163108e10f3fe6080dd9c
# Parent  b444678b94ea13e0eb6c0e06dbae501be2393e3a
[IA64] vti save-restore: preparation opt_feature support

Pass struct domain* to domain_opt_feature().
This patch is preparation patch for HVM domain save/restore opt_feature.

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
---
 xen/arch/ia64/vmx/mmio.c      |    4 ++--
 xen/arch/ia64/xen/domain.c    |    5 ++---
 xen/arch/ia64/xen/hypercall.c |    2 +-
 xen/include/asm-ia64/domain.h |    2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff -r b444678b94ea -r 6fc79cb7934d xen/arch/ia64/vmx/mmio.c
--- a/xen/arch/ia64/vmx/mmio.c  Tue Nov 20 09:11:15 2007 -0700
+++ b/xen/arch/ia64/vmx/mmio.c  Tue Nov 20 09:14:43 2007 -0700
@@ -252,11 +252,11 @@ static inline void set_os_type(VCPU *v, 
             optf.on = XEN_IA64_OPTF_ON;
             optf.pgprot = (_PAGE_P|_PAGE_A|_PAGE_D|_PAGE_MA_WB|_PAGE_AR_RW);
             optf.key = 0;
-            domain_opt_feature(&optf);
+            domain_opt_feature(v->domain, &optf);
 
             optf.cmd = XEN_IA64_OPTF_IDENT_MAP_REG5;
             optf.pgprot = (_PAGE_P|_PAGE_A|_PAGE_D|_PAGE_MA_UC|_PAGE_AR_RW);
-            domain_opt_feature(&optf);
+            domain_opt_feature(v->domain, &optf);
         }
     }
 }
diff -r b444678b94ea -r 6fc79cb7934d xen/arch/ia64/xen/domain.c
--- a/xen/arch/ia64/xen/domain.c        Tue Nov 20 09:11:15 2007 -0700
+++ b/xen/arch/ia64/xen/domain.c        Tue Nov 20 09:14:43 2007 -0700
@@ -2290,9 +2290,8 @@ optf_set_identity_mapping(unsigned long*
  * The vcpu must be paused to avoid racy access to opt_feature.
  */
 int
-domain_opt_feature(struct xen_ia64_opt_feature* f)
-{
-       struct domain *d = current->domain;
+domain_opt_feature(struct domain *d, struct xen_ia64_opt_feature* f)
+{
        struct opt_feature* optf = &d->arch.opt_feature;
        struct vcpu *v;
        long rc = 0;
diff -r b444678b94ea -r 6fc79cb7934d xen/arch/ia64/xen/hypercall.c
--- a/xen/arch/ia64/xen/hypercall.c     Tue Nov 20 09:11:15 2007 -0700
+++ b/xen/arch/ia64/xen/hypercall.c     Tue Nov 20 09:14:43 2007 -0700
@@ -229,7 +229,7 @@ ia64_hypercall(struct pt_regs *regs)
                struct xen_ia64_opt_feature optf;
                set_xen_guest_handle(arg, (void*)(vcpu_get_gr(v, 32)));
                if (copy_from_guest(&optf, arg, 1) == 0)
-                       regs->r8 = domain_opt_feature(&optf);
+                       regs->r8 = domain_opt_feature(v->domain, &optf);
                else
                        regs->r8 = -EFAULT;
                break;
diff -r b444678b94ea -r 6fc79cb7934d xen/include/asm-ia64/domain.h
--- a/xen/include/asm-ia64/domain.h     Tue Nov 20 09:11:15 2007 -0700
+++ b/xen/include/asm-ia64/domain.h     Tue Nov 20 09:14:43 2007 -0700
@@ -116,7 +116,7 @@ struct opt_feature {
     (1UL << XEN_IA64_OPTF_IDENT_MAP_REG5_BIT)
 
 /* Set an optimization feature in the struct arch_domain. */
-extern int domain_opt_feature(struct xen_ia64_opt_feature*);
+extern int domain_opt_feature(struct domain *, struct xen_ia64_opt_feature*);
 
 struct arch_domain {
     struct mm_struct mm;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog