diff --git a/0210-qxl-Fix-QXLRam-initialisation.patch b/0210-qxl-Fix-QXLRam-initialisation.patch new file mode 100644 index 0000000..4619d29 --- /dev/null +++ b/0210-qxl-Fix-QXLRam-initialisation.patch @@ -0,0 +1,31 @@ +From dadbf35f465f3423faa797a73c9a3caf5c6ab984 Mon Sep 17 00:00:00 2001 +From: Anthony PERARD +Date: Mon, 17 Jun 2013 17:38:26 +0100 +Subject: [PATCH] qxl: Fix QXLRam initialisation. + +The qxl driver expect NULL for QXLRam.memory_configs, but this is never +initialized. + +If memory is set to 0xc2c2.., it leads to a spice-critical error when +trying to start qxl. + +Signed-off-by: Anthony PERARD +Reviewed-by: Gerd Hoffmann +Signed-off-by: Michael Tokarev +(cherry picked from commit 329f97fc4ff4b533fcd2d8f4eab6c9c2568aed27) +--- + hw/qxl.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/hw/qxl.c b/hw/qxl.c +index 80bd92a..5f52950 100644 +--- a/hw/qxl.c ++++ b/hw/qxl.c +@@ -381,6 +381,7 @@ static void init_qxl_ram(PCIQXLDevice *d) + d->ram->int_pending = cpu_to_le32(0); + d->ram->int_mask = cpu_to_le32(0); + d->ram->update_surface = 0; ++ d->ram->monitors_config = 0; + SPICE_RING_INIT(&d->ram->cmd_ring); + SPICE_RING_INIT(&d->ram->cursor_ring); + SPICE_RING_INIT(&d->ram->release_ring); diff --git a/qemu.spec b/qemu.spec index 2b20907..e3d4256 100644 --- a/qemu.spec +++ b/qemu.spec @@ -131,7 +131,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 1.4.2 -Release: 5%{?dist} +Release: 6%{?dist} # Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped Epoch: 2 License: GPLv2+ and LGPLv2+ and BSD @@ -251,6 +251,8 @@ Patch0207: 0207-spice-qemu-char-vmc_write-Don-t-write-more-bytes-the.patch Patch0208: 0208-configure-dtc-Probe-for-libfdt_env.h.patch # Fix usb_handle_packet assertions (bz #981459) Patch0209: 0209-Fix-usage-of-USB_DEV_FLAG_IS_HOST-flag.patch +# Fix crash when adding spice vdagent channel in the guest (bz #969084) +Patch0210: 0210-qxl-Fix-QXLRam-initialisation.patch BuildRequires: SDL-devel BuildRequires: zlib-devel @@ -791,6 +793,8 @@ CAC emulation development files. %patch0208 -p1 # Fix usb_handle_packet assertions (bz #981459) %patch0209 -p1 +# Fix crash when adding spice vdagent channel in the guest (bz #969084) +%patch0210 -p1 %build %if %{with kvmonly} @@ -1437,6 +1441,9 @@ getent passwd qemu >/dev/null || \ %endif %changelog +* Thu Aug 01 2013 Cole Robinson - 2:1.4.2-6 +- Fix crash when adding spice vdagent channel in the guest (bz #969084) + * Tue Jul 30 2013 Cole Robinson - 2:1.4.2-5 - Fix usb_handle_packet assertions (bz #981459)