From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=56274 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OOBaR-00008j-N5 for qemu-devel@nongnu.org; Mon, 14 Jun 2010 11:28:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OOBaQ-0007sf-GB for qemu-devel@nongnu.org; Mon, 14 Jun 2010 11:28:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:3543) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OOBaQ-0007sV-6p for qemu-devel@nongnu.org; Mon, 14 Jun 2010 11:28:30 -0400 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5EFSTOd014072 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 14 Jun 2010 11:28:29 -0400 From: Gerd Hoffmann Date: Mon, 14 Jun 2010 17:28:25 +0200 Message-Id: <1276529305-22640-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1276529305-22640-1-git-send-email-kraxel@redhat.com> References: <1276529305-22640-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [RESENT PATCH 3/3] Fix and simplify gui timer logic. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Kill nographic timer. Have a global gui_timer instead. Have the gui timer enabled unconditionally. We need a timer running anyway for mmio flush, so the whole have-gui-timer-only-when-needed logic is pretty pointless. It also simplifies displaylisteners coming and going at runtime, we don't need to care about the timer then as it runs anyway. Don't allocate the timer twice in case we have two display listeners. Signed-off-by: Gerd Hoffmann --- console.h | 1 - vl.c | 38 +++++++++++--------------------------- 2 files changed, 11 insertions(+), 28 deletions(-) diff --git a/console.h b/console.h index a0da498..6dad8d0 100644 --- a/console.h +++ b/console.h @@ -173,7 +173,6 @@ struct DisplayAllocator { struct DisplayState { struct DisplaySurface *surface; void *opaque; - struct QEMUTimer *gui_timer; struct DisplayAllocator* allocator; QLIST_HEAD(, DisplayChangeListener) listeners; diff --git a/vl.c b/vl.c index 2cfeab1..5181d16 100644 --- a/vl.c +++ b/vl.c @@ -231,7 +231,7 @@ int nb_numa_nodes; uint64_t node_mem[MAX_NODES]; uint64_t node_cpumask[MAX_NODES]; -static QEMUTimer *nographic_timer; +static QEMUTimer *gui_timer; uint8_t qemu_uuid[16]; @@ -1532,22 +1532,17 @@ static void gui_update(void *opaque) DisplayChangeListener *dcl; qemu_flush_coalesced_mmio_buffer(); - dpy_refresh(ds); - QLIST_FOREACH(dcl, &ds->listeners, next) { - if (dcl->gui_timer_interval && - dcl->gui_timer_interval < interval) - interval = dcl->gui_timer_interval; + if (ds != NULL && !QLIST_EMPTY(&ds->listeners)) { + dpy_refresh(ds); + QLIST_FOREACH(dcl, &ds->listeners, next) { + if (dcl->gui_timer_interval && + dcl->gui_timer_interval < interval) + interval = dcl->gui_timer_interval; + } } - qemu_mod_timer(ds->gui_timer, interval + qemu_get_clock(rt_clock)); -} - -static void nographic_update(void *opaque) -{ - uint64_t interval = GUI_REFRESH_INTERVAL; - qemu_flush_coalesced_mmio_buffer(); - qemu_mod_timer(nographic_timer, interval + qemu_get_clock(rt_clock)); + qemu_mod_timer(gui_timer, interval + qemu_get_clock(rt_clock)); } struct vm_change_state_entry { @@ -2290,7 +2285,6 @@ int main(int argc, char **argv, char **envp) const char *kernel_filename, *kernel_cmdline; char boot_devices[33] = "cad"; /* default to HD->floppy->CD-ROM */ DisplayState *ds; - DisplayChangeListener *dcl; int cyls, heads, secs, translation; QemuOpts *hda_opts = NULL, *opts; int optind; @@ -3407,18 +3401,8 @@ int main(int argc, char **argv, char **envp) } dpy_resize(ds); - QLIST_FOREACH(dcl, &ds->listeners, next) { - if (dcl->dpy_refresh != NULL) { - ds->gui_timer = qemu_new_timer(rt_clock, gui_update, ds); - qemu_mod_timer(ds->gui_timer, qemu_get_clock(rt_clock)); - break; - } - } - - if (display_type == DT_NOGRAPHIC || display_type == DT_VNC) { - nographic_timer = qemu_new_timer(rt_clock, nographic_update, NULL); - qemu_mod_timer(nographic_timer, qemu_get_clock(rt_clock)); - } + gui_timer = qemu_new_timer(rt_clock, gui_update, ds); + qemu_mod_timer(gui_timer, qemu_get_clock(rt_clock)); text_consoles_set_display(ds); -- 1.6.5.2