qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Qemu-devel] [PATCH v3 4/5] vmware-vga: use vmsvga_verify_rect in vm


From: Don Koch
Subject: Re: [Qemu-devel] [PATCH v3 4/5] vmware-vga: use vmsvga_verify_rect in vmsvga_copy_rect
Date: Tue, 28 Oct 2014 14:04:59 -0400

On Tue, 28 Oct 2014 10:50:41 +0100
Gerd Hoffmann <address@hidden> wrote:

> Add verification to vmsvga_copy_rect, re-enable HW_RECT_ACCEL.
> 
> Cc: address@hidden
> Signed-off-by: Gerd Hoffmann <address@hidden>
> ---

Reviewed-by: Don Koch <address@hidden>

>  hw/display/vmware_vga.c | 20 ++++++++++++++------
>  1 file changed, 14 insertions(+), 6 deletions(-)
> 
> diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c
> index 9d79de6..73a1b52 100644
> --- a/hw/display/vmware_vga.c
> +++ b/hw/display/vmware_vga.c
> @@ -29,8 +29,8 @@
>  #include "hw/pci/pci.h"
>  
>  #undef VERBOSE
> -#if 0
>  #define HW_RECT_ACCEL
> +#if 0
>  #define HW_FILL_ACCEL
>  #endif
>  #define HW_MOUSE_ACCEL
> @@ -406,7 +406,7 @@ static inline void vmsvga_update_rect_flush(struct 
> vmsvga_state_s *s)
>  }
>  
>  #ifdef HW_RECT_ACCEL
> -static inline void vmsvga_copy_rect(struct vmsvga_state_s *s,
> +static inline int vmsvga_copy_rect(struct vmsvga_state_s *s,
>                  int x0, int y0, int x1, int y1, int w, int h)
>  {
>      DisplaySurface *surface = qemu_console_surface(s->vga.con);
> @@ -417,6 +417,13 @@ static inline void vmsvga_copy_rect(struct 
> vmsvga_state_s *s,
>      int line = h;
>      uint8_t *ptr[2];
>  
> +    if (!vmsvga_verify_rect(surface, "vmsvga_copy_rect/src", x0, y0, w, h)) {
> +        return -1;
> +    }
> +    if (!vmsvga_verify_rect(surface, "vmsvga_copy_rect/dst", x1, y1, w, h)) {
> +        return -1;
> +    }
> +
>      if (y1 > y0) {
>          ptr[0] = vram + bypp * x0 + bypl * (y0 + h - 1);
>          ptr[1] = vram + bypp * x1 + bypl * (y1 + h - 1);
> @@ -432,6 +439,7 @@ static inline void vmsvga_copy_rect(struct vmsvga_state_s 
> *s,
>      }
>  
>      vmsvga_update_rect_delayed(s, x1, y1, w, h);
> +    return 0;
>  }
>  #endif
>  
> @@ -625,12 +633,12 @@ static void vmsvga_fifo_run(struct vmsvga_state_s *s)
>              width = vmsvga_fifo_read(s);
>              height = vmsvga_fifo_read(s);
>  #ifdef HW_RECT_ACCEL
> -            vmsvga_copy_rect(s, x, y, dx, dy, width, height);
> -            break;
> -#else
> +            if (vmsvga_copy_rect(s, x, y, dx, dy, width, height) == 0) {
> +                break;
> +            }
> +#endif
>              args = 0;
>              goto badcmd;
> -#endif
>  
>          case SVGA_CMD_DEFINE_CURSOR:
>              len -= 8;
> -- 
> 1.8.3.1
> 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]