1.1 --- a/xen/arch/x86/domain.c	Thu Mar 01 11:04:45 2007 +0000
     1.2 +++ b/xen/arch/x86/domain.c	Thu Mar 01 11:08:49 2007 +0000
     1.3 @@ -501,12 +501,9 @@ int arch_set_info_guest(
     1.4      unsigned long flags;
     1.5      int i, rc = 0, compat;
     1.6  
     1.7 -    /*
     1.8 -     * HVM domain builder always builds caller-bitsize vcpu context.
     1.9 -     * The PV builder is smarter and builds the appropriate type of context for
    1.10 -     * the target domain. So the compat check here differs in the two cases.
    1.11 -     */
    1.12 -    compat = is_hvm_domain(d) ? IS_COMPAT(current->domain) : IS_COMPAT(d);
    1.13 +    /* The context is a compat-mode one if the target domain is compat-mode;
    1.14 +     * we expect the tools to DTRT even in compat-mode callers. */
    1.15 +    compat = IS_COMPAT(d);
    1.16  
    1.17  #ifdef CONFIG_COMPAT
    1.18  #define c(fld) (compat ? (c.cmp->fld) : (c.nat->fld))