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.mayd...@linaro.org>
>> Signed-off-by: Philippe Mathieu-Daudé <f4...@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
> 
> 

Reply via email to