From patchwork Thu Jul 17 11:04:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Dovgalyuk X-Patchwork-Id: 371152 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 21C6C140080 for ; Thu, 17 Jul 2014 23:49:07 +1000 (EST) Received: from localhost ([::1]:44395 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X7m3V-000152-J9 for incoming@patchwork.ozlabs.org; Thu, 17 Jul 2014 09:49:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49361) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X7jZp-0005lD-UC for qemu-devel@nongnu.org; Thu, 17 Jul 2014 07:10:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X7jZj-0006bn-7z for qemu-devel@nongnu.org; Thu, 17 Jul 2014 07:10:17 -0400 Received: from mail.ispras.ru ([83.149.199.45]:47510) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X7jUB-00057y-U5 for qemu-devel@nongnu.org; Thu, 17 Jul 2014 07:04:28 -0400 Received: from [10.10.150.172] (unknown [80.250.189.177]) by mail.ispras.ru (Postfix) with ESMTPSA id 2EF4C540151; Thu, 17 Jul 2014 15:04:27 +0400 (MSK) To: qemu-devel@nongnu.org From: Pavel Dovgalyuk Date: Thu, 17 Jul 2014 15:04:30 +0400 Message-ID: <20140717110430.8352.51279.stgit@PASHA-ISP> In-Reply-To: <20140717110153.8352.80175.stgit@PASHA-ISP> References: <20140717110153.8352.80175.stgit@PASHA-ISP> User-Agent: StGit/0.16 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 83.149.199.45 X-Mailman-Approved-At: Thu, 17 Jul 2014 09:36:32 -0400 Cc: peter.maydell@linaro.org, peter.crosthwaite@xilinx.com, mark.burton@greensocs.com, real@ispras.ru, batuzovk@ispras.ru, pavel.dovgaluk@ispras.ru, pbonzini@redhat.com, fred.konrad@greensocs.com Subject: [Qemu-devel] [RFC PATCH v2 27/49] vga: do not use virtual clock for blinking cursor 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 This patch changes virtual clock to realtime one in vga_draw_text and vga_update_display functions. Display update process depends on realtime clock. If we read virtual clock there, virtual machine becomes non-deterministic, because every read to virtual clock is written to the replay log. Signed-off-by: Pavel Dovgalyuk --- hw/display/vga.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/display/vga.c b/hw/display/vga.c index 4b089a3..02d3be3 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -1304,7 +1304,7 @@ static void vga_draw_text(VGACommonState *s, int full_update) uint32_t *ch_attr_ptr; vga_draw_glyph8_func *vga_draw_glyph8; vga_draw_glyph9_func *vga_draw_glyph9; - int64_t now = qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL); + int64_t now = qemu_clock_get_ms(QEMU_CLOCK_REALTIME); /* compute font data address (in plane 2) */ v = s->sr[VGA_SEQ_CHARACTER_MAP]; @@ -1906,7 +1906,7 @@ static void vga_update_display(void *opaque) } if (graphic_mode != s->graphic_mode) { s->graphic_mode = graphic_mode; - s->cursor_blink_time = qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL); + s->cursor_blink_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME); full_update = 1; } switch(graphic_mode) {