haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

net: move queue number into NICPeers

Browse source 
It indicates the number of elements in ncs field and makes sense to have
int inside NICPeers. Also in parse_netdev we do not need to access
container and work with NICPeers only.

Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Jiri Pirko 2014-05-26 12:04:08 +02:00 committed by Stefan Hajnoczi
parent 3fb69aa1d1
commit 575a1c0e42
4 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
hw/core/qdev-properties-system.c
View file

@ -180,7 +180,6 @@ PropertyInfo qdev_prop_chr = {
static int parse_netdev(DeviceState *dev, const char *str, void **ptr) static int parse_netdev(DeviceState *dev, const char *str, void **ptr)
{ {
NICPeers *peers_ptr = (NICPeers *)ptr; NICPeers *peers_ptr = (NICPeers *)ptr;
NICConf *conf = container_of(peers_ptr, NICConf, peers);
NetClientState **ncs = peers_ptr->ncs; NetClientState **ncs = peers_ptr->ncs;
NetClientState *peers[MAX_QUEUE_NUM]; NetClientState *peers[MAX_QUEUE_NUM];
int queues, i = 0; int queues, i = 0;
@ -219,7 +218,7 @@ static int parse_netdev(DeviceState *dev, const char *str, void **ptr)
ncs[i]->queue_index = i; ncs[i]->queue_index = i;
} }
conf->queues = queues; peers_ptr->queues = queues;
return 0; return 0;

2
hw/net/virtio-net.c
View file

@ -1542,7 +1542,7 @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp)
virtio_init(vdev, "virtio-net", VIRTIO_ID_NET, n->config_size); virtio_init(vdev, "virtio-net", VIRTIO_ID_NET, n->config_size);
n->max_queues = MAX(n->nic_conf.queues, 1); n->max_queues = MAX(n->nic_conf.peers.queues, 1);
n->vqs = g_malloc0(sizeof(VirtIONetQueue) * n->max_queues); n->vqs = g_malloc0(sizeof(VirtIONetQueue) * n->max_queues);
n->vqs[0].rx_vq = virtio_add_queue(vdev, 256, virtio_net_handle_rx); n->vqs[0].rx_vq = virtio_add_queue(vdev, 256, virtio_net_handle_rx);
n->curr_queues = 1; n->curr_queues = 1;

2
include/net/net.h
View file

@ -24,13 +24,13 @@ struct MACAddr {
typedef struct NICPeers { typedef struct NICPeers {
NetClientState *ncs[MAX_QUEUE_NUM]; NetClientState *ncs[MAX_QUEUE_NUM];
int32_t queues;
} NICPeers; } NICPeers;
typedef struct NICConf { typedef struct NICConf {
MACAddr macaddr; MACAddr macaddr;
NICPeers peers; NICPeers peers;
int32_t bootindex; int32_t bootindex;
int32_t queues;
} NICConf; } NICConf;
#define DEFINE_NIC_PROPERTIES(_state, _conf) \ #define DEFINE_NIC_PROPERTIES(_state, _conf) \

4
net/net.c
View file

@ -250,7 +250,7 @@ NICState *qemu_new_nic(NetClientInfo *info,
{ {
NetClientState **peers = conf->peers.ncs; NetClientState **peers = conf->peers.ncs;
NICState *nic; NICState *nic;
int i, queues = MAX(1, conf->queues); int i, queues = MAX(1, conf->peers.queues);
assert(info->type == NET_CLIENT_OPTIONS_KIND_NIC); assert(info->type == NET_CLIENT_OPTIONS_KIND_NIC);
assert(info->size >= sizeof(NICState)); assert(info->size >= sizeof(NICState));
@ -363,7 +363,7 @@ void qemu_del_net_client(NetClientState *nc)
void qemu_del_nic(NICState *nic) void qemu_del_nic(NICState *nic)
{ {
int i, queues = MAX(nic->conf->queues, 1); int i, queues = MAX(nic->conf->peers.queues, 1);
/* If this is a peer NIC and peer has already been deleted, free it now. */ /* If this is a peer NIC and peer has already been deleted, free it now. */
if (nic->peer_deleted) { if (nic->peer_deleted) {