From patchwork Fri Aug 27 22:37:27 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 62879 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4C290B7111 for ; Sat, 28 Aug 2010 08:41:05 +1000 (EST) Received: from localhost ([127.0.0.1]:48438 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Op7ba-0000gI-0g for incoming@patchwork.ozlabs.org; Fri, 27 Aug 2010 18:41:02 -0400 Received: from [140.186.70.92] (port=48471 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Op7YJ-0007po-VX for qemu-devel@nongnu.org; Fri, 27 Aug 2010 18:37:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Op7YE-0004Gy-PJ for qemu-devel@nongnu.org; Fri, 27 Aug 2010 18:37:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60513) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Op7YE-0004Gt-I9 for qemu-devel@nongnu.org; Fri, 27 Aug 2010 18:37:34 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o7RMbVa4007090 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 27 Aug 2010 18:37:31 -0400 Received: from s20.home (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o7RMbReh031087; Fri, 27 Aug 2010 18:37:28 -0400 From: Alex Williamson To: qemu-devel@nongnu.org Date: Fri, 27 Aug 2010 16:37:27 -0600 Message-ID: <20100827223727.2696.15427.stgit@s20.home> In-Reply-To: <20100827223659.2696.3589.stgit@s20.home> References: <20100827223659.2696.3589.stgit@s20.home> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: jes.sorensen@redhat.com, alex.williamson@redhat.com, kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH 3/5] virtio-net: Rename tx_timer_active to tx_waiting X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org De-couple this from the timer since we might want to use different backends to send the packet. Signed-off-by: Alex Williamson --- hw/virtio-net.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/hw/virtio-net.c b/hw/virtio-net.c index ac4aa8f..8b652f2 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -38,7 +38,7 @@ typedef struct VirtIONet QEMUTimer *tx_timer; uint32_t tx_timeout; int32_t tx_burst; - int tx_timer_active; + int tx_waiting; uint32_t has_vnet_hdr; uint8_t has_ufo; struct { @@ -704,15 +704,15 @@ static void virtio_net_handle_tx(VirtIODevice *vdev, VirtQueue *vq) { VirtIONet *n = to_virtio_net(vdev); - if (n->tx_timer_active) { + if (n->tx_waiting) { virtio_queue_set_notification(vq, 1); qemu_del_timer(n->tx_timer); - n->tx_timer_active = 0; + n->tx_waiting = 0; virtio_net_flush_tx(n, vq); } else { qemu_mod_timer(n->tx_timer, qemu_get_clock(vm_clock) + n->tx_timeout); - n->tx_timer_active = 1; + n->tx_waiting = 1; virtio_queue_set_notification(vq, 0); } } @@ -721,7 +721,7 @@ static void virtio_net_tx_timer(void *opaque) { VirtIONet *n = opaque; - n->tx_timer_active = 0; + n->tx_waiting = 0; /* Just in case the driver is not ready on more */ if (!(n->vdev.status & VIRTIO_CONFIG_S_DRIVER_OK)) @@ -744,7 +744,7 @@ static void virtio_net_save(QEMUFile *f, void *opaque) virtio_save(&n->vdev, f); qemu_put_buffer(f, n->mac, ETH_ALEN); - qemu_put_be32(f, n->tx_timer_active); + qemu_put_be32(f, n->tx_waiting); qemu_put_be32(f, n->mergeable_rx_bufs); qemu_put_be16(f, n->status); qemu_put_byte(f, n->promisc); @@ -773,7 +773,7 @@ static int virtio_net_load(QEMUFile *f, void *opaque, int version_id) virtio_load(&n->vdev, f); qemu_get_buffer(f, n->mac, ETH_ALEN); - n->tx_timer_active = qemu_get_be32(f); + n->tx_waiting = qemu_get_be32(f); n->mergeable_rx_bufs = qemu_get_be32(f); if (version_id >= 3) @@ -849,7 +849,7 @@ static int virtio_net_load(QEMUFile *f, void *opaque, int version_id) } n->mac_table.first_multi = i; - if (n->tx_timer_active) { + if (n->tx_waiting) { qemu_mod_timer(n->tx_timer, qemu_get_clock(vm_clock) + n->tx_timeout); } @@ -940,7 +940,7 @@ VirtIODevice *virtio_net_init(DeviceState *dev, NICConf *conf, qemu_format_nic_info_str(&n->nic->nc, conf->macaddr.a); n->tx_timer = qemu_new_timer(vm_clock, virtio_net_tx_timer, n); - n->tx_timer_active = 0; + n->tx_waiting = 0; if (txtimer) { if (txtimer == 1) { /* For convenience, 1 = "on" = predefined default, anything else