diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-12 07:51:09 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-12 07:51:09 -0500 |
| commit | 25a263cdec8e40c81e597b13ffc81cd9397d1fec (patch) | |
| tree | 0487403c80a4905aa444d5e349c222d853ca39ac /hw | |
| parent | 7cb78eec5cdf6e4131613c64cc1a29476f327242 (diff) | |
| parent | 8df0c7e8fc03882230c31315f63108c049f72dac (diff) | |
| download | focaccia-qemu-25a263cdec8e40c81e597b13ffc81cd9397d1fec.tar.gz focaccia-qemu-25a263cdec8e40c81e597b13ffc81cd9397d1fec.zip | |
Merge remote-tracking branch 'spice/spice.v41' into staging
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/qxl.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/hw/qxl.c b/hw/qxl.c index db7ae7a8ff..b34bccf62e 100644 --- a/hw/qxl.c +++ b/hw/qxl.c @@ -821,17 +821,15 @@ static void qxl_check_state(PCIQXLDevice *d) { QXLRam *ram = d->ram; - 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)); } static void qxl_reset_state(PCIQXLDevice *d) { - QXLRam *ram = d->ram; QXLRom *rom = d->rom; - assert(!d->ssd.running || SPICE_RING_IS_EMPTY(&ram->cmd_ring)); - assert(!d->ssd.running || SPICE_RING_IS_EMPTY(&ram->cursor_ring)); + qxl_check_state(d); d->shadow_rom.update_id = cpu_to_le32(0); *rom = d->shadow_rom; qxl_rom_set_dirty(d); @@ -1189,7 +1187,7 @@ async_common: } d->current_async = orig_io_port; qemu_mutex_unlock(&d->async_lock); - dprint(d, 2, "start async %d (%d)\n", io_port, val); + dprint(d, 2, "start async %d (%"PRId64")\n", io_port, val); break; default: break; @@ -1305,7 +1303,8 @@ async_common: break; } case QXL_IO_FLUSH_SURFACES_ASYNC: - dprint(d, 1, "QXL_IO_FLUSH_SURFACES_ASYNC (%d) (%s, s#=%d, res#=%d)\n", + dprint(d, 1, "QXL_IO_FLUSH_SURFACES_ASYNC" + " (%"PRId64") (%s, s#=%d, res#=%d)\n", val, qxl_mode_to_string(d->mode), d->guest_surfaces.count, d->num_free_res); qxl_spice_flush_surfaces_async(d); |