From 575a1c0e42287f8342a7e93e03c53edeb152399d Mon Sep 17 00:00:00 2001 From: Jiri Pirko Date: Mon, 26 May 2014 12:04:08 +0200 Subject: 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: Jiri Pirko Signed-off-by: Stefan Hajnoczi --- net/net.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'net') diff --git a/net/net.c b/net/net.c index e636071f0b..0869c60bee 100644 --- a/net/net.c +++ b/net/net.c @@ -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) { -- cgit v1.2.3-55-g7522