From: Yonit Halperin Date: Tue, 12 Jul 2011 08:51:58 +0000 (+0300) Subject: qxl: upon reset, if spice worker is stopped, the command rings can be not empty X-Git-Tag: TizenStudio_2.0_p2.3~2579^2~3^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0d525c0d6377eabe59f162e91ae938dd0301ac0c;p=sdk%2Femulator%2Fqemu.git qxl: upon reset, if spice worker is stopped, the command rings can be not empty 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 Signed-off-by: Gerd Hoffmann --- 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);