diff -u qemu-kvm-1.0+noroms/debian/changelog qemu-kvm-1.0+noroms/debian/changelog --- qemu-kvm-1.0+noroms/debian/changelog +++ qemu-kvm-1.0+noroms/debian/changelog @@ -1,3 +1,10 @@ +qemu-kvm (1.0+noroms-0ubuntu7~vmvga2) precise; urgency=low + + * fix-vmware-vga-negative-vals - if x or y < 0, set them to 0 (and + decrement with/height accordingly) (LP: #918791) + + -- Serge Hallyn Thu, 01 Mar 2012 16:18:34 -0600 + qemu-kvm (1.0+noroms-0ubuntu6) precise; urgency=low [ Stefan Weil ] diff -u qemu-kvm-1.0+noroms/debian/patches/series qemu-kvm-1.0+noroms/debian/patches/series --- qemu-kvm-1.0+noroms/debian/patches/series +++ qemu-kvm-1.0+noroms/debian/patches/series @@ -9,0 +10 @@ +fix-vmware-vga-negative-vals only in patch2: unchanged: --- qemu-kvm-1.0+noroms.orig/debian/patches/fix-vmware-vga-negative-vals +++ qemu-kvm-1.0+noroms/debian/patches/fix-vmware-vga-negative-vals @@ -0,0 +1,23 @@ +Index: qemu-kvm-1.0+noroms/hw/vmware_vga.c +=================================================================== +--- qemu-kvm-1.0+noroms.orig/hw/vmware_vga.c 2011-12-04 04:38:06.000000000 -0600 ++++ qemu-kvm-1.0+noroms/hw/vmware_vga.c 2012-03-01 16:18:02.556171506 -0600 +@@ -298,6 +298,18 @@ + uint8_t *src; + uint8_t *dst; + ++ if (x < 0) { ++ fprintf(stderr, "%s: update x was < 0 (%d)\n", ++ __FUNCTION__, x); ++ w += x; ++ x = 0; ++ } ++ if (y < 0) { ++ fprintf(stderr, "%s: update y was < 0 (%d)\n", ++ __FUNCTION__, y); ++ h += y; ++ y = 0; ++ } + if (x + w > s->width) { + fprintf(stderr, "%s: update width too large x: %d, w: %d\n", + __FUNCTION__, x, w);