Re: [Qemu-arm] [PATCH 2/2] avoid TABs in files that only contain a few

[Peter Maydell]

On Thu, 13 Dec 2018 at 22:38, Paolo Bonzini <address@hidden> wrote:
>
> Most files that have TABs only contain a handful of them.  Change
> them to spaces so that we don't confuse people.
>
> disas, standard-headers, linux-headers and libdecnumber are imported
> from other projects and probably should be exempted from the check.
> Outside those, after this patch the following files still contain both
> 8-space and TAB sequences at the beginning of the line.  Many of them
> have a majority of TABs, or were initially committed with all tabs.
>

> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index 17f1b49d11..ad6fa8e3c6 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -1854,7 +1854,7 @@ static const TypeInfo virt_machine_info = {
>      .instance_size = sizeof(VirtMachineState),
>      .class_size    = sizeof(VirtMachineClass),
>      .class_init    = virt_machine_class_init,
> -       .instance_init = virt_instance_init,
> +        .instance_init = virt_instance_init,
>      .interfaces = (InterfaceInfo[]) {
>           { TYPE_HOTPLUG_HANDLER },
>           { }

This one gets the alignment wrong -- the person who wrote
that must have had tabs set to 4-space. Eduardo has sent a
patch which fixes it up ("virt: Fix broken indentation"),
which I've queued, so this is just a heads-up about the
resulting trivial conflict.

thanks
-- PMM