[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/2] qxl: upon reset, if spice worker is stopped, th
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 2/2] qxl: upon reset, if spice worker is stopped, the command rings can be not empty |
Date: |
Wed, 20 Jul 2011 12:25:38 +0200 |
From: Yonit Halperin <address@hidden>
Spice worker does no longer process commands when it is stopped.
Otherwise, it might crash during migration when attempting to process
commands while the guest is not completely loaded.
Cc: Alon Levy <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/qxl.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/qxl.c b/hw/qxl.c
index 0b9a4c7..a6fb7f0 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -656,8 +656,8 @@ static void qxl_reset_state(PCIQXLDevice *d)
QXLRam *ram = d->ram;
QXLRom *rom = d->rom;
- assert(SPICE_RING_IS_EMPTY(&ram->cmd_ring));
- assert(SPICE_RING_IS_EMPTY(&ram->cursor_ring));
+ assert(!d->ssd.running || SPICE_RING_IS_EMPTY(&ram->cmd_ring));
+ assert(!d->ssd.running || SPICE_RING_IS_EMPTY(&ram->cursor_ring));
d->shadow_rom.update_id = cpu_to_le32(0);
*rom = d->shadow_rom;
qxl_rom_set_dirty(d);
--
1.7.1
- [Qemu-devel] [PATCH 3/9] qxl: set mm_time in vga update, (continued)
- [Qemu-devel] [PATCH 3/9] qxl: set mm_time in vga update, Gerd Hoffmann, 2011/07/04
- [Qemu-devel] [PATCH 7/9] qxl: make sure primary surface is saved on migration, Gerd Hoffmann, 2011/07/04
- [Qemu-devel] [PATCH 8/9] qxl: put QXL_IO_UPDATE_IRQ into vgamode whitelist, Gerd Hoffmann, 2011/07/04
- [Qemu-devel] [PATCH 6/9] qxl: add dev id to guest prints, Gerd Hoffmann, 2011/07/04
- [Qemu-devel] [PATCH 1/9] qxl: device id fixup, Gerd Hoffmann, 2011/07/04
- [Qemu-devel] [PATCH 4/9] qxl: interface_get_command: fix reported mode, Gerd Hoffmann, 2011/07/04
- [Qemu-devel] [PATCH 9/9] qxl: allow QXL_IO_LOG also in vga, Gerd Hoffmann, 2011/07/04
- Re: [Qemu-devel] [PULL] spice patch queue, Gerd Hoffmann, 2011/07/12
- Re: [Qemu-devel] [PULL] spice patch queue, Anthony Liguori, 2011/07/19
- [Qemu-devel] [PULL] spice patch queue, Gerd Hoffmann, 2011/07/20