aboutsummaryrefslogtreecommitdiff
path: root/hw/qxl.c
diff options
context:
space:
mode:
authorYonit Halperin <yhalperi@redhat.com>2011-09-05 08:45:58 +0300
committerGerd Hoffmann <kraxel@redhat.com>2011-09-07 09:20:09 +0200
commitefbf2950f52d467695db2944eea7664ede19fa9b (patch)
tree504d5644b0f04367ae1a0aa5478d16215ab3599d /hw/qxl.c
parenta680f7e7cbe8bebd15de2d974989d4e58810837d (diff)
downloadqemu-efbf2950f52d467695db2944eea7664ede19fa9b.zip
qemu-efbf2950f52d467695db2944eea7664ede19fa9b.tar.gz
qemu-efbf2950f52d467695db2944eea7664ede19fa9b.tar.bz2
qxl: send interrupt after migration in case ram->int_pending != 0, RHBZ #732949
if qxl_send_events was called from spice server context, and then migration had completed before a call to pipe_read, the target guest qxl driver didn't get the interrupt. In addition, qxl_send_events ignored further interrupts of the same kind, since ram->int_pending was set. As a result, the guest driver was stacked or very slow (when the waiting for the interrupt was with timeout). Signed-off-by: Yonit Halperin <yhalperi@redhat.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/qxl.c')
-rw-r--r--hw/qxl.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/hw/qxl.c b/hw/qxl.c
index 1fe0b53..7bb2560 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -1362,7 +1362,6 @@ static void pipe_read(void *opaque)
qxl_set_irq(d);
}
-/* called from spice server thread context only */
static void qxl_send_events(PCIQXLDevice *d, uint32_t events)
{
uint32_t old_pending;
@@ -1459,7 +1458,14 @@ static void qxl_vm_change_state_handler(void *opaque, int running, int reason)
PCIQXLDevice *qxl = opaque;
qemu_spice_vm_change_state_handler(&qxl->ssd, running, reason);
- if (!running && qxl->mode == QXL_MODE_NATIVE) {
+ if (running) {
+ /*
+ * if qxl_send_events was called from spice server context before
+ * migration ended, qxl_set_irq for these events might not have been
+ * called
+ */
+ qxl_set_irq(qxl);
+ } else if (qxl->mode == QXL_MODE_NATIVE) {
/* dirty all vram (which holds surfaces) and devram (primary surface)
* to make sure they are saved */
/* FIXME #1: should go out during "live" stage */