Re: [Xen-devel] [PATCH v2 2/2] x86/vmx: Drop enum handler_return

["Jan Beulich" <JBeulich@xxxxxxxx>]

>>> On 13.12.17 at 11:50, <andrew.cooper3@xxxxxxxxxx> wrote:
> @@ -3158,24 +3153,23 @@ static int vmx_msr_write_intercept(unsigned int msr, 
> uint64_t msr_content)
>  
>          switch ( long_mode_do_msr_write(msr, msr_content) )
>          {
> -            case HNDL_unhandled:
> -                if ( (vmx_write_guest_msr(msr, msr_content) != 0) &&
> -                     !is_last_branch_msr(msr) )
> -                    switch ( wrmsr_hypervisor_regs(msr, msr_content) )
> -                    {
> -                    case -ERESTART:
> -                        return X86EMUL_RETRY;
> -                    case 0:
> -                    case 1:
> -                        break;
> -                    default:
> -                        goto gp_fault;
> -                    }
> -                break;
> -            case HNDL_exception_raised:
> -                return X86EMUL_EXCEPTION;
> -            case HNDL_done:
> -                break;
> +        case X86EMUL_UNHANDLEABLE:
> +            if ( (vmx_write_guest_msr(msr, msr_content) != 0) &&
> +                 !is_last_branch_msr(msr) )
> +                switch ( wrmsr_hypervisor_regs(msr, msr_content) )
> +                {
> +                case -ERESTART:
> +                    return X86EMUL_RETRY;
> +                case 0:
> +                case 1:
> +                    break;
> +                default:
> +                    goto gp_fault;
> +                }
> +            break;
> +
> +        case X86EMUL_EXCEPTION:
> +            return X86EMUL_EXCEPTION;
>          }
>          break;

Wouldn't this better be

        case X86EMUL_OKAY:
            break;
        default:
            return <value-from-long_mode_do_msr_write()>;
        }

for this code to be independent of later uses of other X86EMUL_*
values in long_mode_do_msr_write()?

Jan


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel