From patchwork Wed Dec 2 12:04:29 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 40037 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 742A2B7BEB for ; Thu, 3 Dec 2009 01:12:27 +1100 (EST) Received: from localhost ([127.0.0.1]:58641 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFpwO-0005E0-85 for incoming@patchwork.ozlabs.org; Wed, 02 Dec 2009 09:12:24 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFnyE-0004b1-Kq for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:06:10 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFny9-0004Xs-9u for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:06:09 -0500 Received: from [199.232.76.173] (port=42943 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFny8-0004Xl-V2 for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:06:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:11280) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NFny8-0004F5-IA for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:06:04 -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 nB2C636D020715 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 2 Dec 2009 07:06:03 -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 nB2C5ILT029769; Wed, 2 Dec 2009 07:06:02 -0500 From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 2 Dec 2009 13:04:29 +0100 Message-Id: <3c7c499f0a21f08a0f5d5f1496cb3180e5a179b7.1259754427.git.quintela@redhat.com> 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 31/41] virtio-net: we know macs 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 | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/hw/virtio-net.c b/hw/virtio-net.c index c515e0e..550a814 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -54,7 +54,7 @@ typedef struct VirtIONet uint32_t first_multi; uint8_t multi_overflow; uint8_t uni_overflow; - uint8_t *macs; + uint8_t macs[MAC_TABLE_ENTRIES * ETH_ALEN]; } mac_table; uint8_t vlans[MAX_VLAN >> 3]; } VirtIONet; @@ -860,8 +860,6 @@ VirtIODevice *virtio_net_init(DeviceState *dev, NICConf *conf) n->mergeable_rx_bufs = 0; n->promisc = 1; /* for compatibility */ - n->mac_table.macs = qemu_mallocz(MAC_TABLE_ENTRIES * ETH_ALEN); - register_savevm("virtio-net", virtio_net_id++, VIRTIO_NET_VM_VERSION, virtio_net_save, virtio_net_load, n); @@ -876,8 +874,6 @@ void virtio_net_exit(VirtIODevice *vdev) unregister_savevm("virtio-net", n); - qemu_free(n->mac_table.macs); - qemu_del_timer(n->tx_timer); qemu_free_timer(n->tx_timer);