summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2011-07-22 09:24:07 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2011-07-22 09:24:07 -0500
commite07fc405dc0432c712c9e36c70229f0428f86fa1 (patch)
treece9c33f6219633a9055fa377160d707cad7b80df /hw
parent44129530ddf9edcc95913a4c05c755fb732c2bfe (diff)
parent8927cfbba232e28304734f7afd463c1b84134031 (diff)
downloadqemu-e07fc405dc0432c712c9e36c70229f0428f86fa1.tar.gz
Merge remote-tracking branch 'spice/spice.v39' into staging
Diffstat (limited to 'hw')
-rw-r--r--hw/qxl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/qxl.c b/hw/qxl.c
index 0b9a4c71ec..a6fb7f0acb 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);