Re: [Xen-devel] [PATCH 1/3] xenoprof: Adjust indentation

["Jan Beulich" <JBeulich@xxxxxxxx>]

>>> On 20.01.12 at 19:44, Marcus Granado <marcus.granado@xxxxxxxxxx> wrote:
> xenoprof: Adjust indentation
> 
> Bring indentation into Xen hypervisor standard coding style.

If you fiddle with indentation, then the rest of the coding style should
really also be adjusted at once. Ending up with a hybrid between Linux
and Xen imo is worse than using one of the styles consistently.

Jan

> No functional changes.
> 
> Signed-off-by: George Dunlap <george.dunlap@xxxxxxxxxxxxx>
> 
> 
> diff -r 9cdcedc133e5 -r f6953e89913f xen/arch/x86/oprofile/backtrace.c
> --- a/xen/arch/x86/oprofile/backtrace.c    Wed Jan 11 10:34:45 2012 +0100
> +++ b/xen/arch/x86/oprofile/backtrace.c    Wed Jan 18 17:23:02 2012 +0000
> @@ -16,48 +16,48 @@
>   #include<asm/guest_access.h>
> 
>   struct frame_head {
> -    struct frame_head * ebp;
> -    unsigned long ret;
> +    struct frame_head * ebp;
> +    unsigned long ret;
>   } __attribute__((packed));
> 
>   static struct frame_head *
>   dump_hypervisor_backtrace(struct domain *d, struct vcpu *vcpu,
>                 struct frame_head * head, int mode)
>   {
> -    if (!xenoprof_add_trace(d, vcpu, head->ret, mode))
> -        return 0;
> -
> -    /* frame pointers should strictly progress back up the stack
> -     * (towards higher addresses) */
> -    if (head >= head->ebp)
> -        return NULL;
> -
> -    return head->ebp;
> +    if (!xenoprof_add_trace(d, vcpu, head->ret, mode))
> +        return 0;
> +
> +    /* frame pointers should strictly progress back up the stack
> +     * (towards higher addresses) */
> +    if (head >= head->ebp)
> +        return NULL;
> +
> +    return head->ebp;
>   }
> 
>   static struct frame_head *
>   dump_guest_backtrace(struct domain *d, struct vcpu *vcpu,
>                struct frame_head * head, int mode)
>   {
> -    struct frame_head bufhead[2];
> -    XEN_GUEST_HANDLE(char) guest_head = guest_handle_from_ptr(head, char);
> +    struct frame_head bufhead[2];
> +    XEN_GUEST_HANDLE(char) guest_head = guest_handle_from_ptr(head, char);
> 
> -    /* Also check accessibility of one struct frame_head beyond */
> -    if (!guest_handle_okay(guest_head, sizeof(bufhead)))
> -        return 0;
> -    if (__copy_from_guest_offset((char *)bufhead, guest_head, 0,
> -        sizeof(bufhead)))
> -        return 0;
> -
> -    if (!xenoprof_add_trace(d, vcpu, bufhead[0].ret, mode))
> -        return 0;
> -
> -    /* frame pointers should strictly progress back up the stack
> -     * (towards higher addresses) */
> -    if (head >= bufhead[0].ebp)
> -        return NULL;
> -
> -    return bufhead[0].ebp;
> +    /* Also check accessibility of one struct frame_head beyond */
> +    if (!guest_handle_okay(guest_head, sizeof(bufhead)))
> +        return 0;
> +    if (__copy_from_guest_offset((char *)bufhead, guest_head, 0,
> +                                 sizeof(bufhead)))
> +        return 0;
> +
> +    if (!xenoprof_add_trace(d, vcpu, bufhead[0].ret, mode))
> +        return 0;
> +
> +    /* frame pointers should strictly progress back up the stack
> +     * (towards higher addresses) */
> +    if (head >= bufhead[0].ebp)
> +        return NULL;
> +
> +    return bufhead[0].ebp;
>   }
> 
>   /*
> @@ -94,22 +94,22 @@ dump_guest_backtrace(struct domain *d, s
>   static int valid_hypervisor_stack(struct frame_head * head,
>                     struct cpu_user_regs * regs)
>   {
> -    unsigned long headaddr = (unsigned long)head;
> +    unsigned long headaddr = (unsigned long)head;
>   #ifdef CONFIG_X86_64
> -    unsigned long stack = (unsigned long)regs->rsp;
> +    unsigned long stack = (unsigned long)regs->rsp;
>   #else
> -    unsigned long stack = (unsigned long)regs;
> +    unsigned long stack = (unsigned long)regs;
>   #endif
> -    unsigned long stack_base = (stack & ~(STACK_SIZE - 1)) + STACK_SIZE;
> +    unsigned long stack_base = (stack & ~(STACK_SIZE - 1)) + STACK_SIZE;
> 
> -    return headaddr > stack && headaddr < stack_base;
> +    return headaddr > stack && headaddr < stack_base;
>   }
>   #else
>   /* without fp, it's just junk */
>   static int valid_hypervisor_stack(struct frame_head * head,
>                     struct cpu_user_regs * regs)
>   {
> -    return 0;
> +    return 0;
>   }
>   #endif
> 
> @@ -117,16 +117,16 @@ void xenoprof_backtrace(struct domain *d
>               struct cpu_user_regs * const regs,
>               unsigned long depth, int mode)
>   {
> -    struct frame_head *head;
> +    struct frame_head *head;
> 
> -    head = (struct frame_head *)regs->ebp;
> +    head = (struct frame_head *)regs->ebp;
> 
> -    if (mode > 1) {
> -        while (depth-- && valid_hypervisor_stack(head, regs))
> -            head = dump_hypervisor_backtrace(d, vcpu, head, mode);
> -        return;
> -    }
> +    if (mode > 1) {
> +        while (depth-- && valid_hypervisor_stack(head, regs))
> +            head = dump_hypervisor_backtrace(d, vcpu, head, mode);
> +        return;
> +    }
> 
> -    while (depth-- && head)
> -        head = dump_guest_backtrace(d, vcpu, head, mode);
> +    while (depth-- && head)
> +        head = dump_guest_backtrace(d, vcpu, head, mode);
>   }



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