david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

virtio-net: Use a byte to store RX mode flags

Browse Source 
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 <alex.williamson@hp.com>
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
This commit is contained in:
Alex Williamson 2009-06-05 14:46:57 -06:00 committed by Mark McLoughlin
parent 6c042c16fc
commit f10c592e8d
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/virtio-net.c
View File

@ -16,7 +16,7 @@
#include "qemu-timer.h" #include "qemu-timer.h"
#include "virtio-net.h" #include "virtio-net.h"
#define VIRTIO_NET_VM_VERSION 7 #define VIRTIO_NET_VM_VERSION 8
#define MAC_TABLE_ENTRIES 32 #define MAC_TABLE_ENTRIES 32
#define MAX_VLAN (1 << 12) /* Per 802.1Q definition */ #define MAX_VLAN (1 << 12) /* Per 802.1Q definition */
@ -33,8 +33,8 @@ typedef struct VirtIONet
QEMUTimer *tx_timer; QEMUTimer *tx_timer;
int tx_timer_active; int tx_timer_active;
int mergeable_rx_bufs; int mergeable_rx_bufs;
int promisc; uint8_t promisc;
int allmulti; uint8_t allmulti;
struct { struct {
int in_use; int in_use;
uint8_t *macs; uint8_t *macs;
@ -523,8 +523,8 @@ static void virtio_net_save(QEMUFile *f, void *opaque)
qemu_put_be32(f, n->tx_timer_active); qemu_put_be32(f, n->tx_timer_active);
qemu_put_be32(f, n->mergeable_rx_bufs); qemu_put_be32(f, n->mergeable_rx_bufs);
qemu_put_be16(f, n->status); qemu_put_be16(f, n->status);
qemu_put_be32(f, n->promisc); qemu_put_byte(f, n->promisc);
qemu_put_be32(f, n->allmulti); qemu_put_byte(f, n->allmulti);
qemu_put_be32(f, n->mac_table.in_use); 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, n->mac_table.macs, n->mac_table.in_use * ETH_ALEN);
qemu_put_buffer(f, (uint8_t *)n->vlans, MAX_VLAN >> 3); qemu_put_buffer(f, (uint8_t *)n->vlans, MAX_VLAN >> 3);
@ -548,8 +548,13 @@ static int virtio_net_load(QEMUFile *f, void *opaque, int version_id)
n->status = qemu_get_be16(f); n->status = qemu_get_be16(f);
if (version_id >= 4) { if (version_id >= 4) {
if (version_id < 8) {
n->promisc = qemu_get_be32(f); n->promisc = qemu_get_be32(f);
n->allmulti = 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) { if (version_id >= 5) {