From patchwork Wed Dec 2 12:04:24 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 40032 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 D7083B7BEB for ; Thu, 3 Dec 2009 01:03:18 +1100 (EST) Received: from localhost ([127.0.0.1]:46345 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFpnX-0008RS-0G for incoming@patchwork.ozlabs.org; Wed, 02 Dec 2009 09:03:15 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFny7-0004XJ-LO for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:06:03 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFny2-0004VJ-DW for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:06:03 -0500 Received: from [199.232.76.173] (port=42936 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFny2-0004V1-1l for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:05:58 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37260) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NFny1-0004EJ-KJ for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:05:57 -0500 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nB2C5vsE019323 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 2 Dec 2009 07:05:57 -0500 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nB2C5ILO029769; Wed, 2 Dec 2009 07:05:56 -0500 From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 2 Dec 2009 13:04:24 +0100 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: mst@redhat.com Subject: [Qemu-devel] [PATCH 26/41] virtio-net: we know vlans size at compile time, make it static 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 Signed-off-by: Juan Quintela --- hw/virtio-net.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/hw/virtio-net.c b/hw/virtio-net.c index e5c6ea0..97db0d0 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -56,7 +56,7 @@ typedef struct VirtIONet uint8_t uni_overflow; uint8_t *macs; } mac_table; - uint32_t *vlans; + uint32_t vlans[MAX_VLAN >> 5]; } VirtIONet; /* TODO @@ -846,8 +846,6 @@ VirtIODevice *virtio_net_init(DeviceState *dev, NICConf *conf) n->mac_table.macs = qemu_mallocz(MAC_TABLE_ENTRIES * ETH_ALEN); - n->vlans = qemu_mallocz(MAX_VLAN >> 3); - register_savevm("virtio-net", virtio_net_id++, VIRTIO_NET_VM_VERSION, virtio_net_save, virtio_net_load, n); @@ -863,7 +861,6 @@ void virtio_net_exit(VirtIODevice *vdev) unregister_savevm("virtio-net", n); qemu_free(n->mac_table.macs); - qemu_free(n->vlans); qemu_del_timer(n->tx_timer); qemu_free_timer(n->tx_timer);