diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-07-22 09:24:07 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-07-22 09:24:07 -0500 |
| commit | e07fc405dc0432c712c9e36c70229f0428f86fa1 (patch) | |
| tree | ce9c33f6219633a9055fa377160d707cad7b80df /hw | |
| parent | 44129530ddf9edcc95913a4c05c755fb732c2bfe (diff) | |
| parent | 8927cfbba232e28304734f7afd463c1b84134031 (diff) | |
| download | qemu-e07fc405dc0432c712c9e36c70229f0428f86fa1.zip qemu-e07fc405dc0432c712c9e36c70229f0428f86fa1.tar.gz qemu-e07fc405dc0432c712c9e36c70229f0428f86fa1.tar.bz2 | |
Merge remote-tracking branch 'spice/spice.v39' into staging
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/qxl.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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); |