Re: [Qemu-devel] [PATCH] cirrus_vga: adding sanity check for vram size [checkpatch false positive?]

[Gerd Hoffmann]

On Fr, 2014-05-09 at 18:21 +0800, address@hidden wrote:
> From: Gonglei <address@hidden>
> 
> when configure a invalid vram size for cirrus card, such as less
> 2 MB, which will crash qemu. Follow the real hardware, the cirrus
> card has 4 MB video memory. Also for backward compatibility, accept
> 8 MB and 16 MB vram size.

Fails checkpatch:

=== checkpatch complains ===
WARNING: suspect code indent for conditional statements (5, 9)
#12: FILE: hw/display/cirrus_vga.c:2964:
+     if (s->vga.vram_size_mb != 4 || s->vga.vram_size_mb != 8 ||
[...]
+         error_report("Invalid cirrus_vga ram size '%u'\n",
s->vga.vram_size_mb);

WARNING: line over 80 characters
#14: FILE: hw/display/cirrus_vga.c:2966:
+         error_report("Invalid cirrus_vga ram size '%u'\n",
s->vga.vram_size_mb);

total: 0 errors, 2 warnings, 13 lines checked

First warning looks like a false positive though.

MAINTAINERS lists blue swirl as checkpatch maintainer, Cc'ing.
Havn't seen him on the list for quite a while though, is that still
up-to-date?

cheers,
  Gerd

> 
> Signed-off-by: Gonglei <address@hidden>
> ---
> For isa cirrus vga device, its' init function has been droped at
> commit db895a1e6a97e919f9b86d60c969377357b05066. I have no idea how adding
> check on isa_cirrus_vga device. Any ideas? Thanks.
>  
>  hw/display/cirrus_vga.c | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c
> index d1afc76..5fec068 100644
> --- a/hw/display/cirrus_vga.c
> +++ b/hw/display/cirrus_vga.c
> @@ -2959,6 +2959,13 @@ static int pci_cirrus_vga_initfn(PCIDevice *dev)
>       PCIDeviceClass *pc = PCI_DEVICE_GET_CLASS(dev);
>       int16_t device_id = pc->device_id;
>  
> +     /* follow real hardware, cirrus card emulated has 4 MB video memory.
> +       Also accept 8 MB/16 MB for backward compatibility. */
> +     if (s->vga.vram_size_mb != 4 || s->vga.vram_size_mb != 8 ||
> +         s->vga.vram_size_mb != 16) {
> +         error_report("Invalid cirrus_vga ram size '%u'\n", 
> s->vga.vram_size_mb);
> +         return -1;
> +     }
>       /* setup VGA */
>       vga_common_init(&s->vga, OBJECT(dev), true);
>       cirrus_init_common(s, OBJECT(dev), device_id, 1, pci_address_space(dev),