rpms/kvm/F-8 kvm-cirrus.patch,NONE,1.1 kvm.spec,1.31,1.32

[Glauber Costa (glommer)]

Author: glommer

Update of /cvs/pkgs/rpms/kvm/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18741

Modified Files:
	kvm.spec 
Added Files:
	kvm-cirrus.patch 
Log Message:
* Fri May 16 2008 Glauber Costa <gcosta at redhat.com> - 60-4.fc8
- Fix problem with cirrus device that was breaking vnc connections (rhbz #446830)



kvm-cirrus.patch:

--- NEW FILE kvm-cirrus.patch ---
--- trunk/qemu/hw/cirrus_vga.c	2008/05/07 23:22:46	4385
+++ trunk/qemu/hw/cirrus_vga.c	2008/05/08 12:21:27	4386
@@ -1626,13 +1626,15 @@
     case 0x17:			// Standard VGA
     case 0x18:			// Standard VGA
 	return CIRRUS_HOOK_NOT_HANDLED;
+    case 0x24:			// Attribute Controller Toggle Readback (R)
+        *reg_value = (s->ar_flip_flop << 7);
+        break;
     case 0x19:			// Interlace End
     case 0x1a:			// Miscellaneous Control
     case 0x1b:			// Extended Display Control
     case 0x1c:			// Sync Adjust and Genlock
     case 0x1d:			// Overlay Extended Control
     case 0x22:			// Graphics Data Latches Readback (R)
-    case 0x24:			// Attribute Controller Toggle Readback (R)
     case 0x25:			// Part Status
     case 0x27:			// Part ID (R)
 	*reg_value = s->cr[reg_index];


Index: kvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvm/F-8/kvm.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- kvm.spec	28 Feb 2008 00:39:59 -0000	1.31
+++ kvm.spec	16 May 2008 16:18:04 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
 Version: 60
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Tools
 URL: http://%{name}.sf.net
@@ -9,6 +9,7 @@
 Source1: %{name}.modules
 Patch1: %{name}-bootmenu.patch
 Patch2: %{name}-%{version}-block-rw-range-check.patch
+Patch3: %{name}-cirrus.patch
 # patches from upstream qemu
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel
@@ -39,6 +40,7 @@
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 # we need to install the data bits in a different path
@@ -93,6 +95,9 @@
 %{_sysconfdir}/sysconfig/modules/%{name}.modules
 
 %changelog
+* Fri May 16 2008 Glauber Costa <gcosta at redhat.com> - 60-4.fc8
+- Fix problem with cirrus device that was breaking vnc connections (rhbz #446830)
+
 * Wed Feb 27 2008 Daniel P. Berrange <berrange at redhat.com> - 60-3.fc8
 - Fix block device checks for extendable disk formats (rhbz #434978)