From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:33836) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qyk2Y-0003X3-Pv for qemu-devel@nongnu.org; Wed, 31 Aug 2011 08:37:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qyk2X-00004z-6P for qemu-devel@nongnu.org; Wed, 31 Aug 2011 08:37:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:13734) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qyk2W-00004s-Uw for qemu-devel@nongnu.org; Wed, 31 Aug 2011 08:37:09 -0400 From: Yonit Halperin Date: Wed, 31 Aug 2011 15:37:34 +0300 Message-Id: <1314794254-11624-2-git-send-email-yhalperi@redhat.com> In-Reply-To: <1314794254-11624-1-git-send-email-yhalperi@redhat.com> References: <1314794254-11624-1-git-send-email-yhalperi@redhat.com> Subject: [Qemu-devel] [PATCH v2 2/2] qxl: s/qxl_set_irq/qxl_update_irq/ List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Yonit Halperin , alevy@redhat.com, kraxel@redhat.com, spice-devel@freedesktop.org --- hw/qxl.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/qxl.c b/hw/qxl.c index c7edc60..3ddca88 100644 --- a/hw/qxl.c +++ b/hw/qxl.c @@ -808,7 +808,7 @@ static void qxl_exit_vga_mode(PCIQXLDevice *d) qxl_destroy_primary(d, QXL_SYNC); } -static void qxl_set_irq(PCIQXLDevice *d) +static void qxl_update_irq(PCIQXLDevice *d) { uint32_t pending = le32_to_cpu(d->ram->int_pending); uint32_t mask = le32_to_cpu(d->ram->int_mask); @@ -1209,7 +1209,7 @@ async_common: qemu_spice_wakeup(&d->ssd); break; case QXL_IO_UPDATE_IRQ: - qxl_set_irq(d); + qxl_update_irq(d); break; case QXL_IO_NOTIFY_OOM: if (!SPICE_RING_IS_EMPTY(&d->ram->release_ring)) { @@ -1359,7 +1359,7 @@ static void pipe_read(void *opaque) do { len = read(d->pipe[0], &dummy, sizeof(dummy)); } while (len == sizeof(dummy)); - qxl_set_irq(d); + qxl_update_irq(d); } static void qxl_send_events(PCIQXLDevice *d, uint32_t events) @@ -1373,7 +1373,7 @@ static void qxl_send_events(PCIQXLDevice *d, uint32_t events) return; } if (pthread_self() == d->main) { - qxl_set_irq(d); + qxl_update_irq(d); } else { if (write(d->pipe[1], d, 1) != 1) { dprint(d, 1, "%s: write to pipe failed\n", __FUNCTION__); @@ -1465,9 +1465,9 @@ static void qxl_vm_change_state_handler(void *opaque, int running, int reason) 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 + * migration ended, qxl_update_irq for these events might not have been called */ - qxl_set_irq(qxl); + qxl_update_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 */ -- 1.7.4.4