[PATCH] hw/arm/virt.c: Remove newline from error_report() string

[PATCH] hw/arm/virt.c: Remove newline from error_report() string

[Peter Maydell]

error_report() strings should not include trailing newlines; remove
the newline from the error we print when devices won't fit into the
address space of the CPU.

This commit also fixes the accidental hardcoded tabs that were in
this line, since we have to touch the line anyway.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 hw/arm/virt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 2793121cb41..da6cea30534 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -1771,8 +1771,8 @@ static void virt_set_memmap(VirtMachineState *vms, int pa_bits)
     /* Base address of the high IO region */
     memtop = base = device_memory_base + ROUND_UP(device_memory_size, GiB);
     if (memtop > BIT_ULL(pa_bits)) {
-	    error_report("Addressing limited to %d bits, but memory exceeds it by %llu bytes\n",
-			 pa_bits, memtop - BIT_ULL(pa_bits));
+        error_report("Addressing limited to %d bits, but memory exceeds it by %llu bytes",
+                     pa_bits, memtop - BIT_ULL(pa_bits));
         exit(EXIT_FAILURE);
     }
     if (base < device_memory_base) {
-- 
2.34.1

Re: [PATCH] hw/arm/virt.c: Remove newline from error_report() string

[Philippe Mathieu-Daudé]

On 18/1/24 14:16, Peter Maydell wrote:
> error_report() strings should not include trailing newlines; remove
> the newline from the error we print when devices won't fit into the
> address space of the CPU.
> 
> This commit also fixes the accidental hardcoded tabs that were in
> this line, since we have to touch the line anyway.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>   hw/arm/virt.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Re: [PATCH] hw/arm/virt.c: Remove newline from error_report() string

[Philippe Mathieu-Daudé]

On 18/1/24 16:17, Philippe Mathieu-Daudé wrote:
> On 18/1/24 14:16, Peter Maydell wrote:
>> error_report() strings should not include trailing newlines; remove
>> the newline from the error we print when devices won't fit into the
>> address space of the CPU.
>>
>> This commit also fixes the accidental hardcoded tabs that were in
>> this line, since we have to touch the line anyway.
>>
>> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
>> ---
>>   hw/arm/virt.c | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

BTW there is another case:

$ spatch \
   --macro-file scripts/cocci-macro-file.h \
   --sp-file scripts/coccinelle/err-bad-newline.cocci \
   --keep-comments --use-gitgrep --dir .
./hw/arm/virt.c:1775:38:"Addressing limited to %d bits, but memory 
exceeds it by %llu bytes\n"
./ui/gtk.c:1094:56:"gtk: unexpected touch event type\n"

We could run this some of these coccinelle scripts on CI,
as a new job in .gitlab-ci.d/static_checks.yml or extending
the check-patch job...

Patch on the way for ui/gtk.c.

Re: [PATCH] hw/arm/virt.c: Remove newline from error_report() string

[Peter Maydell]

On Thu, 18 Jan 2024 at 15:30, Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
>
> On 18/1/24 16:17, Philippe Mathieu-Daudé wrote:
> > On 18/1/24 14:16, Peter Maydell wrote:
> >> error_report() strings should not include trailing newlines; remove
> >> the newline from the error we print when devices won't fit into the
> >> address space of the CPU.
> >>
> >> This commit also fixes the accidental hardcoded tabs that were in
> >> this line, since we have to touch the line anyway.
> >>
> >> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> >> ---
> >>   hw/arm/virt.c | 4 ++--
> >>   1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>
> BTW there is another case:
>
> $ spatch \
>    --macro-file scripts/cocci-macro-file.h \
>    --sp-file scripts/coccinelle/err-bad-newline.cocci \
>    --keep-comments --use-gitgrep --dir .
> ./hw/arm/virt.c:1775:38:"Addressing limited to %d bits, but memory
> exceeds it by %llu bytes\n"
> ./ui/gtk.c:1094:56:"gtk: unexpected touch event type\n"
>
> We could run this some of these coccinelle scripts on CI,
> as a new job in .gitlab-ci.d/static_checks.yml or extending
> the check-patch job...

checkpatch catches it, if you read the output, which is
how I noticed this in the first place (I was originally
touching the line to fix the tab damage).

-- PMM

Re: [PATCH] hw/arm/virt.c: Remove newline from error_report() string

[Philippe Mathieu-Daudé]

On 18/1/24 17:09, Peter Maydell wrote:
> On Thu, 18 Jan 2024 at 15:30, Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
>>
>> On 18/1/24 16:17, Philippe Mathieu-Daudé wrote:
>>> On 18/1/24 14:16, Peter Maydell wrote:
>>>> error_report() strings should not include trailing newlines; remove
>>>> the newline from the error we print when devices won't fit into the
>>>> address space of the CPU.
>>>>
>>>> This commit also fixes the accidental hardcoded tabs that were in
>>>> this line, since we have to touch the line anyway.
>>>>
>>>> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
>>>> ---
>>>>    hw/arm/virt.c | 4 ++--
>>>>    1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>>
>> BTW there is another case:
>>
>> $ spatch \
>>     --macro-file scripts/cocci-macro-file.h \
>>     --sp-file scripts/coccinelle/err-bad-newline.cocci \
>>     --keep-comments --use-gitgrep --dir .
>> ./hw/arm/virt.c:1775:38:"Addressing limited to %d bits, but memory
>> exceeds it by %llu bytes\n"
>> ./ui/gtk.c:1094:56:"gtk: unexpected touch event type\n"
>>
>> We could run this some of these coccinelle scripts on CI,
>> as a new job in .gitlab-ci.d/static_checks.yml or extending
>> the check-patch job...
> 
> checkpatch catches it, if you read the output, which is
> how I noticed this in the first place (I was originally
> touching the line to fix the tab damage).

Ah, no need to waste more CI minutes then :)

Thanks!