From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:43793) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R1Cif-00065S-6G for qemu-devel@nongnu.org; Wed, 07 Sep 2011 03:38:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R1Cid-0002AV-UK for qemu-devel@nongnu.org; Wed, 07 Sep 2011 03:38:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59120) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R1Cid-0002A7-JX for qemu-devel@nongnu.org; Wed, 07 Sep 2011 03:38:47 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p877ckte018333 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 7 Sep 2011 03:38:46 -0400 From: Gerd Hoffmann Date: Wed, 7 Sep 2011 09:38:33 +0200 Message-Id: <1315381115-6171-5-git-send-email-kraxel@redhat.com> In-Reply-To: <1315381115-6171-1-git-send-email-kraxel@redhat.com> References: <1315381115-6171-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 4/6] 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 , Gerd Hoffmann From: Yonit Halperin Signed-off-by: Yonit Halperin Signed-off-by: Gerd Hoffmann --- hw/qxl.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/qxl.c b/hw/qxl.c index 7bb2560..a282d23 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__); @@ -1461,10 +1461,10 @@ 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 + * 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.1