Commit 575a1c0e authored by Jiri Pirko's avatar Jiri Pirko Committed by Stefan Hajnoczi
Browse files

net: move queue number into NICPeers 



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: default avatarJiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 3fb69aa1

hw/core/qdev-properties-system.c

+1 −2
Original line number Diff line number Diff line
@@ -180,7 +180,6 @@ PropertyInfo qdev_prop_chr = { 
static int parse_netdev(DeviceState *dev, const char *str, void **ptr)

{

    NICPeers *peers_ptr = (NICPeers *)ptr;

    NICConf *conf = container_of(peers_ptr, NICConf, peers);

    NetClientState **ncs = peers_ptr->ncs;

    NetClientState *peers[MAX_QUEUE_NUM];

    int queues, i = 0;
@@ -219,7 +218,7 @@ static int parse_netdev(DeviceState *dev, const char *str, void **ptr) 
        ncs[i]->queue_index = i;

    }



    conf->queues = queues;

    peers_ptr->queues = queues;



    return 0;

hw/net/virtio-net.c

+1 −1
Original line number Diff line number Diff line
@@ -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);



    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[0].rx_vq = virtio_add_queue(vdev, 256, virtio_net_handle_rx);

    n->curr_queues = 1;

include/net/net.h

+1 −1
Original line number Diff line number Diff line
@@ -24,13 +24,13 @@ struct MACAddr { 


typedef struct NICPeers {

    NetClientState *ncs[MAX_QUEUE_NUM];

    int32_t queues;

} NICPeers;



typedef struct NICConf {

    MACAddr macaddr;

    NICPeers peers;

    int32_t bootindex;

    int32_t queues;

} NICConf;



#define DEFINE_NIC_PROPERTIES(_state, _conf)                            \

net/net.c

+2 −2
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ NICState *qemu_new_nic(NetClientInfo *info, 
{

    NetClientState **peers = conf->peers.ncs;

    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->size >= sizeof(NICState));
@@ -363,7 +363,7 @@ void qemu_del_net_client(NetClientState *nc) 


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 (nic->peer_deleted) {