Message ID | 1538295197-23704-45-git-send-email-pbonzini@redhat.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="GMc7MQ0D"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42NJWB1yvnz9s7T for <incoming@patchwork.ozlabs.org>; Sun, 30 Sep 2018 18:29:58 +1000 (AEST) Received: from localhost ([::1]:54291 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1g6X6x-0000CK-R3 for incoming@patchwork.ozlabs.org; Sun, 30 Sep 2018 04:29:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41579) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1g6Wrh-0002br-5O for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:14:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1g6Wrg-0000wF-Cw for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:14:09 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:33493) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1g6Wrg-0000vm-4H for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:14:08 -0400 Received: by mail-wm1-x342.google.com with SMTP id y140-v6so334258wmd.0 for <qemu-devel@nongnu.org>; Sun, 30 Sep 2018 01:14:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=HxlO4C1Kci0hRsp+HIykaR9GkIpW8hbvsclYn/vEFYk=; b=GMc7MQ0DgG1Mkn+If9/1JTPnUN/m31oeFM8JSq4MYxyWdrRolHh16vrUjpc7Rzw9Re yQMOu00lW7W3WErhJjEu7Nqv/fOyE0E/Vw9rxcTFW9xMVkgX/23M0bxeZHA1ItVn9NcN r0juchM+PZH+wnPJH15InbQcgJEaHamXjiS3ytZyXfdJWYgHpdMUL/AX1c5otSbZQ1/T mX5lhUwL4CTh4AfU7KyE1zkglTyIst5N2laY4uxT+HB3WmiPoLz3DYGCofPxO3Y/d5Ws Vn+wbIc7yj/tORQzEN5pPbNWCMmZ35GJpAw3Uj23H1ws8wKAUNvc3ybqHHgWsy0hRmkv wA7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=HxlO4C1Kci0hRsp+HIykaR9GkIpW8hbvsclYn/vEFYk=; b=jXjCSiTlx41XBBVode00lp6GNHtJgs/OgYaUCwOMbz+i9Gn8k9hHDsjDiJo+Tf65yA IEnOKj+UXiV10byAXAnZWvVf1Gh866Bu8gA28Ae1foQSAaVPfRGoIdO5fylrfvYG6fzb Y4Yv7RiggQx+tlFvs+q2Uz+noJpN36GlEZPqySHMZw/SHIK+SV7aznbAGi3hTpU/Liv4 ilINtcb7mKMU6yRLssTbL1+dnFYlT3MnyK4WEx9P41V7epj8C4ewDddatJBvuAOqRtSU ONMvun8q6HZgptx6muFQWL9/9E66GwiMktp8VyIWjjPu7htHqDgQakQrgaU8m61OIW/G fFQw== X-Gm-Message-State: ABuFfohhifJXpT+EzWkRn3gIiJ+NmvoOKbTe72bypxZo1/wfVSusb3O5 mR2VYoWPDiSZCWTS7tOriwDnrpnw X-Google-Smtp-Source: ACcGV62hOljK0mUXXebymTwecpgsHPcCP/sIYM72Y9rQRvO76Jvxbwa2cC2TQ4GvD2we73nlgaM52A== X-Received: by 2002:a1c:a794:: with SMTP id q142-v6mr2298341wme.77.1538295246850; Sun, 30 Sep 2018 01:14:06 -0700 (PDT) Received: from 640k.lan (94-36-187-248.adsl-ull.clienti.tiscali.it. [94.36.187.248]) by smtp.gmail.com with ESMTPSA id u76-v6sm11369194wmd.10.2018.09.30.01.14.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Sep 2018 01:14:06 -0700 (PDT) From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Sun, 30 Sep 2018 10:12:42 +0200 Message-Id: <1538295197-23704-45-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1538295197-23704-1-git-send-email-pbonzini@redhat.com> References: <1538295197-23704-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PULL 44/79] ui: fix virtual timers X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,01/79] virtio: Return true from virtio_queue_empty if broken
|
expand
|
diff --git a/ui/input.c b/ui/input.c index 51b1019..dd7f6d7 100644 --- a/ui/input.c +++ b/ui/input.c @@ -271,7 +271,7 @@ static void qemu_input_queue_process(void *opaque) item = QTAILQ_FIRST(queue); switch (item->type) { case QEMU_INPUT_QUEUE_DELAY: - timer_mod(item->timer, qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + timer_mod(item->timer, qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL_EXT) + item->delay_ms); return; case QEMU_INPUT_QUEUE_EVENT: @@ -301,7 +301,7 @@ static void qemu_input_queue_delay(struct QemuInputEventQueueHead *queue, queue_count++; if (start_timer) { - timer_mod(item->timer, qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + timer_mod(item->timer, qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL_EXT) + item->delay_ms); } } @@ -448,8 +448,8 @@ void qemu_input_event_send_key_delay(uint32_t delay_ms) } if (!kbd_timer) { - kbd_timer = timer_new_ms(QEMU_CLOCK_VIRTUAL, qemu_input_queue_process, - &kbd_queue); + kbd_timer = timer_new_ms(QEMU_CLOCK_VIRTUAL_EXT, + qemu_input_queue_process, &kbd_queue); } if (queue_count < queue_limit) { qemu_input_queue_delay(&kbd_queue, kbd_timer,