[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/7] virtio-net: Use a byte to store RX mode flags
From: |
Alex Williamson |
Subject: |
[Qemu-devel] [PATCH 2/7] virtio-net: Use a byte to store RX mode flags |
Date: |
Fri, 05 Jun 2009 14:46:57 -0600 |
User-agent: |
StGIT/0.14.2 |
There's no need to save 4 bytes for promisc and allmulti.
Use one byte each just to avoid the overhead of a bitmap.
Signed-off-by: Alex Williamson <address@hidden>
---
hw/virtio-net.c | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/hw/virtio-net.c b/hw/virtio-net.c
index 9471d9e..de5a59f 100644
--- a/hw/virtio-net.c
+++ b/hw/virtio-net.c
@@ -16,7 +16,7 @@
#include "qemu-timer.h"
#include "virtio-net.h"
-#define VIRTIO_NET_VM_VERSION 7
+#define VIRTIO_NET_VM_VERSION 8
#define MAC_TABLE_ENTRIES 32
#define MAX_VLAN (1 << 12) /* Per 802.1Q definition */
@@ -33,8 +33,8 @@ typedef struct VirtIONet
QEMUTimer *tx_timer;
int tx_timer_active;
int mergeable_rx_bufs;
- int promisc;
- int allmulti;
+ uint8_t promisc;
+ uint8_t allmulti;
struct {
int in_use;
uint8_t *macs;
@@ -518,8 +518,8 @@ static void virtio_net_save(QEMUFile *f, void *opaque)
qemu_put_be32(f, n->tx_timer_active);
qemu_put_be32(f, n->mergeable_rx_bufs);
qemu_put_be16(f, n->status);
- qemu_put_be32(f, n->promisc);
- qemu_put_be32(f, n->allmulti);
+ qemu_put_byte(f, n->promisc);
+ qemu_put_byte(f, n->allmulti);
qemu_put_be32(f, n->mac_table.in_use);
qemu_put_buffer(f, n->mac_table.macs, n->mac_table.in_use * ETH_ALEN);
qemu_put_buffer(f, (uint8_t *)n->vlans, MAX_VLAN >> 3);
@@ -543,8 +543,13 @@ static int virtio_net_load(QEMUFile *f, void *opaque, int
version_id)
n->status = qemu_get_be16(f);
if (version_id >= 4) {
- n->promisc = qemu_get_be32(f);
- n->allmulti = qemu_get_be32(f);
+ if (version_id < 8) {
+ n->promisc = qemu_get_be32(f);
+ n->allmulti = qemu_get_be32(f);
+ } else {
+ n->promisc = qemu_get_byte(f);
+ n->allmulti = qemu_get_byte(f);
+ }
}
if (version_id >= 5) {
- [Qemu-devel] [PATCH 0/7] virtio-net: Filter cleanup/improvements, Alex Williamson, 2009/06/05
- [Qemu-devel] [PATCH 1/7] virtio-net: Add version_id 7 placeholder for vnet header support, Alex Williamson, 2009/06/05
- [Qemu-devel] [PATCH 2/7] virtio-net: Use a byte to store RX mode flags,
Alex Williamson <=
- [Qemu-devel] [PATCH 3/7] virtio-net: reorganize receive_filter(), Alex Williamson, 2009/06/05
- [Qemu-devel] [PATCH 4/7] virtio-net: Fix MAC filter overflow handling, Alex Williamson, 2009/06/05
- [Qemu-devel] [PATCH 6/7] virtio-net: Add new RX filter controls, Alex Williamson, 2009/06/05
- Re: [Qemu-devel] [PATCH 6/7] virtio-net: Add new RX filter controls, Michael S. Tsirkin, 2009/06/06
- Re: [Qemu-devel] [PATCH 6/7] virtio-net: Add new RX filter controls, Alex Williamson, 2009/06/08
- Re: [Qemu-devel] [PATCH 6/7] virtio-net: Add new RX filter controls, Anthony Liguori, 2009/06/08
- Re: [Qemu-devel] [PATCH 6/7] virtio-net: Add new RX filter controls, Daniel P. Berrange, 2009/06/08
- Re: [Qemu-devel] [PATCH 6/7] virtio-net: Add new RX filter controls, Anthony Liguori, 2009/06/08
- Re: [Qemu-devel] [PATCH 6/7] virtio-net: Add new RX filter controls, Daniel P. Berrange, 2009/06/09
- Re: [Qemu-devel] [PATCH 6/7] virtio-net: Add new RX filter controls, Jamie Lokier, 2009/06/09