From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wright Subject: Re: [PATCH 1/5] virtio-net: Make tx_timer timeout configurable Date: Tue, 31 Aug 2010 11:00:48 -0700 Message-ID: <20100831180048.GE30129@sequoia.sous-sol.org> References: <20100827223659.2696.3589.stgit@s20.home> <20100827223708.2696.47389.stgit@s20.home> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: jes.sorensen@redhat.com, qemu-devel@nongnu.org, kvm@vger.kernel.org To: Alex Williamson Return-path: Content-Disposition: inline In-Reply-To: <20100827223708.2696.47389.stgit@s20.home> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+gceq-qemu-devel=gmane.org@nongnu.org Errors-To: qemu-devel-bounces+gceq-qemu-devel=gmane.org@nongnu.org List-Id: kvm.vger.kernel.org * Alex Williamson (alex.williamson@redhat.com) wrote: > diff --git a/hw/virtio-net.c b/hw/virtio-net.c > index 075f72d..9ef29f0 100644 > --- a/hw/virtio-net.c > +++ b/hw/virtio-net.c > @@ -36,6 +36,7 @@ typedef struct VirtIONet > VirtQueue *ctrl_vq; > NICState *nic; > QEMUTimer *tx_timer; > + uint32_t tx_timeout; > int tx_timer_active; > uint32_t has_vnet_hdr; > uint8_t has_ufo; > @@ -702,7 +703,7 @@ static void virtio_net_handle_tx(VirtIODevice *vdev, VirtQueue *vq) > virtio_net_flush_tx(n, vq); > } else { > qemu_mod_timer(n->tx_timer, > - qemu_get_clock(vm_clock) + TX_TIMER_INTERVAL); > + qemu_get_clock(vm_clock) + n->tx_timeout); > n->tx_timer_active = 1; > virtio_queue_set_notification(vq, 0); > } > @@ -842,7 +843,7 @@ static int virtio_net_load(QEMUFile *f, void *opaque, int version_id) > > if (n->tx_timer_active) { > qemu_mod_timer(n->tx_timer, > - qemu_get_clock(vm_clock) + TX_TIMER_INTERVAL); > + qemu_get_clock(vm_clock) + n->tx_timeout); I think I'm missing where this is stored? Looks like migration would revert a changed tx_timeout back to 150us. thanks, -chris