* [PATCH] hw/display/cirrus_vga: Fix code mis-indentation
@ 2020-05-29 16:54 Philippe Mathieu-Daudé
2020-05-30 17:41 ` Thomas Huth
2020-06-05 7:17 ` Gerd Hoffmann
0 siblings, 2 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-05-29 16:54 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Peter Maydell, Gerd Hoffmann, Philippe Mathieu-Daudé
While replacing fprintf() by qemu_log_mask() in commit
2b55f4d3504, we incorrectly used a 'tab = 4 spaces'
alignment, leading to misindented new code. Fix now.
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/display/cirrus_vga.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c
index 92c197cdde..212d6f5e61 100644
--- a/hw/display/cirrus_vga.c
+++ b/hw/display/cirrus_vga.c
@@ -1032,9 +1032,9 @@ static void cirrus_bitblt_start(CirrusVGAState * s)
} else {
if (s->cirrus_blt_mode & CIRRUS_BLTMODE_TRANSPARENTCOMP) {
if (s->cirrus_blt_pixelwidth > 2) {
- qemu_log_mask(LOG_GUEST_ERROR,
- "cirrus: src transparent without colorexpand "
- "must be 8bpp or 16bpp\n");
+ qemu_log_mask(LOG_GUEST_ERROR,
+ "cirrus: src transparent without colorexpand "
+ "must be 8bpp or 16bpp\n");
goto bitblt_ignore;
}
if (s->cirrus_blt_mode & CIRRUS_BLTMODE_BACKWARDS) {
--
2.21.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] hw/display/cirrus_vga: Fix code mis-indentation
2020-05-29 16:54 [PATCH] hw/display/cirrus_vga: Fix code mis-indentation Philippe Mathieu-Daudé
@ 2020-05-30 17:41 ` Thomas Huth
2020-06-03 6:13 ` Philippe Mathieu-Daudé
2020-06-05 7:17 ` Gerd Hoffmann
1 sibling, 1 reply; 4+ messages in thread
From: Thomas Huth @ 2020-05-30 17:41 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: qemu-trivial, Peter Maydell, Gerd Hoffmann
On 29/05/2020 18.54, Philippe Mathieu-Daudé wrote:
> While replacing fprintf() by qemu_log_mask() in commit
> 2b55f4d3504, we incorrectly used a 'tab = 4 spaces'
> alignment, leading to misindented new code. Fix now.
>
> Reported-by: Peter Maydell <peter.maydell@linaro.org>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> hw/display/cirrus_vga.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c
> index 92c197cdde..212d6f5e61 100644
> --- a/hw/display/cirrus_vga.c
> +++ b/hw/display/cirrus_vga.c
> @@ -1032,9 +1032,9 @@ static void cirrus_bitblt_start(CirrusVGAState * s)
> } else {
> if (s->cirrus_blt_mode & CIRRUS_BLTMODE_TRANSPARENTCOMP) {
> if (s->cirrus_blt_pixelwidth > 2) {
> - qemu_log_mask(LOG_GUEST_ERROR,
> - "cirrus: src transparent without colorexpand "
> - "must be 8bpp or 16bpp\n");
> + qemu_log_mask(LOG_GUEST_ERROR,
> + "cirrus: src transparent without colorexpand "
> + "must be 8bpp or 16bpp\n");
> goto bitblt_ignore;
> }
> if (s->cirrus_blt_mode & CIRRUS_BLTMODE_BACKWARDS) {
>
I think it would be better to fix the TABs in the whole surounding area,
too. Or maybe even in the whole file. Otherwise this problem will happen
soon again...
Thomas
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] hw/display/cirrus_vga: Fix code mis-indentation
2020-05-30 17:41 ` Thomas Huth
@ 2020-06-03 6:13 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-06-03 6:13 UTC (permalink / raw)
To: Thomas Huth, qemu-devel; +Cc: qemu-trivial, Peter Maydell, Gerd Hoffmann
On 5/30/20 7:41 PM, Thomas Huth wrote:
> On 29/05/2020 18.54, Philippe Mathieu-Daudé wrote:
>> While replacing fprintf() by qemu_log_mask() in commit
>> 2b55f4d3504, we incorrectly used a 'tab = 4 spaces'
>> alignment, leading to misindented new code. Fix now.
>>
>> Reported-by: Peter Maydell <peter.maydell@linaro.org>
>> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>> ---
>> hw/display/cirrus_vga.c | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c
>> index 92c197cdde..212d6f5e61 100644
>> --- a/hw/display/cirrus_vga.c
>> +++ b/hw/display/cirrus_vga.c
>> @@ -1032,9 +1032,9 @@ static void cirrus_bitblt_start(CirrusVGAState * s)
>> } else {
>> if (s->cirrus_blt_mode & CIRRUS_BLTMODE_TRANSPARENTCOMP) {
>> if (s->cirrus_blt_pixelwidth > 2) {
>> - qemu_log_mask(LOG_GUEST_ERROR,
>> - "cirrus: src transparent without colorexpand "
>> - "must be 8bpp or 16bpp\n");
>> + qemu_log_mask(LOG_GUEST_ERROR,
>> + "cirrus: src transparent without colorexpand "
>> + "must be 8bpp or 16bpp\n");
>> goto bitblt_ignore;
>> }
>> if (s->cirrus_blt_mode & CIRRUS_BLTMODE_BACKWARDS) {
>>
>
> I think it would be better to fix the TABs in the whole surounding area,
> too. Or maybe even in the whole file. Otherwise this problem will happen
> soon again...
Well, this is a small step to unbreak alignment mistake from latest pull
request because my editor was using a 1tab=4spaces configuration, and
QEMU style expects 1tab=8spaces:
https://www.mail-archive.com/qemu-devel@nongnu.org/msg707941.html
Fixing the whole area is a different task IMO :)
Can this go via qemu-trivial?
>
> Thomas
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] hw/display/cirrus_vga: Fix code mis-indentation
2020-05-29 16:54 [PATCH] hw/display/cirrus_vga: Fix code mis-indentation Philippe Mathieu-Daudé
2020-05-30 17:41 ` Thomas Huth
@ 2020-06-05 7:17 ` Gerd Hoffmann
1 sibling, 0 replies; 4+ messages in thread
From: Gerd Hoffmann @ 2020-06-05 7:17 UTC (permalink / raw)
To: Philippe Mathieu-Daudé; +Cc: qemu-trivial, Peter Maydell, qemu-devel
On Fri, May 29, 2020 at 06:54:36PM +0200, Philippe Mathieu-Daudé wrote:
> While replacing fprintf() by qemu_log_mask() in commit
> 2b55f4d3504, we incorrectly used a 'tab = 4 spaces'
> alignment, leading to misindented new code. Fix now.
>
> Reported-by: Peter Maydell <peter.maydell@linaro.org>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Added to vga queue.
thanks,
Gerd
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-06-05 7:19 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-29 16:54 [PATCH] hw/display/cirrus_vga: Fix code mis-indentation Philippe Mathieu-Daudé
2020-05-30 17:41 ` Thomas Huth
2020-06-03 6:13 ` Philippe Mathieu-Daudé
2020-06-05 7:17 ` Gerd Hoffmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).