Fix spice hangs with ovirt (bz #966737)

0009-vgabios-use-VBE-LFB-address.patch

@@ -0,0 +1,12 @@
+diff --git a/vbe.c b/vbe.c
+index af9de66..0848ce6 100644
+--- a/vbe.c
++++ b/vbe.c
+@@ -1012,6 +1012,7 @@ Bit16u *AX;Bit16u BX; Bit16u ES;Bit16u DI;
+                 vga_compat_setup();
+ 
+                 write_word(BIOSMEM_SEG,BIOSMEM_VBE_MODE,BX);
++                write_byte(BIOSMEM_SEG,BIOSMEM_CURRENT_MODE,0xff);
+                 write_byte(BIOSMEM_SEG,BIOSMEM_VIDEO_CTL,(0x60 | no_clear));
+ 
+                 result = 0x4f;

vgabios-provide-high-res.patch

@@ -1,56 +0,0 @@
-From c3885286784174680811be037a8cef83c43c47c2 Mon Sep 17 00:00:00 2001
-From: Glauber Costa <glommer@redhat.com>
-Date: Thu, 18 Jun 2009 18:26:00 -0400
-Subject: [PATCH] provide high res resolutions to non-cirrus devices.
-
-Add widescreen modes to vbetables-gen.c , and increase device memory.
-
-Signed-off-by: Glauber Costa <glommer@redhat.com>
----
- vbetables-gen.c |   23 ++++++++++++++++++++++-
- 1 files changed, 22 insertions(+), 1 deletions(-)
-
-diff --git a/vbetables-gen.c b/vbetables-gen.c
-index 7014a16..96ac85a 100644
---- a/vbetables-gen.c
-+++ b/vbetables-gen.c
-@@ -2,7 +2,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- 
--#define VBE_DISPI_TOTAL_VIDEO_MEMORY_MB 8
-+#define VBE_DISPI_TOTAL_VIDEO_MEMORY_MB 16
- 
- typedef struct {
-     int width;
-@@ -55,6 +55,27 @@ ModeInfo modes[] = {
- { 1152, 864, 16                      , 0x14a},
- { 1152, 864, 24                      , 0x14b},
- { 1152, 864, 32                      , 0x14c},
-+{ 1280, 800, 16                      , 0x178},
-+{ 1280, 800, 24                      , 0x179},
-+{ 1280, 800, 32                      , 0x17a},
-+{ 1280, 960, 16                      , 0x17b},
-+{ 1280, 960, 24                      , 0x17c},
-+{ 1280, 960, 32                      , 0x17d},
-+{ 1440, 900, 16                      , 0x17e},
-+{ 1440, 900, 24                      , 0x17f},
-+{ 1440, 900, 32                      , 0x180},
-+{ 1400, 1050, 16                     , 0x181},
-+{ 1400, 1050, 24                     , 0x182},
-+{ 1400, 1050, 32                     , 0x183},
-+{ 1680, 1050, 16                     , 0x184},
-+{ 1680, 1050, 24                     , 0x185},
-+{ 1680, 1050, 32                     , 0x186},
-+{ 1920, 1200, 16                     , 0x187},
-+{ 1920, 1200, 24                     , 0x188},
-+{ 1920, 1200, 32                     , 0x189},
-+{ 2560, 1600, 16                     , 0x18a},
-+{ 2560, 1600, 24                     , 0x18b},
-+{ 2560, 1600, 32                     , 0x18c},
- { 0, },
- };
- 
--- 
-1.6.2.2
-

vgabios.spec

@@ -1,6 +1,6 @@
 Name:		vgabios
 Version:	0.6c
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	LGPL implementation of a vga video bios
 
 Group:		Applications/Emulators		
@@ -15,6 +15,8 @@ Patch05:		0005-Add-qemu-vmware-vga-pci-bios.patch
 Patch06:		0006-Add-qemu-qxl-vga-pci-bios.patch
 Patch07:                0007-vgabios-int10-0x11xx.patch
 Patch08:                0008-vgabios-Ensure-pcir4-is-aligned.patch
+# Fix spice hangs with ovirt (bz #966737)
+Patch0009: 0009-vgabios-use-VBE-LFB-address.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -38,6 +40,8 @@ emulators. It is not intended for use in real cards.
 %patch06 -p1
 %patch07 -p1
 %patch08 -p1
+# Fix spice hangs with ovirt (bz #966737)
+%patch0009 -p1
 
 %build 
 make clean
@@ -72,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jun 28 2013 Cole Robinson <crobinso@redhat.com> - 0.6c-9
+- Fix spice hangs with ovirt (bz #966737)
+
 * Fri Mar 8 2013 Paolo Bonzini <pbonzini@redhat.com> - 0.6c-8
 - Regenerate patch 8
 
@@ -103,7 +110,7 @@ rm -rf $RPM_BUILD_ROOT
 - properly add the patch
 
 * Fri Jun 19 2009 Glauber Costa <glommer@redhat.com> - 0.6b-1
-- applied vgabios-provide-high-res.patch, that should fix #499060
+- applied patch that should fix #499060
 - Changed versioning naming, since the "b" in 0.6b does not stand for beta.
 
 * Mon Mar 02 2009 Glauber Costa <glommer@redhat.com> - 0.6-0.5.b