Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFu40-0007wj-LS for qemu-devel@nongnu.org; Wed, 02 Dec 2009 13:36:32 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFu3s-0007mo-Ac for qemu-devel@nongnu.org; Wed, 02 Dec 2009 13:36:29 -0500 Received: from [199.232.76.173] (port=52264 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFu3r-0007lD-8t for qemu-devel@nongnu.org; Wed, 02 Dec 2009 13:36:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51692) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NFu3q-0006Rd-Qd for qemu-devel@nongnu.org; Wed, 02 Dec 2009 13:36:23 -0500 From: Juan Quintela MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <20091202145430.GG18519@redhat.com> (Michael S. Tsirkin's message of "Wed, 2 Dec 2009 16:54:30 +0200") References: <3c7c499f0a21f08a0f5d5f1496cb3180e5a179b7.1259754427.git.quintela@redhat.com> <20091202145430.GG18519@redhat.com> Date: Wed, 02 Dec 2009 19:33:49 +0100 Message-ID: Subject: [Qemu-devel] Re: [PATCH 31/41] virtio-net: we know macs size at compile time, make it static List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" Cc: markmc@redhat.com, qemu-devel@nongnu.org, Alex Williamson "Michael S. Tsirkin" wrote: > No objection to this or similar change with vlans, > but I'd like to know why was this made a separate buffer > originally. Dunno, either, but I think that this has been always that way. commit b6503ed9b8815ecfb82fe9faba28936365321248 was when it was introduced Alex, any objection? > > On Wed, Dec 02, 2009 at 01:04:29PM +0100, Juan Quintela wrote: >> >> 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); >> >> -- >> 1.6.5.2