Message ID | 1538295197-23704-44-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="GVTCkz1Q"; 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 42NJx20g4jz9s1x for <incoming@patchwork.ozlabs.org>; Sun, 30 Sep 2018 18:48:54 +1000 (AEST) Received: from localhost ([::1]:54406 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 1g6XPH-0002e2-Mp for incoming@patchwork.ozlabs.org; Sun, 30 Sep 2018 04:48:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41569) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1g6Wrg-0002b9-Bt 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 1g6Wrf-0000vg-H8 for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:14:08 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:35527) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1g6Wrf-0000tv-8h for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:14:07 -0400 Received: by mail-wr1-x442.google.com with SMTP id w5-v6so1248739wrt.2 for <qemu-devel@nongnu.org>; Sun, 30 Sep 2018 01:14:07 -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=jarcNEpr6D+EM6vDO2NKdj+rPYrn9O5j6YtrNM1YDTk=; b=GVTCkz1QzHyzbmtquw98MDOQ1Cg1Z8boiqA18AdhHKgndWfUebQ1KQq31Z9fTkmToC zr81mpxYKCcn+Lls09snfE7BI/SAClPwD0MlVyf5hefzwTOo9AalZjbbgrr8NWa3SGMF 6rPHjl1Z4H9pjC1/38zDyPb7xZyTN7LwrhjqlDyOzfgbLVODK86MwgpHbB5IVz3DCoxK oMj2AWERSGTg6uDmjKeQvnV1VVDqHR4s+7yqXEk4Yrsh9OapzQ/tJWGPKskarKfDXcjg pfJl72J9h7dVYMhKxRxGzXfFbl1zpsgdfhM9sWXIM3d+/zLZTso1ibqdGsTeqkj67iXu G4iQ== 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=jarcNEpr6D+EM6vDO2NKdj+rPYrn9O5j6YtrNM1YDTk=; b=aaMXVsmmGCaDtHTLpCwYC3DeQdBC10XLrXJhDAkXt1m3FWnzOVtFCvznqYg0ZYBfpy H0JYBsuNCOPwjbajs5oKplM4AZIPLgmuE+bU6JF9wEdhyEbRwhJJjsTTty+HiT+SHo0I BcOwN0NfmnkQoBEjTKiLumV0lqboqtFHOaQpLks8K62zsGeD7qcTJhvcPus0e2mIcvm1 fG0qZXC7uQdIVKBcnT2suCc1zpbc4J68lNc78d8RaZ/TxHeQht8L7dfQaaBLCRJiu0jq RWAZLL+jif0jD+PnpvGb8fXG9dOJsAcFy7d/XFRIwVPgWIITOznP6oghmLOl4HJm94cE UYhA== X-Gm-Message-State: ABuFfohp1V2MH9JKncmQ0Pdwmyc7bnA5zXxV/GXh0et84POJXmzGivwp mGnQc+u0TooSvKh5hPK7qBBtdn1z X-Google-Smtp-Source: ACcGV635/j+KmoKNQc39Cqal2BW8N5MU5Va0ZoWPVz43sGCVfC9zGVhRR6TEpVUuvAHfJho2hZkqXA== X-Received: by 2002:adf:ad65:: with SMTP id p92-v6mr3930765wrc.7.1538295245951; Sun, 30 Sep 2018 01:14:05 -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.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Sep 2018 01:14:05 -0700 (PDT) From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Sun, 30 Sep 2018 10:12:41 +0200 Message-Id: <1538295197-23704-44-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::442 Subject: [Qemu-devel] [PULL 43/79] slirp: fix ipv6 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/slirp/ip6_icmp.c b/slirp/ip6_icmp.c index ee333d0..3f41187 100644 --- a/slirp/ip6_icmp.c +++ b/slirp/ip6_icmp.c @@ -17,7 +17,7 @@ static void ra_timer_handler(void *opaque) { Slirp *slirp = opaque; timer_mod(slirp->ra_timer, - qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + NDP_Interval); + qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL_EXT) + NDP_Interval); ndp_send_ra(slirp); } @@ -27,9 +27,10 @@ void icmp6_init(Slirp *slirp) return; } - slirp->ra_timer = timer_new_ms(QEMU_CLOCK_VIRTUAL, ra_timer_handler, slirp); + slirp->ra_timer = timer_new_ms(QEMU_CLOCK_VIRTUAL_EXT, + ra_timer_handler, slirp); timer_mod(slirp->ra_timer, - qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + NDP_Interval); + qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL_EXT) + NDP_Interval); } void icmp6_cleanup(Slirp *slirp)