From patchwork Fri Sep 30 10:31:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 117077 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CE355B6F81 for ; Fri, 30 Sep 2011 20:31:56 +1000 (EST) Received: from localhost ([::1]:40713 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R9aNk-0003ZF-3X for incoming@patchwork.ozlabs.org; Fri, 30 Sep 2011 06:31:52 -0400 Received: from eggs.gnu.org ([140.186.70.92]:39750) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R9aNU-0002xq-7P for qemu-devel@nongnu.org; Fri, 30 Sep 2011 06:31:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R9aNO-0006q0-Dm for qemu-devel@nongnu.org; Fri, 30 Sep 2011 06:31:36 -0400 Received: from thoth.sbs.de ([192.35.17.2]:16569) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R9aNN-0006pl-Vt for qemu-devel@nongnu.org; Fri, 30 Sep 2011 06:31:30 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by thoth.sbs.de (8.13.6/8.13.6) with ESMTP id p8UAVI0v008437; Fri, 30 Sep 2011 12:31:18 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p8UAVI1O030264; Fri, 30 Sep 2011 12:31:18 +0200 Message-ID: <4E859A76.2000808@siemens.com> Date: Fri, 30 Sep 2011 12:31:18 +0200 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Anthony Liguori , qemu-devel X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 192.35.17.2 Cc: Blue Swirl , David Gibson Subject: [Qemu-devel] [PATCH 2/2] Drop obsolete nographic timer X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org We flush coalesced MMIO in the device models now, and VNC - for which this was once introduced - is also fine without it as it has its own refresh timer. Signed-off-by: Jan Kiszka --- vl.c | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/vl.c b/vl.c index 54d4dd9..db5ed7c 100644 --- a/vl.c +++ b/vl.c @@ -247,8 +247,6 @@ int nb_numa_nodes; uint64_t node_mem[MAX_NODES]; uint64_t node_cpumask[MAX_NODES]; -static QEMUTimer *nographic_timer; - uint8_t qemu_uuid[16]; static QEMUBootSetHandler *boot_set_handler; @@ -1221,13 +1219,6 @@ static void gui_update(void *opaque) qemu_mod_timer(ds->gui_timer, interval + qemu_get_clock_ms(rt_clock)); } -static void nographic_update(void *opaque) -{ - uint64_t interval = GUI_REFRESH_INTERVAL; - - qemu_mod_timer(nographic_timer, interval + qemu_get_clock_ms(rt_clock)); -} - struct vm_change_state_entry { VMChangeStateHandler *cb; void *opaque; @@ -3522,10 +3513,6 @@ int main(int argc, char **argv, char **envp) } dcl = dcl->next; } - if (ds->gui_timer == NULL) { - nographic_timer = qemu_new_timer_ms(rt_clock, nographic_update, NULL); - qemu_mod_timer(nographic_timer, qemu_get_clock_ms(rt_clock)); - } text_consoles_set_display(ds); if (gdbstub_dev && gdbserver_start(gdbstub_dev) < 0) {