From nobody Thu Nov 13 23:42:02 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1583327330; cv=none; d=zohomail.com; s=zohoarc; b=Mh70SqCKJqMDwg3CV53G0Zlc4pOqVi4MT7+X2AeX5mYHzI0M8vdydeaYSXJTgF49QbFMDIj4xMRPkdLVAzVW9Y0tBMmbQPt71KPIHcYaHUCcmnILr6nvBC2OQ9YqmMbvqZ0i1SEHrhs9137LDNXJjo68fUtCPocVlSCISyNOSZo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583327330; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=tTDvuiSO8FFJBQlIbfJ4TO8Uc4zxjf0cSMuuGhZLZT0=; b=BT/d9Ukyf6JFDEAr1NtUAmjK0SMyGda0LcxAs6f+knwMAgdcEmxQfnjdqWHk0ZPOCrwTu1DyIiBzurCDru5Ag1oSHXeXsOys+05alKzSW5FBmukPV5ky+qF0Xa9YLqT6nq0dsa++4EhykReBYmVBoo4ogb3PidVQ054lA7qhWek= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1583327330762176.39314482568238; Wed, 4 Mar 2020 05:08:50 -0800 (PST) Received: from localhost ([::1]:34058 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9TlZ-0004rL-Li for importer@patchew.org; Wed, 04 Mar 2020 08:08:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37255) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9TkM-0002sg-RS for qemu-devel@nongnu.org; Wed, 04 Mar 2020 08:07:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9TkL-0001OF-5q for qemu-devel@nongnu.org; Wed, 04 Mar 2020 08:07:34 -0500 Received: from forwardcorp1p.mail.yandex.net ([2a02:6b8:0:1472:2741:0:8b6:217]:44946) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j9TkH-00019i-HZ; Wed, 04 Mar 2020 08:07:29 -0500 Received: from mxbackcorp1g.mail.yandex.net (mxbackcorp1g.mail.yandex.net [IPv6:2a02:6b8:0:1402::301]) by forwardcorp1p.mail.yandex.net (Yandex) with ESMTP id 13D102E1649; Wed, 4 Mar 2020 16:07:27 +0300 (MSK) Received: from sas1-9998cec34266.qloud-c.yandex.net (sas1-9998cec34266.qloud-c.yandex.net [2a02:6b8:c14:3a0e:0:640:9998:cec3]) by mxbackcorp1g.mail.yandex.net (mxbackcorp/Yandex) with ESMTP id 9Imv48VQsj-7NESTh5B; Wed, 04 Mar 2020 16:07:26 +0300 Received: from dynamic-red.dhcp.yndx.net (dynamic-red.dhcp.yndx.net [2a02:6b8:0:40c:b4f7:3f29:4fea:8822]) by sas1-9998cec34266.qloud-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id ujb0Gsh6CR-7NWOtUTS; Wed, 04 Mar 2020 16:07:23 +0300 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client certificate not present) Precedence: bulk DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1583327247; bh=tTDvuiSO8FFJBQlIbfJ4TO8Uc4zxjf0cSMuuGhZLZT0=; h=In-Reply-To:Message-Id:References:Date:Subject:To:From:Cc; b=AIsqSV/iOe/tcW44q8wqeElZn3bbSNMmxNGBUhstrIG49W+B1NH78k/azN61vuBAr 9AX76wjxsiE0L/T7u7G4hh3bLZDdlCmMnw2SE8W4lf0VaM+aa+G9Ylpm70Nz1X/O9a sJwkvMkF9rCSCoGcm1q7v+acvjiUecXTeOnsU4EA= Authentication-Results: mxbackcorp1g.mail.yandex.net; dkim=pass header.i=@yandex-team.ru From: Alexey Kirillov To: Eric Blake , Thomas Huth , Markus Armbruster Subject: [PATCH v2 3/4] hmp: Use QMP query-netdevs in hmp_info_network Date: Wed, 4 Mar 2020 16:06:55 +0300 Message-Id: <20200304130656.16859-4-lekiravi@yandex-team.ru> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200304130656.16859-1-lekiravi@yandex-team.ru> References: <20200304130656.16859-1-lekiravi@yandex-team.ru> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a02:6b8:0:1472:2741:0:8b6:217 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Dmitry Fleytman , "Michael S. Tsirkin" , Jason Wang , qemu-devel@nongnu.org, Vincenzo Maffione , Gerd Hoffmann , "Edgar E. Iglesias" , Sven Schnelle , Rob Herring , Stefano Stabellini , Paul Durrant , Joel Stanley , Anthony Perard , Samuel Thibault , Aleksandar Rikalo , David Gibson , Laurent Vivier , Jiri Pirko , yc-core@yandex-team.ru, Stefan Weil , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Peter Chubb , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , xen-devel@lists.xenproject.org, Giuseppe Lettieri , Luigi Rizzo , Richard Henderson , Andrew Jeffery , Michael Walle , qemu-ppc@nongnu.org, Aleksandar Markovic , Alexey Kirillov , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Replace legacy field info_str of NetClientState with result of QMP command query-netdevs. Signed-off-by: Alexey Kirillov --- include/net/net.h | 3 +- net/clients.h | 1 + net/hub.c | 4 +- net/hub.h | 2 +- net/net.c | 175 ++++++++++++++++++++++++++++++++++++++++++++-- net/vde.c | 10 +++ 6 files changed, 186 insertions(+), 9 deletions(-) diff --git a/include/net/net.h b/include/net/net.h index 2c8956c0b3..9df4680937 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -171,7 +171,8 @@ void qemu_check_nic_model(NICInfo *nd, const char *mode= l); int qemu_find_nic_model(NICInfo *nd, const char * const *models, const char *default_model); =20 -void print_net_client(Monitor *mon, NetClientState *nc); +void print_net_client(Monitor *mon, NetClientState *nc, + NetdevInfoList *ni_list); void hmp_info_network(Monitor *mon, const QDict *qdict); void net_socket_rs_init(SocketReadState *rs, SocketReadStateFinalize *finalize, diff --git a/net/clients.h b/net/clients.h index a6ef267e19..f439933522 100644 --- a/net/clients.h +++ b/net/clients.h @@ -51,6 +51,7 @@ int net_init_l2tpv3(const Netdev *netdev, const char *nam= e, #ifdef CONFIG_VDE int net_init_vde(const Netdev *netdev, const char *name, NetClientState *peer, Error **errp); +int net_vde_get_fd(const NetClientState *nc); #endif =20 #ifdef CONFIG_NETMAP diff --git a/net/hub.c b/net/hub.c index 37995b5517..cce970b59d 100644 --- a/net/hub.c +++ b/net/hub.c @@ -252,7 +252,7 @@ NetClientState *net_hub_port_find(int hub_id) /** * Print hub configuration */ -void net_hub_info(Monitor *mon) +void net_hub_info(Monitor *mon, NetdevInfoList *ni_list) { NetHub *hub; NetHubPort *port; @@ -263,7 +263,7 @@ void net_hub_info(Monitor *mon) monitor_printf(mon, " \\ %s", port->nc.name); if (port->nc.peer) { monitor_printf(mon, ": "); - print_net_client(mon, port->nc.peer); + print_net_client(mon, port->nc.peer, ni_list); } else { monitor_printf(mon, "\n"); } diff --git a/net/hub.h b/net/hub.h index 66d3322fac..424658a4a2 100644 --- a/net/hub.h +++ b/net/hub.h @@ -19,7 +19,7 @@ NetClientState *net_hub_add_port(int hub_id, const char *name, NetClientState *hubpeer); NetClientState *net_hub_find_client_by_name(int hub_id, const char *name); -void net_hub_info(Monitor *mon); +void net_hub_info(Monitor *mon, NetdevInfoList *ninfo); void net_hub_check_clients(void); bool net_hub_flush(NetClientState *nc); =20 diff --git a/net/net.c b/net/net.c index 01e0548295..1a8153dbf7 100644 --- a/net/net.c +++ b/net/net.c @@ -1271,14 +1271,176 @@ static void netfilter_print_info(Monitor *mon, Net= FilterState *nf) monitor_printf(mon, "\n"); } =20 -void print_net_client(Monitor *mon, NetClientState *nc) +static NetdevInfo *get_netdev_info(NetdevInfoList *ni_list, char *name) +{ + NetdevInfo *ni; + + while (ni_list) { + ni =3D ni_list->value; + if (g_str_equal(ni->id, name)) { + return ni; + } + ni_list =3D ni_list->next; + } + + return NULL; +} + +static char *generate_info_str(NetdevInfo *ni, NetClientState *nc) +{ + char *info_str; + + if (!ni) { + return g_malloc0(1); + } + + switch (ni->type) { + case NET_CLIENT_DRIVER_NIC: { + info_str =3D g_strdup_printf("model=3D%s,macaddr=3D%s", + ni->u.nic.model, + ni->u.nic.macaddr); + break; + } +#ifdef CONFIG_SLIRP + case NET_CLIENT_DRIVER_USER: { + size_t len =3D strchr(ni->u.user.net, '/') - ni->u.user.net; + char *net =3D g_strndup(ni->u.user.net, len); + + info_str =3D g_strdup_printf("net=3D%s,restrict=3D%s", + net, + ni->u.user.q_restrict ? "on" : "off= "); + g_free(net); + break; + } +#endif /* CONFIG_SLIRP */ + case NET_CLIENT_DRIVER_TAP: { +#ifndef _WIN32 + if (ni->u.tap.has_fds) { + char **fds =3D g_strsplit(ni->u.tap.fds, ":", -1); + + info_str =3D g_strdup_printf("fd=3D%s", fds[nc->queue_inde= x]); + g_strfreev(fds); + } else if (ni->u.tap.has_helper) { + info_str =3D g_strdup_printf("helper=3D%s", ni->u.tap.help= er); + } else { + info_str =3D g_strdup_printf("ifname=3D%s,script=3D%s,down= script=3D%s", + ni->u.tap.ifname, + nc->queue_index =3D=3D 0 ? ni->u.tap.script : "no", + nc->queue_index =3D=3D 0 ? ni->u.tap.downscript : "no"= ); + } +#else + info_str =3D g_strdup_printf("tap: ifname=3D%s", ni->u.tap.ifn= ame); +#endif /* _WIN32 */ + break; + } +#ifdef CONFIG_L2TPV3 + case NET_CLIENT_DRIVER_L2TPV3: { + info_str =3D g_strdup_printf("l2tpv3: connected"); + break; + } +#endif /* CONFIG_L2TPV3 */ + case NET_CLIENT_DRIVER_SOCKET: { + if (ni->u.socket.has_listen) { + if (ni->u.socket.has_fd) { + info_str =3D g_strdup_printf("socket: connection from = %s", + ni->u.socket.listen); + } else { + info_str =3D g_strdup_printf("socket: wait from %s", + ni->u.socket.listen); + } + } else if (ni->u.socket.has_connect && ni->u.socket.has_fd) { + info_str =3D g_strdup_printf("socket: connect to %s", + ni->u.socket.connect); + } else if (ni->u.socket.has_mcast && ni->u.socket.has_fd) { + info_str =3D g_strdup_printf("socket: mcast=3D%s", + ni->u.socket.mcast); + } else if (ni->u.socket.has_udp && ni->u.socket.has_fd) { + info_str =3D g_strdup_printf("socket: udp=3D%s", ni->u.soc= ket.udp); + } else { + g_assert(ni->u.socket.has_fd); + int so_type =3D -1; + int optlen =3D sizeof(so_type); + int fd =3D atoi(ni->u.socket.fd); + + getsockopt(fd, SOL_SOCKET, SO_TYPE, (char *)&so_type, + (socklen_t *)&optlen); + if (so_type =3D=3D SOCK_STREAM) { + info_str =3D g_strdup_printf("socket: fd=3D%s", + ni->u.socket.fd); + } else { + if (ni->u.socket.has_mcast) { + /* + * This branch is unreachable, according to how it= is in + * net/socket.c at this moment + */ + info_str =3D g_strdup_printf("socket: fd=3D%s " + "(cloned mcast=3D%s)", + ni->u.socket.fd, + ni->u.socket.mcast); + } else { + SocketAddress *sa =3D socket_local_address(fd, NUL= L); + + info_str =3D g_strdup_printf("socket: fd=3D%s %s", + ni->u.socket.fd, + SocketAddressType_str(sa->type)); + qapi_free_SocketAddress(sa); + } + } + } + break; + } +#ifdef CONFIG_VDE + case NET_CLIENT_DRIVER_VDE: { + info_str =3D g_strdup_printf("sock=3D%s,fd=3D%d", + ni->u.vde.sock, + net_vde_get_fd(nc)); + break; + } +#endif /* CONFIG_VDE */ +#ifdef CONFIG_NET_BRIDGE + case NET_CLIENT_DRIVER_BRIDGE: { + info_str =3D g_strdup_printf("helper=3D%s,br=3D%s", + ni->u.bridge.helper, + ni->u.bridge.br); + break; + } +#endif /* CONFIG_NET_BRIDGE */ +#ifdef CONFIG_NETMAP + case NET_CLIENT_DRIVER_NETMAP: { + info_str =3D g_strdup_printf("netmap: ifname=3D%s", + ni->u.netmap.ifname); + break; + } +#endif /* CONFIG_NETMAP */ +#ifdef CONFIG_VHOST_NET_USER + case NET_CLIENT_DRIVER_VHOST_USER: { + info_str =3D g_strdup_printf("vhost-user%d to %s", + nc->queue_index, + ni->u.vhost_user.chardev); + break; + } +#endif /* CONFIG_VHOST_NET_USER */ + default: { + info_str =3D g_malloc0(1); + break; + } + } + + return info_str; +} + +void print_net_client(Monitor *mon, NetClientState *nc, NetdevInfoList *ni= _list) { NetFilterState *nf; + NetdevInfo *ni =3D get_netdev_info(ni_list, nc->name); + char *info_str =3D generate_info_str(ni, nc); =20 monitor_printf(mon, "%s: index=3D%d,type=3D%s,%s\n", nc->name, nc->queue_index, NetClientDriver_str(nc->info->type), - nc->info_str); + info_str); + g_free(info_str); + if (!QTAILQ_EMPTY(&nc->filters)) { monitor_printf(mon, "filters:\n"); } @@ -1415,8 +1577,9 @@ void hmp_info_network(Monitor *mon, const QDict *qdic= t) { NetClientState *nc, *peer; NetClientDriver type; + NetdevInfoList *ni_list =3D qmp_query_netdevs(NULL); =20 - net_hub_info(mon); + net_hub_info(mon, ni_list); =20 QTAILQ_FOREACH(nc, &net_clients, next) { peer =3D nc->peer; @@ -1428,13 +1591,15 @@ void hmp_info_network(Monitor *mon, const QDict *qd= ict) } =20 if (!peer || type =3D=3D NET_CLIENT_DRIVER_NIC) { - print_net_client(mon, nc); + print_net_client(mon, nc, ni_list); } /* else it's a netdev connected to a NIC, printed with the NIC */ if (peer && type =3D=3D NET_CLIENT_DRIVER_NIC) { monitor_printf(mon, " \\ "); - print_net_client(mon, peer); + print_net_client(mon, peer, ni_list); } } + + qapi_free_NetdevInfoList(ni_list); } =20 void colo_notify_filters_event(int event, Error **errp) diff --git a/net/vde.c b/net/vde.c index c0ab2bb65c..c4edf5cba1 100644 --- a/net/vde.c +++ b/net/vde.c @@ -153,3 +153,13 @@ int net_init_vde(const Netdev *netdev, const char *nam= e, =20 return 0; } + +int net_vde_get_fd(const NetClientState *nc) +{ + VDEState *s; + assert(nc->info->type =3D=3D NET_CLIENT_DRIVER_VDE); + + s =3D DO_UPCAST(VDEState, nc, nc); + + return vde_datafd(s->vde); +} --=20 2.17.1