From nobody Sat Apr 27 18:17:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1614765591; cv=none; d=zohomail.com; s=zohoarc; b=THTaoLMLKoYuMwJr51P01ft3G/SL2c2SZWIekjCH2X4wPrKhk4BkH1Fch+busO6b6ZaErXF3+nAJNlLYRkGWNN72IPP8hMU5PirzaiDQAcOxrPZMg3dQLTTwOVPBKlAQNRyyYmJ/fxsa7o/xqqam37YKhoR+Xw0AIIFVmZEThYc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614765591; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=j7dzJEohXLsDUv+0KOvhWh+CMnUxLraIRiBhTUt7E4s=; b=ljHjwot6dxLJmu5Ma2HggAir3g0dTNK6O4h+8Au6+5+BeILtCJW44OnFtwSRLSQkhpiWDuVV4OefbeBGqItTfGw9RwQ4PCVm7YEv0p/v9UZePUdPqqGqfwPWmBBOE3EEbkngkE4P5DyvHBHDXuLab1WbBKah/Y0L6OuxaasTqNM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1614765591594579.8232598537405; Wed, 3 Mar 2021 01:59:51 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.92803.174954 (Exim 4.92) (envelope-from ) id 1lHOI3-0001XU-Qq; Wed, 03 Mar 2021 09:59:35 +0000 Received: by outflank-mailman (output) from mailman id 92803.174954; Wed, 03 Mar 2021 09:59:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lHOI3-0001XN-MR; Wed, 03 Mar 2021 09:59:35 +0000 Received: by outflank-mailman (input) for mailman id 92803; Wed, 03 Mar 2021 09:59:34 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lHOI2-0001PK-CT for xen-devel@lists.xenproject.org; Wed, 03 Mar 2021 09:59:34 +0000 Received: from forwardcorp1j.mail.yandex.net (unknown [2a02:6b8:0:1619::183]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 36ffdee9-8546-4120-9c3d-0b615b9ab418; Wed, 03 Mar 2021 09:59:23 +0000 (UTC) Received: from vla1-fdfb804fb3f3.qloud-c.yandex.net (vla1-fdfb804fb3f3.qloud-c.yandex.net [IPv6:2a02:6b8:c0d:3199:0:640:fdfb:804f]) by forwardcorp1j.mail.yandex.net (Yandex) with ESMTP id 35B822E14DE; Wed, 3 Mar 2021 12:59:22 +0300 (MSK) Received: from vla5-d6d5ce7a4718.qloud-c.yandex.net (vla5-d6d5ce7a4718.qloud-c.yandex.net [2a02:6b8:c18:341e:0:640:d6d5:ce7a]) by vla1-fdfb804fb3f3.qloud-c.yandex.net (mxbackcorp/Yandex) with ESMTP id Xoqon3kIuD-xLxmSA11; Wed, 03 Mar 2021 12:59:22 +0300 Received: from dynamic-red3.dhcp.yndx.net (dynamic-red3.dhcp.yndx.net [2a02:6b8:0:107:880d:3c89:fcd8:ca75]) by vla5-d6d5ce7a4718.qloud-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id w0BjtEeJGw-xLnK0Pgv; Wed, 03 Mar 2021 12:59:21 +0300 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client certificate not present) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Inumbo-ID: 36ffdee9-8546-4120-9c3d-0b615b9ab418 Precedence: bulk DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1614765562; bh=j7dzJEohXLsDUv+0KOvhWh+CMnUxLraIRiBhTUt7E4s=; h=In-Reply-To:Message-Id:References:Date:Subject:To:From:Cc; b=nLWCtqvEFSzGCD8ex/7yGZcEuZHdL9/HSHdO223dqhadmy6JqxmnugxsG3vUXe5eT Pb4mlGnMsjL/hhEhVvaPGFYTTUpCcxkZq0Dn8H3axRsncAE6eP4ORH93NgJUy16R4C aSXnVonDN7+HSR8cEJawAKvyZ+PlXRYHlFd0ZDCg= Authentication-Results: vla1-fdfb804fb3f3.qloud-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Alexey Kirillov To: Jason Wang , Markus Armbruster , Thomas Huth , Eric Blake Cc: Laurent Vivier , Samuel Thibault , "Michael S. Tsirkin" , Michael Roth , Paolo Bonzini , Luigi Rizzo , Giuseppe Lettieri , Vincenzo Maffione , Stefan Weil , Stefano Stabellini , Anthony Perard , Paul Durrant , xen-devel@lists.xenproject.org, qemu-devel@nongnu.org, yc-core@yandex-team.ru Subject: [PATCH v7 1/5] qapi: net: Add query-netdev command Date: Wed, 3 Mar 2021 12:59:06 +0300 Message-Id: <20210303095910.78277-2-lekiravi@yandex-team.ru> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210303095910.78277-1-lekiravi@yandex-team.ru> References: <20210303095910.78277-1-lekiravi@yandex-team.ru> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @yandex-team.ru) Content-Type: text/plain; charset="utf-8" The query-netdev command is used to get the configuration of the current network device backends (netdevs). This is the QMP analog of the HMP command "info network" but only for netdevs (i.e. excluding NIC and hubports). The query-netdev command returns an array of objects of the NetdevInfo type, which are an extension of Netdev type. It means that response can be used for netdev-add after small modification. This can be useful for recreate the same netdev configuration. Information about the network device is filled in when it is created or modified and is available through the NetClientState->stored_config. Signed-off-by: Alexey Kirillov Acked-by: Markus Armbruster --- include/net/net.h | 3 ++ net/l2tpv3.c | 7 +++ net/net.c | 30 +++++++++++- net/netmap.c | 7 +++ net/slirp.c | 122 ++++++++++++++++++++++++++++++++++++++++++++++ net/socket.c | 71 +++++++++++++++++++++++++++ net/tap-win32.c | 9 ++++ net/tap.c | 103 ++++++++++++++++++++++++++++++++++++-- net/vde.c | 22 +++++++++ net/vhost-user.c | 18 +++++-- net/vhost-vdpa.c | 14 ++++++ qapi/net.json | 80 ++++++++++++++++++++++++++++++ 12 files changed, 477 insertions(+), 9 deletions(-) diff --git a/include/net/net.h b/include/net/net.h index 919facaad2..162fd3f1b5 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -5,6 +5,8 @@ #include "qapi/qapi-types-net.h" #include "net/queue.h" #include "hw/qdev-properties-system.h" +#include "qapi/clone-visitor.h" +#include "qapi/qapi-visit-net.h" =20 #define MAC_FMT "%02X:%02X:%02X:%02X:%02X:%02X" #define MAC_ARG(x) ((uint8_t *)(x))[0], ((uint8_t *)(x))[1], \ @@ -93,6 +95,7 @@ struct NetClientState { char *model; char *name; char info_str[256]; + NetdevInfo *stored_config; unsigned receive_disabled : 1; NetClientDestructor *destructor; unsigned int queue_index; diff --git a/net/l2tpv3.c b/net/l2tpv3.c index e4d4218db6..8aa0a3e1a0 100644 --- a/net/l2tpv3.c +++ b/net/l2tpv3.c @@ -723,6 +723,13 @@ int net_init_l2tpv3(const Netdev *netdev, =20 l2tpv3_read_poll(s, true); =20 + /* Store startup parameters */ + nc->stored_config =3D g_new0(NetdevInfo, 1); + nc->stored_config->type =3D NET_BACKEND_L2TPV3; + + QAPI_CLONE_MEMBERS(NetdevL2TPv3Options, + &nc->stored_config->u.l2tpv3, l2tpv3); + snprintf(s->nc.info_str, sizeof(s->nc.info_str), "l2tpv3: connected"); return 0; diff --git a/net/net.c b/net/net.c index fb7b7dcc25..1e50222a6e 100644 --- a/net/net.c +++ b/net/net.c @@ -35,7 +35,6 @@ #include "monitor/monitor.h" #include "qemu/help_option.h" #include "qapi/qapi-commands-net.h" -#include "qapi/qapi-visit-net.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" #include "qemu/error-report.h" @@ -352,6 +351,7 @@ static void qemu_free_net_client(NetClientState *nc) } g_free(nc->name); g_free(nc->model); + qapi_free_NetdevInfo(nc->stored_config); if (nc->destructor) { nc->destructor(nc); } @@ -1260,6 +1260,34 @@ RxFilterInfoList *qmp_query_rx_filter(bool has_name,= const char *name, return filter_list; } =20 +NetdevInfoList *qmp_query_netdev(Error **errp) +{ + NetdevInfoList *list =3D NULL; + NetClientState *nc; + + QTAILQ_FOREACH(nc, &net_clients, next) { + /* + * Only look at netdevs (backend network devices), not for each qu= eue + * or NIC / hubport + */ + if (nc->stored_config) { + NetdevInfo *element =3D QAPI_CLONE(NetdevInfo, nc->stored_conf= ig); + + g_free(element->id); /* Need to dealloc empty id after clone */ + element->id =3D g_strdup(nc->name); + + element->has_peer_id =3D nc->peer !=3D NULL; + if (element->has_peer_id) { + element->peer_id =3D g_strdup(nc->peer->name); + } + + QAPI_LIST_PREPEND(list, element); + } + } + + return list; +} + void hmp_info_network(Monitor *mon, const QDict *qdict) { NetClientState *nc, *peer; diff --git a/net/netmap.c b/net/netmap.c index 350f097f91..ad59d4ade4 100644 --- a/net/netmap.c +++ b/net/netmap.c @@ -427,6 +427,13 @@ int net_init_netmap(const Netdev *netdev, pstrcpy(s->ifname, sizeof(s->ifname), netmap_opts->ifname); netmap_read_poll(s, true); /* Initially only poll for reads. */ =20 + /* Store startup parameters */ + nc->stored_config =3D g_new0(NetdevInfo, 1); + nc->stored_config->type =3D NET_BACKEND_NETMAP; + + QAPI_CLONE_MEMBERS(NetdevNetmapOptions, + &nc->stored_config->u.netmap, netmap_opts); + return 0; } =20 diff --git a/net/slirp.c b/net/slirp.c index be914c0be0..6ab348b943 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -377,6 +377,9 @@ static int net_slirp_init(NetClientState *peer, const c= har *model, int shift; char *end; struct slirp_config_str *config; + NetdevUserOptions *stored; + StringList **stored_hostfwd; + StringList **stored_guestfwd; =20 if (!ipv4 && (vnetwork || vhost || vnameserver)) { error_setg(errp, "IPv4 disabled but netmask/host/dns provided"); @@ -552,6 +555,115 @@ static int net_slirp_init(NetClientState *peer, const= char *model, =20 nc =3D qemu_new_net_client(&net_slirp_info, peer, model, name); =20 + /* Store startup parameters */ + nc->stored_config =3D g_new0(NetdevInfo, 1); + nc->stored_config->type =3D NET_BACKEND_USER; + stored =3D &nc->stored_config->u.user; + + if (vhostname) { + stored->has_hostname =3D true; + stored->hostname =3D g_strdup(vhostname); + } + + stored->has_q_restrict =3D true; + stored->q_restrict =3D restricted; + + stored->has_ipv4 =3D true; + stored->ipv4 =3D ipv4; + + stored->has_ipv6 =3D true; + stored->ipv6 =3D ipv6; + + if (ipv4) { + uint8_t *net_bytes =3D (uint8_t *)&net; + uint8_t *mask_bytes =3D (uint8_t *)&mask; + + stored->has_net =3D true; + stored->net =3D g_strdup_printf("%d.%d.%d.%d/%d.%d.%d.%d", + net_bytes[0], net_bytes[1], + net_bytes[2], net_bytes[3], + mask_bytes[0], mask_bytes[1], + mask_bytes[2], mask_bytes[3]); + + stored->has_host =3D true; + stored->host =3D g_strdup(inet_ntoa(host)); + } + + if (tftp_export) { + stored->has_tftp =3D true; + stored->tftp =3D g_strdup(tftp_export); + } + + if (bootfile) { + stored->has_bootfile =3D true; + stored->bootfile =3D g_strdup(bootfile); + } + + if (vdhcp_start) { + stored->has_dhcpstart =3D true; + stored->dhcpstart =3D g_strdup(vdhcp_start); + } + + if (ipv4) { + stored->has_dns =3D true; + stored->dns =3D g_strdup(inet_ntoa(dns)); + } + + if (dnssearch) { + stored->has_dnssearch =3D true; + StringList **stored_list =3D &stored->dnssearch; + + for (int i =3D 0; dnssearch[i]; i++) { + String *element =3D g_new0(String, 1); + + element->str =3D g_strdup(dnssearch[i]); + QAPI_LIST_APPEND(stored_list, element); + } + } + + if (vdomainname) { + stored->has_domainname =3D true; + stored->domainname =3D g_strdup(vdomainname); + } + + if (ipv6) { + char addrstr[INET6_ADDRSTRLEN]; + const char *res; + + stored->has_ipv6_prefix =3D true; + stored->ipv6_prefix =3D g_strdup(vprefix6); + + stored->has_ipv6_prefixlen =3D true; + stored->ipv6_prefixlen =3D vprefix6_len; + + res =3D inet_ntop(AF_INET6, &ip6_host, + addrstr, sizeof(addrstr)); + + stored->has_ipv6_host =3D true; + stored->ipv6_host =3D g_strdup(res); + + res =3D inet_ntop(AF_INET6, &ip6_dns, + addrstr, sizeof(addrstr)); + + stored->has_ipv6_dns =3D true; + stored->ipv6_dns =3D g_strdup(res); + } + + if (smb_export) { + stored->has_smb =3D true; + stored->smb =3D g_strdup(smb_export); + } + + if (vsmbserver) { + stored->has_smbserver =3D true; + stored->smbserver =3D g_strdup(vsmbserver); + } + + if (tftp_server_name) { + stored->has_tftp_server_name =3D true; + stored->tftp_server_name =3D g_strdup(tftp_server_name); + } + snprintf(nc->info_str, sizeof(nc->info_str), "net=3D%s,restrict=3D%s", inet_ntoa(net), restricted ? "on" : "off"); @@ -581,15 +693,25 @@ static int net_slirp_init(NetClientState *peer, const= char *model, s->poll_notifier.notify =3D net_slirp_poll_notify; main_loop_poll_add_notifier(&s->poll_notifier); =20 + stored_hostfwd =3D &stored->hostfwd; + stored_guestfwd =3D &stored->guestfwd; + for (config =3D slirp_configs; config; config =3D config->next) { + String *element =3D g_new0(String, 1); + + element->str =3D g_strdup(config->str); if (config->flags & SLIRP_CFG_HOSTFWD) { if (slirp_hostfwd(s, config->str, errp) < 0) { goto error; } + stored->has_hostfwd =3D true; + QAPI_LIST_APPEND(stored_hostfwd, element); } else { if (slirp_guestfwd(s, config->str, errp) < 0) { goto error; } + stored->has_guestfwd =3D true; + QAPI_LIST_APPEND(stored_guestfwd, element); } } #ifndef _WIN32 diff --git a/net/socket.c b/net/socket.c index 15b410e8d8..1614523b82 100644 --- a/net/socket.c +++ b/net/socket.c @@ -342,6 +342,7 @@ static NetSocketState *net_socket_fd_init_dgram(NetClie= ntState *peer, NetSocketState *s; SocketAddress *sa; SocketAddressType sa_type; + NetdevSocketOptions *stored; =20 sa =3D socket_local_address(fd, errp); if (!sa) { @@ -385,8 +386,19 @@ static NetSocketState *net_socket_fd_init_dgram(NetCli= entState *peer, net_socket_rs_init(&s->rs, net_socket_rs_finalize, false); net_socket_read_poll(s, true); =20 + /* Store startup parameters */ + nc->stored_config =3D g_new0(NetdevInfo, 1); + nc->stored_config->type =3D NET_BACKEND_SOCKET; + stored =3D &nc->stored_config->u.socket; + + stored->has_fd =3D true; + stored->fd =3D g_strdup_printf("%d", fd); + /* mcast: save bound address as dst */ if (is_connected && mcast !=3D NULL) { + stored->has_mcast =3D true; + stored->mcast =3D g_strdup(mcast); + s->dgram_dst =3D saddr; snprintf(nc->info_str, sizeof(nc->info_str), "socket: fd=3D%d (cloned mcast=3D%s:%d)", @@ -428,6 +440,7 @@ static NetSocketState *net_socket_fd_init_stream(NetCli= entState *peer, { NetClientState *nc; NetSocketState *s; + NetdevSocketOptions *stored; =20 nc =3D qemu_new_net_client(&net_socket_info, peer, model, name); =20 @@ -447,6 +460,15 @@ static NetSocketState *net_socket_fd_init_stream(NetCl= ientState *peer, } else { qemu_set_fd_handler(s->fd, NULL, net_socket_connect, s); } + + /* Store startup parameters */ + nc->stored_config =3D g_new0(NetdevInfo, 1); + nc->stored_config->type =3D NET_BACKEND_SOCKET; + stored =3D &nc->stored_config->u.socket; + + stored->has_fd =3D true; + stored->fd =3D g_strdup_printf("%d", fd); + return s; } =20 @@ -483,6 +505,7 @@ static void net_socket_accept(void *opaque) struct sockaddr_in saddr; socklen_t len; int fd; + NetdevSocketOptions *stored; =20 for(;;) { len =3D sizeof(saddr); @@ -498,6 +521,13 @@ static void net_socket_accept(void *opaque) s->fd =3D fd; s->nc.link_down =3D false; net_socket_connect(s); + + /* Store additional startup parameters (extend net_socket_listen_init)= */ + stored =3D &s->nc.stored_config->u.socket; + + stored->has_fd =3D true; + stored->fd =3D g_strdup_printf("%d", fd); + snprintf(s->nc.info_str, sizeof(s->nc.info_str), "socket: connection from %s:%d", inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port)); @@ -513,6 +543,7 @@ static int net_socket_listen_init(NetClientState *peer, NetSocketState *s; struct sockaddr_in saddr; int fd, ret; + NetdevSocketOptions *stored; =20 if (parse_host_port(&saddr, host_str, errp) < 0) { return -1; @@ -549,6 +580,15 @@ static int net_socket_listen_init(NetClientState *peer, net_socket_rs_init(&s->rs, net_socket_rs_finalize, false); =20 qemu_set_fd_handler(s->listen_fd, net_socket_accept, NULL, s); + + /* Store startup parameters */ + nc->stored_config =3D g_new0(NetdevInfo, 1); + nc->stored_config->type =3D NET_BACKEND_SOCKET; + stored =3D &nc->stored_config->u.socket; + + stored->has_listen =3D true; + stored->listen =3D g_strdup(host_str); + return 0; } =20 @@ -561,6 +601,7 @@ static int net_socket_connect_init(NetClientState *peer, NetSocketState *s; int fd, connected, ret; struct sockaddr_in saddr; + NetdevSocketOptions *stored; =20 if (parse_host_port(&saddr, host_str, errp) < 0) { return -1; @@ -598,6 +639,12 @@ static int net_socket_connect_init(NetClientState *pee= r, return -1; } =20 + /* Store additional startup parameters (extend net_socket_fd_init) */ + stored =3D &s->nc.stored_config->u.socket; + + stored->has_connect =3D true; + stored->connect =3D g_strdup(host_str); + snprintf(s->nc.info_str, sizeof(s->nc.info_str), "socket: connect to %s:%d", inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port)); @@ -615,6 +662,7 @@ static int net_socket_mcast_init(NetClientState *peer, int fd; struct sockaddr_in saddr; struct in_addr localaddr, *param_localaddr; + NetdevSocketOptions *stored; =20 if (parse_host_port(&saddr, host_str, errp) < 0) { return -1; @@ -643,6 +691,19 @@ static int net_socket_mcast_init(NetClientState *peer, =20 s->dgram_dst =3D saddr; =20 + /* Store additional startup parameters (extend net_socket_fd_init) */ + stored =3D &s->nc.stored_config->u.socket; + + if (!stored->has_mcast) { + stored->has_mcast =3D true; + stored->mcast =3D g_strdup(host_str); + } + + if (localaddr_str) { + stored->has_localaddr =3D true; + stored->localaddr =3D g_strdup(localaddr_str); + } + snprintf(s->nc.info_str, sizeof(s->nc.info_str), "socket: mcast=3D%s:%d", inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port)); @@ -660,6 +721,7 @@ static int net_socket_udp_init(NetClientState *peer, NetSocketState *s; int fd, ret; struct sockaddr_in laddr, raddr; + NetdevSocketOptions *stored; =20 if (parse_host_port(&laddr, lhost, errp) < 0) { return -1; @@ -698,6 +760,15 @@ static int net_socket_udp_init(NetClientState *peer, =20 s->dgram_dst =3D raddr; =20 + /* Store additional startup parameters (extend net_socket_fd_init) */ + stored =3D &s->nc.stored_config->u.socket; + + stored->has_localaddr =3D true; + stored->localaddr =3D g_strdup(lhost); + + stored->has_udp =3D true; + stored->udp =3D g_strdup(rhost); + snprintf(s->nc.info_str, sizeof(s->nc.info_str), "socket: udp=3D%s:%d", inet_ntoa(raddr.sin_addr), ntohs(raddr.sin_port)); diff --git a/net/tap-win32.c b/net/tap-win32.c index 2b5dcda36e..b60933bd1a 100644 --- a/net/tap-win32.c +++ b/net/tap-win32.c @@ -768,6 +768,7 @@ static int tap_win32_init(NetClientState *peer, const c= har *model, NetClientState *nc; TAPState *s; tap_win32_overlapped_t *handle; + NetdevTapOptions *stored; =20 if (tap_win32_open(&handle, ifname) < 0) { printf("tap: Could not open '%s'\n", ifname); @@ -778,6 +779,14 @@ static int tap_win32_init(NetClientState *peer, const = char *model, =20 s =3D DO_UPCAST(TAPState, nc, nc); =20 + /* Store startup parameters */ + nc->stored_config =3D g_new0(NetdevInfo, 1); + nc->stored_config->type =3D NET_BACKEND_TAP; + stored =3D &nc->stored_config->u.tap; + + stored->has_ifname =3D true; + stored->ifname =3D g_strdup(ifname); + snprintf(s->nc.info_str, sizeof(s->nc.info_str), "tap: ifname=3D%s", ifname); =20 diff --git a/net/tap.c b/net/tap.c index b7512853f4..8041245ba7 100644 --- a/net/tap.c +++ b/net/tap.c @@ -590,6 +590,7 @@ int net_init_bridge(const Netdev *netdev, const char *n= ame, const char *helper, *br; TAPState *s; int fd, vnet_hdr; + NetdevBridgeOptions *stored; =20 assert(netdev->type =3D=3D NET_CLIENT_DRIVER_BRIDGE); bridge =3D &netdev->u.bridge; @@ -609,6 +610,21 @@ int net_init_bridge(const Netdev *netdev, const char *= name, } s =3D net_tap_fd_init(peer, "bridge", name, fd, vnet_hdr); =20 + /* Store startup parameters */ + s->nc.stored_config =3D g_new0(NetdevInfo, 1); + s->nc.stored_config->type =3D NET_BACKEND_BRIDGE; + stored =3D &s->nc.stored_config->u.bridge; + + if (br) { + stored->has_br =3D true; + stored->br =3D g_strdup(br); + } + + if (helper) { + stored->has_helper =3D true; + stored->helper =3D g_strdup(helper); + } + snprintf(s->nc.info_str, sizeof(s->nc.info_str), "helper=3D%s,br=3D%s"= , helper, br); =20 @@ -656,11 +672,13 @@ static void net_init_tap_one(const NetdevTapOptions *= tap, NetClientState *peer, const char *model, const char *name, const char *ifname, const char *script, const char *downscript, const char *vhostfdna= me, - int vnet_hdr, int fd, Error **errp) + int vnet_hdr, int fd, NetdevInfo **common_sto= red, + Error **errp) { Error *err =3D NULL; TAPState *s =3D net_tap_fd_init(peer, model, name, fd, vnet_hdr); int vhostfd; + NetdevTapOptions *stored; =20 tap_set_sndbuf(s->fd, tap, &err); if (err) { @@ -668,12 +686,65 @@ static void net_init_tap_one(const NetdevTapOptions *= tap, NetClientState *peer, return; } =20 + /* Store startup parameters */ + if (!*common_stored) { + *common_stored =3D g_new0(NetdevInfo, 1); + (*common_stored)->type =3D NET_BACKEND_TAP; + s->nc.stored_config =3D *common_stored; + } + stored =3D &(*common_stored)->u.tap; + + if (tap->has_sndbuf && !stored->has_sndbuf) { + stored->has_sndbuf =3D true; + stored->sndbuf =3D tap->sndbuf; + } + + if (vnet_hdr && !stored->has_vnet_hdr) { + stored->has_vnet_hdr =3D true; + stored->vnet_hdr =3D true; + } + if (tap->has_fd || tap->has_fds) { + if (!stored->has_fds) { + stored->has_fds =3D true; + stored->fds =3D g_strdup_printf("%d", fd); + } else { + char *tmp_s =3D stored->fds; + stored->fds =3D g_strdup_printf("%s:%d", stored->fds, fd); + g_free(tmp_s); + } + snprintf(s->nc.info_str, sizeof(s->nc.info_str), "fd=3D%d", fd); } else if (tap->has_helper) { + if (!stored->has_helper) { + stored->has_helper =3D true; + stored->helper =3D g_strdup(tap->helper); + } + + if (!stored->has_br) { + stored->has_br =3D true; + stored->br =3D tap->has_br ? g_strdup(tap->br) : + g_strdup(DEFAULT_BRIDGE_INTERFACE); + } + snprintf(s->nc.info_str, sizeof(s->nc.info_str), "helper=3D%s", tap->helper); } else { + if (ifname && !stored->has_ifname) { + stored->has_ifname =3D true; + stored->ifname =3D g_strdup(ifname); + } + + if (script && !stored->has_script) { + stored->has_script =3D true; + stored->script =3D g_strdup(script); + } + + if (downscript && !stored->has_downscript) { + stored->has_downscript =3D true; + stored->downscript =3D g_strdup(downscript); + } + snprintf(s->nc.info_str, sizeof(s->nc.info_str), "ifname=3D%s,script=3D%s,downscript=3D%s", ifname, script, downscript); @@ -689,9 +760,20 @@ static void net_init_tap_one(const NetdevTapOptions *t= ap, NetClientState *peer, vhostfdname || (tap->has_vhostforce && tap->vhostforce)) { VhostNetOptions options; =20 + stored->has_vhost =3D true; + stored->vhost =3D true; + + if (tap->has_vhostforce && tap->vhostforce) { + stored->has_vhostforce =3D true; + stored->vhostforce =3D true; + } + options.backend_type =3D VHOST_BACKEND_TYPE_KERNEL; options.net_backend =3D &s->nc; if (tap->has_poll_us) { + stored->has_poll_us =3D true; + stored->poll_us =3D tap->poll_us; + options.busyloop_timeout =3D tap->poll_us; } else { options.busyloop_timeout =3D 0; @@ -731,6 +813,15 @@ static void net_init_tap_one(const NetdevTapOptions *t= ap, NetClientState *peer, } options.opaque =3D (void *)(uintptr_t)vhostfd; =20 + if (!stored->has_vhostfds) { + stored->has_vhostfds =3D true; + stored->vhostfds =3D g_strdup_printf("%d", vhostfd); + } else { + char *tmp_s =3D stored->vhostfds; + stored->vhostfds =3D g_strdup_printf("%s:%d", stored->fds, vho= stfd); + g_free(tmp_s); + } + s->vhost_net =3D vhost_net_init(&options); if (!s->vhost_net) { if (tap->has_vhostforce && tap->vhostforce) { @@ -783,6 +874,7 @@ int net_init_tap(const Netdev *netdev, const char *name, const char *vhostfdname; char ifname[128]; int ret =3D 0; + NetdevInfo *common_stored =3D NULL; /* will store configuration */ =20 assert(netdev->type =3D=3D NET_CLIENT_DRIVER_TAP); tap =3D &netdev->u.tap; @@ -829,7 +921,7 @@ int net_init_tap(const Netdev *netdev, const char *name, =20 net_init_tap_one(tap, peer, "tap", name, NULL, script, downscript, - vhostfdname, vnet_hdr, fd, &err); + vhostfdname, vnet_hdr, fd, &common_stored, &err); if (err) { error_propagate(errp, err); close(fd); @@ -892,7 +984,7 @@ int net_init_tap(const Netdev *netdev, const char *name, net_init_tap_one(tap, peer, "tap", name, ifname, script, downscript, tap->has_vhostfds ? vhost_fds[i] : NULL, - vnet_hdr, fd, &err); + vnet_hdr, fd, &common_stored, &err); if (err) { error_propagate(errp, err); ret =3D -1; @@ -935,7 +1027,7 @@ free_fail: =20 net_init_tap_one(tap, peer, "bridge", name, ifname, script, downscript, vhostfdname, - vnet_hdr, fd, &err); + vnet_hdr, fd, &common_stored, &err); if (err) { error_propagate(errp, err); close(fd); @@ -981,7 +1073,8 @@ free_fail: net_init_tap_one(tap, peer, "tap", name, ifname, i >=3D 1 ? "no" : script, i >=3D 1 ? "no" : downscript, - vhostfdname, vnet_hdr, fd, &err); + vhostfdname, vnet_hdr, fd, + &common_stored, &err); if (err) { error_propagate(errp, err); close(fd); diff --git a/net/vde.c b/net/vde.c index 99189cccb6..b0b8800571 100644 --- a/net/vde.c +++ b/net/vde.c @@ -84,6 +84,7 @@ static int net_vde_init(NetClientState *peer, const char = *model, VDECONN *vde; char *init_group =3D (char *)group; char *init_sock =3D (char *)sock; + NetdevVdeOptions *stored; =20 struct vde_open_args args =3D { .port =3D port, @@ -108,6 +109,27 @@ static int net_vde_init(NetClientState *peer, const ch= ar *model, =20 qemu_set_fd_handler(vde_datafd(s->vde), vde_to_qemu, NULL, s); =20 + /* Store startup parameters */ + nc->stored_config =3D g_new0(NetdevInfo, 1); + nc->stored_config->type =3D NET_BACKEND_VDE; + stored =3D &nc->stored_config->u.vde; + + if (sock) { + stored->has_sock =3D true; + stored->sock =3D g_strdup(sock); + } + + stored->has_port =3D true; + stored->port =3D port; + + if (group) { + stored->has_group =3D true; + stored->group =3D g_strdup(group); + } + + stored->has_mode =3D true; + stored->mode =3D mode; + return 0; } =20 diff --git a/net/vhost-user.c b/net/vhost-user.c index ffbd94d944..5b7056be25 100644 --- a/net/vhost-user.c +++ b/net/vhost-user.c @@ -311,14 +311,15 @@ static void net_vhost_user_event(void *opaque, QEMUCh= rEvent event) } =20 static int net_vhost_user_init(NetClientState *peer, const char *device, - const char *name, Chardev *chr, - int queues) + const char *name, const char *chardev, + Chardev *chr, int queues) { Error *err =3D NULL; NetClientState *nc, *nc0 =3D NULL; NetVhostUserState *s =3D NULL; VhostUserState *user; int i; + NetdevVhostUserOptions *stored; =20 assert(name); assert(queues > 0); @@ -355,6 +356,16 @@ static int net_vhost_user_init(NetClientState *peer, c= onst char *device, =20 assert(s->vhost_net); =20 + /* Store startup parameters */ + nc0->stored_config =3D g_new0(NetdevInfo, 1); + nc0->stored_config->type =3D NET_BACKEND_VHOST_USER; + stored =3D &nc0->stored_config->u.vhost_user; + + stored->chardev =3D g_strdup(chardev); + + stored->has_queues =3D true; + stored->queues =3D queues; + return 0; =20 err: @@ -446,5 +457,6 @@ int net_init_vhost_user(const Netdev *netdev, const cha= r *name, return -1; } =20 - return net_vhost_user_init(peer, "vhost_user", name, chr, queues); + return net_vhost_user_init(peer, "vhost_user", name, + vhost_user_opts->chardev, chr, queues); } diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index fe659ec9e2..8c27ea0142 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -184,8 +184,22 @@ static int net_vhost_vdpa_init(NetClientState *peer, c= onst char *device, VhostVDPAState *s; int vdpa_device_fd =3D -1; int ret =3D 0; + NetdevVhostVDPAOptions *stored; + assert(name); nc =3D qemu_new_net_client(&net_vhost_vdpa_info, peer, device, name); + + /* Store startup parameters */ + nc->stored_config =3D g_new0(NetdevInfo, 1); + nc->stored_config->type =3D NET_BACKEND_VHOST_VDPA; + stored =3D &nc->stored_config->u.vhost_vdpa; + + stored->has_vhostdev =3D true; + stored->vhostdev =3D g_strdup(vhostdev); + + stored->has_queues =3D true; + stored->queues =3D 1; /* TODO: change when support multiqueue */ + snprintf(nc->info_str, sizeof(nc->info_str), TYPE_VHOST_VDPA); nc->queue_index =3D 0; s =3D DO_UPCAST(VhostVDPAState, nc, nc); diff --git a/qapi/net.json b/qapi/net.json index c31748c87f..87361ebd9a 100644 --- a/qapi/net.json +++ b/qapi/net.json @@ -714,3 +714,83 @@ ## { 'event': 'FAILOVER_NEGOTIATED', 'data': {'device-id': 'str'} } + +## +# @NetBackend: +# +# Available netdev backend drivers. +# +# Since: 6.0 +## +{ 'enum': 'NetBackend', + 'data': [ 'bridge', 'l2tpv3', 'netmap', 'socket', 'tap', 'user', 'vde', + 'vhost-user', 'vhost-vdpa' ] } + +## +# @NetdevInfo: +# +# Configuration of a network backend device (netdev). +# +# @id: Device identifier. +# +# @type: Specify the driver used for interpreting remaining arguments. +# +# @peer-id: The connected frontend network device name (absent if no front= end +# is connected). +# +# Since: 6.0 +## +{ 'union': 'NetdevInfo', + 'base': { 'id': 'str', + 'type': 'NetBackend', + '*peer-id': 'str' }, + 'discriminator': 'type', + 'data': { + 'bridge': 'NetdevBridgeOptions', + 'l2tpv3': 'NetdevL2TPv3Options', + 'netmap': 'NetdevNetmapOptions', + 'socket': 'NetdevSocketOptions', + 'tap': 'NetdevTapOptions', + 'user': 'NetdevUserOptions', + 'vde': 'NetdevVdeOptions', + 'vhost-user': 'NetdevVhostUserOptions', + 'vhost-vdpa': 'NetdevVhostVDPAOptions' } } + +## +# @query-netdev: +# +# Get a list of @NetdevInfo for all virtual network backend devices (netde= vs). +# +# Returns: a list of @NetdevInfo describing each netdev. +# +# Since: 6.0 +# +# Example: +# +# -> { "execute": "query-netdev" } +# <- { "return": [ +# { +# "ipv6": true, +# "ipv4": true, +# "host": "10.0.2.2", +# "ipv6-dns": "fec0::3", +# "ipv6-prefix": "fec0::", +# "net": "10.0.2.0/255.255.255.0", +# "ipv6-host": "fec0::2", +# "type": "user", +# "peer-id": "net0", +# "dns": "10.0.2.3", +# "hostfwd": [ +# { +# "str": "tcp::20004-:22" +# } +# ], +# "ipv6-prefixlen": 64, +# "id": "netdev0", +# "restrict": false +# } +# ] +# } +# +## +{ 'command': 'query-netdev', 'returns': ['NetdevInfo'] } --=20 2.25.1 From nobody Sat Apr 27 18:17:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1614765585; cv=none; d=zohomail.com; s=zohoarc; b=L3kvWzLHsTYAawTn9c7a87dSxATySfSigSCrx4Sw8gP1qyX9x+brPF928itgeCwQLHXkVbORyCuK8lpPo2CTXGbkhfNVXcHZS5VIKLAjGw+rUU3uI5KROPQlbsRys+gA/5SV0NUSBII9/SmMwVnO1W62EDu0gK3lIo4WhDuQ2xM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614765585; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TClaDRzxQB4h6SlKaYxQXAsUYr6qhA7dXnvUiqCeKqs=; b=KC/eRptEMpoOlFGSx5Y162/p7lmFTe0RNR2YEOlJjLI5lY2X5Fce/JLsP5aQ43iqcYe6EHtVrdq7VRWxv0B5N0s0Cnu5jnWvza2zrugFJvrec0SMFgE+Vdp+V9e8RmR0YTALdsSoyITcbP2B5e3h9jxEsopqQ+wbCINVaNc7y54= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1614765585149235.9133532409677; Wed, 3 Mar 2021 01:59:45 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.92801.174930 (Exim 4.92) (envelope-from ) id 1lHOHy-0001RR-7a; Wed, 03 Mar 2021 09:59:30 +0000 Received: by outflank-mailman (output) from mailman id 92801.174930; Wed, 03 Mar 2021 09:59:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lHOHy-0001RJ-4C; Wed, 03 Mar 2021 09:59:30 +0000 Received: by outflank-mailman (input) for mailman id 92801; Wed, 03 Mar 2021 09:59:29 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lHOHx-0001PK-CC for xen-devel@lists.xenproject.org; Wed, 03 Mar 2021 09:59:29 +0000 Received: from forwardcorp1o.mail.yandex.net (unknown [2a02:6b8:0:1a2d::193]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 03bc414c-1d27-4163-aa22-dc3a6fffd42b; Wed, 03 Mar 2021 09:59:24 +0000 (UTC) Received: from vla1-fdfb804fb3f3.qloud-c.yandex.net (vla1-fdfb804fb3f3.qloud-c.yandex.net [IPv6:2a02:6b8:c0d:3199:0:640:fdfb:804f]) by forwardcorp1o.mail.yandex.net (Yandex) with ESMTP id 778DD2E159D; Wed, 3 Mar 2021 12:59:23 +0300 (MSK) Received: from vla5-d6d5ce7a4718.qloud-c.yandex.net (vla5-d6d5ce7a4718.qloud-c.yandex.net [2a02:6b8:c18:341e:0:640:d6d5:ce7a]) by vla1-fdfb804fb3f3.qloud-c.yandex.net (mxbackcorp/Yandex) with ESMTP id 3wSchzD0qs-xNx0Kbbh; Wed, 03 Mar 2021 12:59:23 +0300 Received: from dynamic-red3.dhcp.yndx.net (dynamic-red3.dhcp.yndx.net [2a02:6b8:0:107:880d:3c89:fcd8:ca75]) by vla5-d6d5ce7a4718.qloud-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id w0BjtEeJGw-xNnKfM56; Wed, 03 Mar 2021 12:59:23 +0300 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client certificate not present) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Inumbo-ID: 03bc414c-1d27-4163-aa22-dc3a6fffd42b Precedence: bulk DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1614765563; bh=TClaDRzxQB4h6SlKaYxQXAsUYr6qhA7dXnvUiqCeKqs=; h=In-Reply-To:Message-Id:References:Date:Subject:To:From:Cc; b=ECfrZx48XAaCBOEwbhj1JgVAsg8v9direbd7oanzOnhLwMqHZ+vl/7eqref57HsGc xmQgPHA8N5kCiM0H3sB8+XjNNdnPOYdsKcocuHkg0MI6kTNlPFbf4p0Bk36Uwr3TL9 Br3swnWxJY+Ny5qVkGUwSzkLtVnpKRnCZfxCu76Y= Authentication-Results: vla1-fdfb804fb3f3.qloud-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Alexey Kirillov To: Jason Wang , Markus Armbruster , Thomas Huth , Eric Blake Cc: Laurent Vivier , Samuel Thibault , "Michael S. Tsirkin" , Michael Roth , Paolo Bonzini , Luigi Rizzo , Giuseppe Lettieri , Vincenzo Maffione , Stefan Weil , Stefano Stabellini , Anthony Perard , Paul Durrant , xen-devel@lists.xenproject.org, qemu-devel@nongnu.org, yc-core@yandex-team.ru Subject: [PATCH v7 2/5] tests: Add tests for query-netdev command Date: Wed, 3 Mar 2021 12:59:07 +0300 Message-Id: <20210303095910.78277-3-lekiravi@yandex-team.ru> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210303095910.78277-1-lekiravi@yandex-team.ru> References: <20210303095910.78277-1-lekiravi@yandex-team.ru> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @yandex-team.ru) Content-Type: text/plain; charset="utf-8" A simply qtest that checks for correct number of netdevs in the response of the query-netdev. Signed-off-by: Alexey Kirillov Acked-by: Thomas Huth --- tests/qtest/meson.build | 3 + tests/qtest/test-query-netdev.c | 120 ++++++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+) create mode 100644 tests/qtest/test-query-netdev.c diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index ba6ecaed32..fefe3da3c3 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -17,6 +17,9 @@ qtests_generic =3D [ if config_host.has_key('CONFIG_MODULES') qtests_generic +=3D [ 'modules-test' ] endif +if slirp.found() + qtests_generic +=3D [ 'test-query-netdev' ] +endif =20 qtests_pci =3D \ (config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : []) += \ diff --git a/tests/qtest/test-query-netdev.c b/tests/qtest/test-query-netde= v.c new file mode 100644 index 0000000000..1118537a9f --- /dev/null +++ b/tests/qtest/test-query-netdev.c @@ -0,0 +1,120 @@ +/* + * QTest testcase for the query-netdev + * + * Copyright Yandex N.V., 2019 + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + * + */ + +#include "qemu/osdep.h" + +#include "libqos/libqtest.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qlist.h" + +/* + * Events can get in the way of responses we are actually waiting for. + */ +GCC_FMT_ATTR(2, 3) +static QObject *wait_command(QTestState *who, const char *command, ...) +{ + va_list ap; + QDict *response; + QObject *result; + + va_start(ap, command); + qtest_qmp_vsend(who, command, ap); + va_end(ap); + + response =3D qtest_qmp_receive(who); + + result =3D qdict_get(response, "return"); + g_assert(result); + qobject_ref(result); + qobject_unref(response); + + return result; +} + +static void qmp_query_netdev_no_error(QTestState *qts, size_t netdevs_coun= t) +{ + QObject *resp; + QList *netdevs; + + resp =3D wait_command(qts, "{'execute': 'query-netdev'}"); + + netdevs =3D qobject_to(QList, resp); + g_assert(netdevs); + g_assert(qlist_size(netdevs) =3D=3D netdevs_count); + + qobject_unref(resp); +} + +static void test_query_netdev(void) +{ + const char *arch =3D qtest_get_arch(); + QObject *resp; + QTestState *state; + + /* Choosing machine for platforms without default one */ + if (g_str_equal(arch, "arm") || + g_str_equal(arch, "aarch64")) { + state =3D qtest_init( + "-nodefaults " + "-M virt " + "-netdev user,id=3Dslirp0"); + } else if (g_str_equal(arch, "tricore")) { + state =3D qtest_init( + "-nodefaults " + "-M tricore_testboard " + "-netdev user,id=3Dslirp0"); + } else if (g_str_equal(arch, "avr")) { + state =3D qtest_init( + "-nodefaults " + "-M mega2560 " + "-netdev user,id=3Dslirp0"); + } else if (g_str_equal(arch, "rx")) { + state =3D qtest_init( + "-nodefaults " + "-M gdbsim-r5f562n8 " + "-netdev user,id=3Dslirp0"); + } else { + state =3D qtest_init( + "-nodefaults " + "-netdev user,id=3Dslirp0"); + } + g_assert(state); + + qmp_query_netdev_no_error(state, 1); + + resp =3D wait_command(state, + "{'execute': 'netdev_add', 'arguments': {" + " 'id': 'slirp1'," + " 'type': 'user'}}"); + qobject_unref(resp); + + qmp_query_netdev_no_error(state, 2); + + resp =3D wait_command(state, + "{'execute': 'netdev_del', 'arguments': {" + " 'id': 'slirp1'}}"); + qobject_unref(resp); + + qmp_query_netdev_no_error(state, 1); + + qtest_quit(state); +} + +int main(int argc, char **argv) +{ + int ret =3D 0; + g_test_init(&argc, &argv, NULL); + + qtest_add_func("/net/qapi/query_netdev", test_query_netdev); + + ret =3D g_test_run(); + + return ret; +} --=20 2.25.1 From nobody Sat Apr 27 18:17:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1614765594; cv=none; d=zohomail.com; s=zohoarc; b=NUdZYCwHCk/KThY+pHh1lHUhMWSJZGYYQ9ey3HEJLysZuY8YUj80Y+ef+m35lXbr3rPzcfd+tq54t3lst5plnDO/B7joFzBdrbLhgnsq2Ri/duz+ApID0Qpaa05LnWp6AOmCpak3H7hBwNLROZ2hBqCTH/Xm6kc6uAz+TuUS9cc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614765594; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tKLqAXYmQttCAaAlU3fBYVvZyqpt/IoO0XRXm/czWeY=; b=cRZ7By7PZuCv8jgxm5IUZ7pP1cnk8+YO/Iep+aQ1ktbSDO9q/f8FgUtSitktUKb9rd/zlI4gbXzxVZ9/XGdeN/6FyzXCrjdG1vb3yWiJr8bs0XA/tJsT8yUphi3BSb32bYJACA14TggZ9mpeenJQN1O+UOG4ljCFNw/D5A9B2/Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1614765594382249.35550515787372; Wed, 3 Mar 2021 01:59:54 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.92804.174965 (Exim 4.92) (envelope-from ) id 1lHOI8-0001cj-7H; Wed, 03 Mar 2021 09:59:40 +0000 Received: by outflank-mailman (output) from mailman id 92804.174965; Wed, 03 Mar 2021 09:59:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lHOI8-0001ca-3x; Wed, 03 Mar 2021 09:59:40 +0000 Received: by outflank-mailman (input) for mailman id 92804; Wed, 03 Mar 2021 09:59:39 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lHOI7-0001PK-Cg for xen-devel@lists.xenproject.org; Wed, 03 Mar 2021 09:59:39 +0000 Received: from forwardcorp1o.mail.yandex.net (unknown [2a02:6b8:0:1a2d::193]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 9d3cd9ae-3831-454b-94ca-afeb03441a89; Wed, 03 Mar 2021 09:59:25 +0000 (UTC) Received: from vla1-fdfb804fb3f3.qloud-c.yandex.net (vla1-fdfb804fb3f3.qloud-c.yandex.net [IPv6:2a02:6b8:c0d:3199:0:640:fdfb:804f]) by forwardcorp1o.mail.yandex.net (Yandex) with ESMTP id 990FB2E15BD; Wed, 3 Mar 2021 12:59:24 +0300 (MSK) Received: from vla5-d6d5ce7a4718.qloud-c.yandex.net (vla5-d6d5ce7a4718.qloud-c.yandex.net [2a02:6b8:c18:341e:0:640:d6d5:ce7a]) by vla1-fdfb804fb3f3.qloud-c.yandex.net (mxbackcorp/Yandex) with ESMTP id U464HtyxDo-xOxSQLKe; Wed, 03 Mar 2021 12:59:24 +0300 Received: from dynamic-red3.dhcp.yndx.net (dynamic-red3.dhcp.yndx.net [2a02:6b8:0:107:880d:3c89:fcd8:ca75]) by vla5-d6d5ce7a4718.qloud-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id w0BjtEeJGw-xOnKhJsv; Wed, 03 Mar 2021 12:59:24 +0300 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client certificate not present) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Inumbo-ID: 9d3cd9ae-3831-454b-94ca-afeb03441a89 Precedence: bulk DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1614765564; bh=tKLqAXYmQttCAaAlU3fBYVvZyqpt/IoO0XRXm/czWeY=; h=In-Reply-To:Message-Id:References:Date:Subject:To:From:Cc; b=AkZnkvJFo+ECjj66JzKbBbTOtDX6hKqNbh4xeP96UYVqIETfkaXHjnZoO1fNDedkg 0ebA/ed1usEe3C7S/PJ9ksh40p89acXsAxfhd0+yb+1cGtWm7TVfIlnaLDCtHJc/D+ zAafC/aPEWlto+FIOWMdYRW0VYMfyYW0EitDeQ50= Authentication-Results: vla1-fdfb804fb3f3.qloud-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Alexey Kirillov To: Jason Wang , Markus Armbruster , Thomas Huth , Eric Blake Cc: Laurent Vivier , Samuel Thibault , "Michael S. Tsirkin" , Michael Roth , Paolo Bonzini , Luigi Rizzo , Giuseppe Lettieri , Vincenzo Maffione , Stefan Weil , Stefano Stabellini , Anthony Perard , Paul Durrant , xen-devel@lists.xenproject.org, qemu-devel@nongnu.org, yc-core@yandex-team.ru Subject: [PATCH v7 3/5] net: Move NetClientState.info_str to dynamic allocations Date: Wed, 3 Mar 2021 12:59:08 +0300 Message-Id: <20210303095910.78277-4-lekiravi@yandex-team.ru> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210303095910.78277-1-lekiravi@yandex-team.ru> References: <20210303095910.78277-1-lekiravi@yandex-team.ru> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @yandex-team.ru) Content-Type: text/plain; charset="utf-8" The info_str field of the NetClientState structure is static and has a size of 256 bytes. This amount is often unclaimed, and the field itself is used exclusively for HMP "info network". The patch translates info_str to dynamic memory allocation. This action is also allows us to painlessly discard usage of this field for backend devices. Signed-off-by: Alexey Kirillov --- hw/net/xen_nic.c | 5 ++--- include/net/net.h | 2 +- net/l2tpv3.c | 3 +-- net/net.c | 14 ++++++++------ net/slirp.c | 5 ++--- net/socket.c | 43 ++++++++++++++++++++++++------------------- net/tap-win32.c | 3 +-- net/tap.c | 13 +++++-------- net/vde.c | 3 +-- net/vhost-user.c | 3 +-- net/vhost-vdpa.c | 2 +- 11 files changed, 47 insertions(+), 49 deletions(-) diff --git a/hw/net/xen_nic.c b/hw/net/xen_nic.c index 5c815b4f0c..8431808ea0 100644 --- a/hw/net/xen_nic.c +++ b/hw/net/xen_nic.c @@ -296,9 +296,8 @@ static int net_init(struct XenLegacyDevice *xendev) netdev->nic =3D qemu_new_nic(&net_xen_info, &netdev->conf, "xen", NULL, netdev); =20 - snprintf(qemu_get_queue(netdev->nic)->info_str, - sizeof(qemu_get_queue(netdev->nic)->info_str), - "nic: xenbus vif macaddr=3D%s", netdev->mac); + qemu_get_queue(netdev->nic)->info_str =3D g_strdup_printf( + "nic: xenbus vif macaddr=3D%s", netdev->mac); =20 /* fill info */ xenstore_write_be_int(&netdev->xendev, "feature-rx-copy", 1); diff --git a/include/net/net.h b/include/net/net.h index 162fd3f1b5..7039eb280a 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -94,7 +94,7 @@ struct NetClientState { NetQueue *incoming_queue; char *model; char *name; - char info_str[256]; + char *info_str; NetdevInfo *stored_config; unsigned receive_disabled : 1; NetClientDestructor *destructor; diff --git a/net/l2tpv3.c b/net/l2tpv3.c index 8aa0a3e1a0..96611cb4af 100644 --- a/net/l2tpv3.c +++ b/net/l2tpv3.c @@ -730,8 +730,7 @@ int net_init_l2tpv3(const Netdev *netdev, QAPI_CLONE_MEMBERS(NetdevL2TPv3Options, &nc->stored_config->u.l2tpv3, l2tpv3); =20 - snprintf(s->nc.info_str, sizeof(s->nc.info_str), - "l2tpv3: connected"); + s->nc.info_str =3D g_strdup_printf("l2tpv3: connected"); return 0; outerr: qemu_del_net_client(nc); diff --git a/net/net.c b/net/net.c index 1e50222a6e..88d70d0e4d 100644 --- a/net/net.c +++ b/net/net.c @@ -128,11 +128,12 @@ char *qemu_mac_strdup_printf(const uint8_t *macaddr) =20 void qemu_format_nic_info_str(NetClientState *nc, uint8_t macaddr[6]) { - snprintf(nc->info_str, sizeof(nc->info_str), - "model=3D%s,macaddr=3D%02x:%02x:%02x:%02x:%02x:%02x", - nc->model, - macaddr[0], macaddr[1], macaddr[2], - macaddr[3], macaddr[4], macaddr[5]); + g_free(nc->info_str); + nc->info_str =3D g_strdup_printf( + "model=3D%s,macaddr=3D%02x:%02x:%02x:%02x:%02x:%02x", + nc->model, + macaddr[0], macaddr[1], macaddr[2], + macaddr[3], macaddr[4], macaddr[5]); } =20 static int mac_table[256] =3D {0}; @@ -351,6 +352,7 @@ static void qemu_free_net_client(NetClientState *nc) } g_free(nc->name); g_free(nc->model); + g_free(nc->info_str); qapi_free_NetdevInfo(nc->stored_config); if (nc->destructor) { nc->destructor(nc); @@ -1197,7 +1199,7 @@ void print_net_client(Monitor *mon, NetClientState *n= c) 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); + nc->info_str ? nc->info_str : ""); if (!QTAILQ_EMPTY(&nc->filters)) { monitor_printf(mon, "filters:\n"); } diff --git a/net/slirp.c b/net/slirp.c index 6ab348b943..bfa07e3432 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -664,9 +664,8 @@ static int net_slirp_init(NetClientState *peer, const c= har *model, stored->tftp_server_name =3D g_strdup(tftp_server_name); } =20 - snprintf(nc->info_str, sizeof(nc->info_str), - "net=3D%s,restrict=3D%s", inet_ntoa(net), - restricted ? "on" : "off"); + nc->info_str =3D g_strdup_printf("net=3D%s,restrict=3D%s", inet_ntoa(n= et), + restricted ? "on" : "off"); =20 s =3D DO_UPCAST(SlirpState, nc, nc); =20 diff --git a/net/socket.c b/net/socket.c index 1614523b82..98172347d7 100644 --- a/net/socket.c +++ b/net/socket.c @@ -180,7 +180,8 @@ static void net_socket_send(void *opaque) s->fd =3D -1; net_socket_rs_init(&s->rs, net_socket_rs_finalize, false); s->nc.link_down =3D true; - memset(s->nc.info_str, 0, sizeof(s->nc.info_str)); + g_free(s->nc.info_str); + s->nc.info_str =3D g_new0(char, 1); =20 return; } @@ -400,16 +401,16 @@ static NetSocketState *net_socket_fd_init_dgram(NetCl= ientState *peer, stored->mcast =3D g_strdup(mcast); =20 s->dgram_dst =3D saddr; - snprintf(nc->info_str, sizeof(nc->info_str), - "socket: fd=3D%d (cloned mcast=3D%s:%d)", - fd, inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port)); + nc->info_str =3D g_strdup_printf("socket: fd=3D%d (cloned mcast=3D= %s:%d)", + fd, inet_ntoa(saddr.sin_addr), + ntohs(saddr.sin_port)); } else { if (sa_type =3D=3D SOCKET_ADDRESS_TYPE_UNIX) { s->dgram_dst.sin_family =3D AF_UNIX; } =20 - snprintf(nc->info_str, sizeof(nc->info_str), - "socket: fd=3D%d %s", fd, SocketAddressType_str(sa_type)); + nc->info_str =3D g_strdup_printf("socket: fd=3D%d %s", + fd, SocketAddressType_str(sa_type)); } =20 return s; @@ -444,7 +445,7 @@ static NetSocketState *net_socket_fd_init_stream(NetCli= entState *peer, =20 nc =3D qemu_new_net_client(&net_socket_info, peer, model, name); =20 - snprintf(nc->info_str, sizeof(nc->info_str), "socket: fd=3D%d", fd); + nc->info_str =3D g_strdup_printf("socket: fd=3D%d", fd); =20 s =3D DO_UPCAST(NetSocketState, nc, nc); =20 @@ -528,9 +529,10 @@ static void net_socket_accept(void *opaque) stored->has_fd =3D true; stored->fd =3D g_strdup_printf("%d", fd); =20 - snprintf(s->nc.info_str, sizeof(s->nc.info_str), - "socket: connection from %s:%d", - inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port)); + g_free(s->nc.info_str); + s->nc.info_str =3D g_strdup_printf("socket: connection from %s:%d", + inet_ntoa(saddr.sin_addr), + ntohs(saddr.sin_port)); } =20 static int net_socket_listen_init(NetClientState *peer, @@ -645,9 +647,10 @@ static int net_socket_connect_init(NetClientState *pee= r, stored->has_connect =3D true; stored->connect =3D g_strdup(host_str); =20 - snprintf(s->nc.info_str, sizeof(s->nc.info_str), - "socket: connect to %s:%d", - inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port)); + g_free(s->nc.info_str); + s->nc.info_str =3D g_strdup_printf("socket: connect to %s:%d", + inet_ntoa(saddr.sin_addr), + ntohs(saddr.sin_port)); return 0; } =20 @@ -704,9 +707,10 @@ static int net_socket_mcast_init(NetClientState *peer, stored->localaddr =3D g_strdup(localaddr_str); } =20 - snprintf(s->nc.info_str, sizeof(s->nc.info_str), - "socket: mcast=3D%s:%d", - inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port)); + g_free(s->nc.info_str); + s->nc.info_str =3D g_strdup_printf("socket: mcast=3D%s:%d", + inet_ntoa(saddr.sin_addr), + ntohs(saddr.sin_port)); return 0; =20 } @@ -769,9 +773,10 @@ static int net_socket_udp_init(NetClientState *peer, stored->has_udp =3D true; stored->udp =3D g_strdup(rhost); =20 - snprintf(s->nc.info_str, sizeof(s->nc.info_str), - "socket: udp=3D%s:%d", - inet_ntoa(raddr.sin_addr), ntohs(raddr.sin_port)); + g_free(s->nc.info_str); + s->nc.info_str =3D g_strdup_printf("socket: udp=3D%s:%d", + inet_ntoa(raddr.sin_addr), + ntohs(raddr.sin_port)); return 0; } =20 diff --git a/net/tap-win32.c b/net/tap-win32.c index b60933bd1a..0888db8cce 100644 --- a/net/tap-win32.c +++ b/net/tap-win32.c @@ -787,8 +787,7 @@ static int tap_win32_init(NetClientState *peer, const c= har *model, stored->has_ifname =3D true; stored->ifname =3D g_strdup(ifname); =20 - snprintf(s->nc.info_str, sizeof(s->nc.info_str), - "tap: ifname=3D%s", ifname); + s->nc.info_str =3D g_strdup_printf("tap: ifname=3D%s", ifname); =20 s->handle =3D handle; =20 diff --git a/net/tap.c b/net/tap.c index 8041245ba7..f864f434b2 100644 --- a/net/tap.c +++ b/net/tap.c @@ -625,8 +625,7 @@ int net_init_bridge(const Netdev *netdev, const char *n= ame, stored->helper =3D g_strdup(helper); } =20 - snprintf(s->nc.info_str, sizeof(s->nc.info_str), "helper=3D%s,br=3D%s"= , helper, - br); + s->nc.info_str =3D g_strdup_printf("helper=3D%s,br=3D%s", helper, br); =20 return 0; } @@ -714,7 +713,7 @@ static void net_init_tap_one(const NetdevTapOptions *ta= p, NetClientState *peer, g_free(tmp_s); } =20 - snprintf(s->nc.info_str, sizeof(s->nc.info_str), "fd=3D%d", fd); + s->nc.info_str =3D g_strdup_printf("fd=3D%d", fd); } else if (tap->has_helper) { if (!stored->has_helper) { stored->has_helper =3D true; @@ -727,8 +726,7 @@ static void net_init_tap_one(const NetdevTapOptions *ta= p, NetClientState *peer, g_strdup(DEFAULT_BRIDGE_INTERFACE); } =20 - snprintf(s->nc.info_str, sizeof(s->nc.info_str), "helper=3D%s", - tap->helper); + s->nc.info_str =3D g_strdup_printf("helper=3D%s", tap->helper); } else { if (ifname && !stored->has_ifname) { stored->has_ifname =3D true; @@ -745,9 +743,8 @@ static void net_init_tap_one(const NetdevTapOptions *ta= p, NetClientState *peer, stored->downscript =3D g_strdup(downscript); } =20 - snprintf(s->nc.info_str, sizeof(s->nc.info_str), - "ifname=3D%s,script=3D%s,downscript=3D%s", ifname, script, - downscript); + s->nc.info_str =3D g_strdup_printf("ifname=3D%s,script=3D%s,downsc= ript=3D%s", + ifname, script, downscript); =20 if (strcmp(downscript, "no") !=3D 0) { snprintf(s->down_script, sizeof(s->down_script), "%s", downscr= ipt); diff --git a/net/vde.c b/net/vde.c index b0b8800571..67de6eb0c5 100644 --- a/net/vde.c +++ b/net/vde.c @@ -100,8 +100,7 @@ static int net_vde_init(NetClientState *peer, const cha= r *model, =20 nc =3D qemu_new_net_client(&net_vde_info, peer, model, name); =20 - snprintf(nc->info_str, sizeof(nc->info_str), "sock=3D%s,fd=3D%d", - sock, vde_datafd(vde)); + nc->info_str =3D g_strdup_printf("sock=3D%s,fd=3D%d", sock, vde_datafd= (vde)); =20 s =3D DO_UPCAST(VDEState, nc, nc); =20 diff --git a/net/vhost-user.c b/net/vhost-user.c index 5b7056be25..49c9a740c2 100644 --- a/net/vhost-user.c +++ b/net/vhost-user.c @@ -327,8 +327,7 @@ static int net_vhost_user_init(NetClientState *peer, co= nst char *device, user =3D g_new0(struct VhostUserState, 1); for (i =3D 0; i < queues; i++) { nc =3D qemu_new_net_client(&net_vhost_user_info, peer, device, nam= e); - snprintf(nc->info_str, sizeof(nc->info_str), "vhost-user%d to %s", - i, chr->label); + nc->info_str =3D g_strdup_printf("vhost-user%d to %s", i, chr->lab= el); nc->queue_index =3D i; if (!nc0) { nc0 =3D nc; diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 8c27ea0142..423d71770d 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -200,7 +200,7 @@ static int net_vhost_vdpa_init(NetClientState *peer, co= nst char *device, stored->has_queues =3D true; stored->queues =3D 1; /* TODO: change when support multiqueue */ =20 - snprintf(nc->info_str, sizeof(nc->info_str), TYPE_VHOST_VDPA); + nc->info_str =3D g_strdup_printf(TYPE_VHOST_VDPA); nc->queue_index =3D 0; s =3D DO_UPCAST(VhostVDPAState, nc, nc); vdpa_device_fd =3D qemu_open_old(vhostdev, O_RDWR); --=20 2.25.1 From nobody Sat Apr 27 18:17:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1614765585; cv=none; d=zohomail.com; s=zohoarc; b=niBzG3xoXb82pZ4UhhWsr2N2Q45VwlZbOw0bzapKmDs6D2ZJsPLuWi8a34/9V9MWTy73VI6XYpE+2G1SOjFtu61Uo3wr0XNhwTlEcVvOajX/pfqzQofD07/GOLbST5FKPLseiNlZKZK8dEG5HwxauvSRUrybFHYjrDv7MyrfWwk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614765585; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3xaewMFazOtEOhmAX9L2qiolW885HNMJSqIVvauR6mA=; b=FM0kYqKksKWqGKUFnwr3oDJhPfjLT/VLVe2Y65JXO6zsyVZqUyvX8KP6+tKLAhe4HFgy4aI+QCebF0DPoE6ODe5jOtUVo6GY3HYYp3Xm1ewUwcKFvMgoti73CSe33/u4R6VLS57D9r61gy2R3UnArqcbdavQm6rOwQsYVvCKlsY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1614765585190368.49221089110017; Wed, 3 Mar 2021 01:59:45 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.92802.174942 (Exim 4.92) (envelope-from ) id 1lHOHz-0001TK-H9; Wed, 03 Mar 2021 09:59:31 +0000 Received: by outflank-mailman (output) from mailman id 92802.174942; Wed, 03 Mar 2021 09:59:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lHOHz-0001TA-Cl; Wed, 03 Mar 2021 09:59:31 +0000 Received: by outflank-mailman (input) for mailman id 92802; Wed, 03 Mar 2021 09:59:29 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lHOHx-0001R5-G0 for xen-devel@lists.xenproject.org; Wed, 03 Mar 2021 09:59:29 +0000 Received: from forwardcorp1j.mail.yandex.net (unknown [5.45.199.163]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 2f29e6d3-31d5-43d7-832c-8ea62129d81e; Wed, 03 Mar 2021 09:59:26 +0000 (UTC) Received: from vla1-fdfb804fb3f3.qloud-c.yandex.net (vla1-fdfb804fb3f3.qloud-c.yandex.net [IPv6:2a02:6b8:c0d:3199:0:640:fdfb:804f]) by forwardcorp1j.mail.yandex.net (Yandex) with ESMTP id A151B2E1332; Wed, 3 Mar 2021 12:59:25 +0300 (MSK) Received: from vla5-d6d5ce7a4718.qloud-c.yandex.net (vla5-d6d5ce7a4718.qloud-c.yandex.net [2a02:6b8:c18:341e:0:640:d6d5:ce7a]) by vla1-fdfb804fb3f3.qloud-c.yandex.net (mxbackcorp/Yandex) with ESMTP id GQMvhqpKQa-xPx0b0C5; Wed, 03 Mar 2021 12:59:25 +0300 Received: from dynamic-red3.dhcp.yndx.net (dynamic-red3.dhcp.yndx.net [2a02:6b8:0:107:880d:3c89:fcd8:ca75]) by vla5-d6d5ce7a4718.qloud-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id w0BjtEeJGw-xPnKGPHs; Wed, 03 Mar 2021 12:59:25 +0300 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client certificate not present) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Inumbo-ID: 2f29e6d3-31d5-43d7-832c-8ea62129d81e Precedence: bulk DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1614765565; bh=3xaewMFazOtEOhmAX9L2qiolW885HNMJSqIVvauR6mA=; h=In-Reply-To:Message-Id:References:Date:Subject:To:From:Cc; b=okXjIIdLuDRC0sj05f2wTTjT8cJk8tnMOgU5p0ti7aIkcP0nOlOqR6TVKP+5RyM9X L2v22GPHEObingBB1phSBHzQB1BD7iaplNBHszV/DHZheVwHgNdKSohOCyo+eVEjCU TMrOqZ0qZR6LDPZqODM0l76iY5Dl7dGuSJMV/nlo= Authentication-Results: vla1-fdfb804fb3f3.qloud-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Alexey Kirillov To: Jason Wang , Markus Armbruster , Thomas Huth , Eric Blake Cc: Laurent Vivier , Samuel Thibault , "Michael S. Tsirkin" , Michael Roth , Paolo Bonzini , Luigi Rizzo , Giuseppe Lettieri , Vincenzo Maffione , Stefan Weil , Stefano Stabellini , Anthony Perard , Paul Durrant , xen-devel@lists.xenproject.org, qemu-devel@nongnu.org, yc-core@yandex-team.ru Subject: [PATCH v7 4/5] hmp: Use QAPI NetdevInfo in hmp_info_network Date: Wed, 3 Mar 2021 12:59:09 +0300 Message-Id: <20210303095910.78277-5-lekiravi@yandex-team.ru> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210303095910.78277-1-lekiravi@yandex-team.ru> References: <20210303095910.78277-1-lekiravi@yandex-team.ru> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @yandex-team.ru) Content-Type: text/plain; charset="utf-8" Replace usage of legacy field info_str of NetClientState for backend network devices with QAPI NetdevInfo stored_config that already used in QMP query-netdev. This change increases the detail of the "info network" output and takes a more general approach to composing the output. NIC and hubports still use legacy info_str field. Signed-off-by: Alexey Kirillov --- include/qapi/hmp-output-visitor.h | 30 +++++ net/net.c | 31 ++++- qapi/hmp-output-visitor.c | 193 ++++++++++++++++++++++++++++++ qapi/meson.build | 1 + 4 files changed, 254 insertions(+), 1 deletion(-) create mode 100644 include/qapi/hmp-output-visitor.h create mode 100644 qapi/hmp-output-visitor.c diff --git a/include/qapi/hmp-output-visitor.h b/include/qapi/hmp-output-vi= sitor.h new file mode 100644 index 0000000000..541e4002e3 --- /dev/null +++ b/include/qapi/hmp-output-visitor.h @@ -0,0 +1,30 @@ +/* + * HMP string output Visitor + * + * Copyright Yandex N.V., 2021 + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + * + */ + +#ifndef HMP_OUTPUT_VISITOR_H +#define HMP_OUTPUT_VISITOR_H + +#include "qapi/visitor.h" + +typedef struct HMPOutputVisitor HMPOutputVisitor; + +/** + * Create a HMP string output visitor for @obj + * + * Flattens dicts/structures, only shows arrays borders. + * + * Errors are not expected to happen. + * + * The caller is responsible for freeing the visitor with + * visit_free(). + */ +Visitor *hmp_output_visitor_new(char **result); + +#endif diff --git a/net/net.c b/net/net.c index 88d70d0e4d..e186b44e9a 100644 --- a/net/net.c +++ b/net/net.c @@ -54,6 +54,7 @@ #include "sysemu/sysemu.h" #include "net/filter.h" #include "qapi/string-output-visitor.h" +#include "qapi/hmp-output-visitor.h" =20 /* Net bridge is currently not supported for W32. */ #if !defined(_WIN32) @@ -1192,14 +1193,42 @@ static void netfilter_print_info(Monitor *mon, NetF= ilterState *nf) monitor_printf(mon, "\n"); } =20 +static char *generate_info_str(NetClientState *nc) +{ + NetdevInfo *ni =3D nc->stored_config; + char *ret_out =3D NULL; + Visitor *v; + + /* Use legacy field info_str for NIC and hubports */ + if ((nc->info->type =3D=3D NET_CLIENT_DRIVER_NIC) || + (nc->info->type =3D=3D NET_CLIENT_DRIVER_HUBPORT)) { + return g_strdup(nc->info_str ? nc->info_str : ""); + } + + if (!ni) { + return g_malloc0(1); + } + + v =3D hmp_output_visitor_new(&ret_out); + if (visit_type_NetdevInfo(v, "", &ni, NULL)) { + visit_complete(v, &ret_out); + } + visit_free(v); + + return ret_out; +} + void print_net_client(Monitor *mon, NetClientState *nc) { NetFilterState *nf; + char *info_str =3D generate_info_str(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 ? nc->info_str : ""); + info_str); + g_free(info_str); + if (!QTAILQ_EMPTY(&nc->filters)) { monitor_printf(mon, "filters:\n"); } diff --git a/qapi/hmp-output-visitor.c b/qapi/hmp-output-visitor.c new file mode 100644 index 0000000000..8036605f97 --- /dev/null +++ b/qapi/hmp-output-visitor.c @@ -0,0 +1,193 @@ +/* + * HMP string output Visitor + * + * Copyright Yandex N.V., 2021 + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + * + */ + +#include "qemu/osdep.h" +#include "qemu/cutils.h" +#include "qapi/hmp-output-visitor.h" +#include "qapi/visitor-impl.h" + +struct HMPOutputVisitor { + Visitor visitor; + char **result; + GString *buffer; + bool is_continue; +}; + +static HMPOutputVisitor *to_hov(Visitor *v) +{ + return container_of(v, HMPOutputVisitor, visitor); +} + +static void hmp_output_append_formatted(Visitor *v, const char *fmt, ...) +{ + HMPOutputVisitor *ov =3D to_hov(v); + va_list args; + + if (ov->is_continue) { + g_string_append(ov->buffer, ","); + } else { + ov->is_continue =3D true; + } + + va_start(args, fmt); + g_string_append_vprintf(ov->buffer, fmt, args); + va_end(args); +} + +static void hmp_output_skip_comma(Visitor *v) +{ + HMPOutputVisitor *ov =3D to_hov(v); + + ov->is_continue =3D false; +} + +static bool hmp_output_start_struct(Visitor *v, const char *name, + void **obj, size_t unused, Error **err= p) +{ + return true; +} + +static void hmp_output_end_struct(Visitor *v, void **obj) {} + +static bool hmp_output_start_list(Visitor *v, const char *name, + GenericList **listp, size_t size, + Error **errp) +{ + hmp_output_append_formatted(v, "%s=3D[", name); + /* First element in array without comma before it */ + hmp_output_skip_comma(v); + + return true; +} + +static GenericList *hmp_output_next_list(Visitor *v, GenericList *tail, + size_t size) +{ + return tail->next; +} + +static void hmp_output_end_list(Visitor *v, void **obj) +{ + /* Don't need comma after last array element */ + hmp_output_skip_comma(v); + hmp_output_append_formatted(v, "]"); +} + +static bool hmp_output_type_int64(Visitor *v, const char *name, + int64_t *obj, Error **errp) +{ + hmp_output_append_formatted(v, "%s=3D%" PRId64, name, *obj); + + return true; +} + +static bool hmp_output_type_uint64(Visitor *v, const char *name, + uint64_t *obj, Error **errp) +{ + hmp_output_append_formatted(v, "%s=3D%" PRIu64, name, *obj); + + return true; +} + +static bool hmp_output_type_bool(Visitor *v, const char *name, bool *obj, + Error **errp) +{ + hmp_output_append_formatted(v, "%s=3D%s", name, *obj ? "true" : "false= "); + + return true; +} + +static bool hmp_output_type_str(Visitor *v, const char *name, char **obj, + Error **errp) +{ + /* Skip already printed or unused fields */ + if (!*obj || g_str_equal(name, "id") || g_str_equal(name, "type")) { + return true; + } + + /* Do not print stub name for StringList elements */ + if (g_str_equal(name, "str")) { + hmp_output_append_formatted(v, "%s", *obj); + } else { + hmp_output_append_formatted(v, "%s=3D%s", name, *obj); + } + + return true; +} + +static bool hmp_output_type_number(Visitor *v, const char *name, + double *obj, Error **errp) +{ + hmp_output_append_formatted(v, "%s=3D%.17g", name, *obj); + + return true; +} + +/* TODO: remove this function? */ +static bool hmp_output_type_any(Visitor *v, const char *name, + QObject **obj, Error **errp) +{ + return true; +} + +static bool hmp_output_type_null(Visitor *v, const char *name, + QNull **obj, Error **errp) +{ + hmp_output_append_formatted(v, "%s=3DNULL", name); + + return true; +} + +static void hmp_output_complete(Visitor *v, void *opaque) +{ + HMPOutputVisitor *ov =3D to_hov(v); + + *ov->result =3D g_string_free(ov->buffer, false); + ov->buffer =3D NULL; +} + +static void hmp_output_free(Visitor *v) +{ + HMPOutputVisitor *ov =3D to_hov(v); + + if (ov->buffer) { + g_string_free(ov->buffer, true); + } + g_free(v); +} + +Visitor *hmp_output_visitor_new(char **result) +{ + HMPOutputVisitor *v; + + v =3D g_malloc0(sizeof(*v)); + + v->visitor.type =3D VISITOR_OUTPUT; + v->visitor.start_struct =3D hmp_output_start_struct; + v->visitor.end_struct =3D hmp_output_end_struct; + v->visitor.start_list =3D hmp_output_start_list; + v->visitor.next_list =3D hmp_output_next_list; + v->visitor.end_list =3D hmp_output_end_list; + v->visitor.type_int64 =3D hmp_output_type_int64; + v->visitor.type_uint64 =3D hmp_output_type_uint64; + v->visitor.type_bool =3D hmp_output_type_bool; + v->visitor.type_str =3D hmp_output_type_str; + v->visitor.type_number =3D hmp_output_type_number; + v->visitor.type_any =3D hmp_output_type_any; + v->visitor.type_null =3D hmp_output_type_null; + v->visitor.complete =3D hmp_output_complete; + v->visitor.free =3D hmp_output_free; + + v->result =3D result; + v->buffer =3D g_string_new(""); + v->is_continue =3D false; + + return &v->visitor; +} diff --git a/qapi/meson.build b/qapi/meson.build index 0652569bc4..94effbc052 100644 --- a/qapi/meson.build +++ b/qapi/meson.build @@ -8,6 +8,7 @@ util_ss.add(files( 'qobject-output-visitor.c', 'string-input-visitor.c', 'string-output-visitor.c', + 'hmp-output-visitor.c', )) if have_system or have_tools util_ss.add(files( --=20 2.25.1 From nobody Sat Apr 27 18:17:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1614765601; cv=none; d=zohomail.com; s=zohoarc; b=UBfQ9ot5AaFOIAy7wslHcbAVmUCjO36iOEL1nfp8mF74adYo2PP8FxlZOZKPV80/5tGC+lFHuQ3Y1PC+slZlsuQamP4NHOT4GGXWMryOAXw76mv4qN5tcKNWA7hz+kfNQcgOKTDu4DiPq3EwEpvnN9tvMpiNvyjpaXN48Px4SXo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614765601; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=n9oFPL9OFWeJlaeULAx/nFzDl5X6l0o+RbDsoPiDwA8=; b=cwtWpYMkgUPA6RSZDTPl8SAY1AiaY0jL1SWMr6Vd146jtM/Qrlpkk7jMnR+R0dPoeQU0yCa7Nix+WHRJduJrVNb+vmyJl4+T0MJu4kkmfyWaGyDQVfd8Y3sYa5+88IZOQLb9q6SljLOHJQUieuVq0qCEocGmlyMxdRf17fIRfUY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1614765601141341.09728070153994; Wed, 3 Mar 2021 02:00:01 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.92807.174978 (Exim 4.92) (envelope-from ) id 1lHOID-0001it-It; Wed, 03 Mar 2021 09:59:45 +0000 Received: by outflank-mailman (output) from mailman id 92807.174978; Wed, 03 Mar 2021 09:59:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lHOID-0001ik-El; Wed, 03 Mar 2021 09:59:45 +0000 Received: by outflank-mailman (input) for mailman id 92807; Wed, 03 Mar 2021 09:59:44 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lHOIC-0001PK-D0 for xen-devel@lists.xenproject.org; Wed, 03 Mar 2021 09:59:44 +0000 Received: from forwardcorp1p.mail.yandex.net (unknown [2a02:6b8:0:1472:2741:0:8b6:217]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 327e15ac-ad34-4215-b7df-9175459da989; Wed, 03 Mar 2021 09:59:28 +0000 (UTC) Received: from vla1-fdfb804fb3f3.qloud-c.yandex.net (vla1-fdfb804fb3f3.qloud-c.yandex.net [IPv6:2a02:6b8:c0d:3199:0:640:fdfb:804f]) by forwardcorp1p.mail.yandex.net (Yandex) with ESMTP id 9C0592E14C6; Wed, 3 Mar 2021 12:59:26 +0300 (MSK) Received: from vla5-d6d5ce7a4718.qloud-c.yandex.net (vla5-d6d5ce7a4718.qloud-c.yandex.net [2a02:6b8:c18:341e:0:640:d6d5:ce7a]) by vla1-fdfb804fb3f3.qloud-c.yandex.net (mxbackcorp/Yandex) with ESMTP id 75vXZVylHd-xQxmaOHu; Wed, 03 Mar 2021 12:59:26 +0300 Received: from dynamic-red3.dhcp.yndx.net (dynamic-red3.dhcp.yndx.net [2a02:6b8:0:107:880d:3c89:fcd8:ca75]) by vla5-d6d5ce7a4718.qloud-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id w0BjtEeJGw-xQnKju6j; Wed, 03 Mar 2021 12:59:26 +0300 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client certificate not present) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Inumbo-ID: 327e15ac-ad34-4215-b7df-9175459da989 Precedence: bulk DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1614765566; bh=n9oFPL9OFWeJlaeULAx/nFzDl5X6l0o+RbDsoPiDwA8=; h=In-Reply-To:Message-Id:References:Date:Subject:To:From:Cc; b=UAUNLgnZriZKGRK85M7zFCyv9d4AAuwbFhNOc6ovPv/2y1bLP6O3Je+7lGyLvs4gW CN46OFG91U3TkAiFAVK+jJCU/55Z4GGL2xvkyY8npnRIDDS/qnW7x8xm73ZgwBhtPo GuwkGH/zjHVyvFLRd604KCe6CnHJY7wk2bKiN0cY= Authentication-Results: vla1-fdfb804fb3f3.qloud-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Alexey Kirillov To: Jason Wang , Markus Armbruster , Thomas Huth , Eric Blake Cc: Laurent Vivier , Samuel Thibault , "Michael S. Tsirkin" , Michael Roth , Paolo Bonzini , Luigi Rizzo , Giuseppe Lettieri , Vincenzo Maffione , Stefan Weil , Stefano Stabellini , Anthony Perard , Paul Durrant , xen-devel@lists.xenproject.org, qemu-devel@nongnu.org, yc-core@yandex-team.ru Subject: [PATCH v7 5/5] net: Do not fill legacy info_str for backends Date: Wed, 3 Mar 2021 12:59:10 +0300 Message-Id: <20210303095910.78277-6-lekiravi@yandex-team.ru> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210303095910.78277-1-lekiravi@yandex-team.ru> References: <20210303095910.78277-1-lekiravi@yandex-team.ru> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @yandex-team.ru) Content-Type: text/plain; charset="utf-8" As we use QAPI NetClientState->stored_config to store and get information about backend network devices, we can drop fill of legacy field info_str for them. We still use info_str field for NIC and hubports, so we can not completely remove it. Signed-off-by: Alexey Kirillov --- net/l2tpv3.c | 2 -- net/slirp.c | 3 --- net/socket.c | 28 ---------------------------- net/tap-win32.c | 2 -- net/tap.c | 9 --------- net/vde.c | 2 -- net/vhost-user.c | 1 - net/vhost-vdpa.c | 1 - 8 files changed, 48 deletions(-) diff --git a/net/l2tpv3.c b/net/l2tpv3.c index 96611cb4af..b7e1d84674 100644 --- a/net/l2tpv3.c +++ b/net/l2tpv3.c @@ -729,8 +729,6 @@ int net_init_l2tpv3(const Netdev *netdev, =20 QAPI_CLONE_MEMBERS(NetdevL2TPv3Options, &nc->stored_config->u.l2tpv3, l2tpv3); - - s->nc.info_str =3D g_strdup_printf("l2tpv3: connected"); return 0; outerr: qemu_del_net_client(nc); diff --git a/net/slirp.c b/net/slirp.c index bfa07e3432..9454a673d6 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -664,9 +664,6 @@ static int net_slirp_init(NetClientState *peer, const c= har *model, stored->tftp_server_name =3D g_strdup(tftp_server_name); } =20 - nc->info_str =3D g_strdup_printf("net=3D%s,restrict=3D%s", inet_ntoa(n= et), - restricted ? "on" : "off"); - s =3D DO_UPCAST(SlirpState, nc, nc); =20 s->slirp =3D slirp_init(restricted, ipv4, net, mask, host, diff --git a/net/socket.c b/net/socket.c index 98172347d7..c0de10c0c0 100644 --- a/net/socket.c +++ b/net/socket.c @@ -180,8 +180,6 @@ static void net_socket_send(void *opaque) s->fd =3D -1; net_socket_rs_init(&s->rs, net_socket_rs_finalize, false); s->nc.link_down =3D true; - g_free(s->nc.info_str); - s->nc.info_str =3D g_new0(char, 1); =20 return; } @@ -401,16 +399,10 @@ static NetSocketState *net_socket_fd_init_dgram(NetCl= ientState *peer, stored->mcast =3D g_strdup(mcast); =20 s->dgram_dst =3D saddr; - nc->info_str =3D g_strdup_printf("socket: fd=3D%d (cloned mcast=3D= %s:%d)", - fd, inet_ntoa(saddr.sin_addr), - ntohs(saddr.sin_port)); } else { if (sa_type =3D=3D SOCKET_ADDRESS_TYPE_UNIX) { s->dgram_dst.sin_family =3D AF_UNIX; } - - nc->info_str =3D g_strdup_printf("socket: fd=3D%d %s", - fd, SocketAddressType_str(sa_type)); } =20 return s; @@ -445,8 +437,6 @@ static NetSocketState *net_socket_fd_init_stream(NetCli= entState *peer, =20 nc =3D qemu_new_net_client(&net_socket_info, peer, model, name); =20 - nc->info_str =3D g_strdup_printf("socket: fd=3D%d", fd); - s =3D DO_UPCAST(NetSocketState, nc, nc); =20 s->fd =3D fd; @@ -528,11 +518,6 @@ static void net_socket_accept(void *opaque) =20 stored->has_fd =3D true; stored->fd =3D g_strdup_printf("%d", fd); - - g_free(s->nc.info_str); - s->nc.info_str =3D g_strdup_printf("socket: connection from %s:%d", - inet_ntoa(saddr.sin_addr), - ntohs(saddr.sin_port)); } =20 static int net_socket_listen_init(NetClientState *peer, @@ -647,10 +632,6 @@ static int net_socket_connect_init(NetClientState *pee= r, stored->has_connect =3D true; stored->connect =3D g_strdup(host_str); =20 - g_free(s->nc.info_str); - s->nc.info_str =3D g_strdup_printf("socket: connect to %s:%d", - inet_ntoa(saddr.sin_addr), - ntohs(saddr.sin_port)); return 0; } =20 @@ -707,12 +688,7 @@ static int net_socket_mcast_init(NetClientState *peer, stored->localaddr =3D g_strdup(localaddr_str); } =20 - g_free(s->nc.info_str); - s->nc.info_str =3D g_strdup_printf("socket: mcast=3D%s:%d", - inet_ntoa(saddr.sin_addr), - ntohs(saddr.sin_port)); return 0; - } =20 static int net_socket_udp_init(NetClientState *peer, @@ -773,10 +749,6 @@ static int net_socket_udp_init(NetClientState *peer, stored->has_udp =3D true; stored->udp =3D g_strdup(rhost); =20 - g_free(s->nc.info_str); - s->nc.info_str =3D g_strdup_printf("socket: udp=3D%s:%d", - inet_ntoa(raddr.sin_addr), - ntohs(raddr.sin_port)); return 0; } =20 diff --git a/net/tap-win32.c b/net/tap-win32.c index 0888db8cce..21e451107b 100644 --- a/net/tap-win32.c +++ b/net/tap-win32.c @@ -787,8 +787,6 @@ static int tap_win32_init(NetClientState *peer, const c= har *model, stored->has_ifname =3D true; stored->ifname =3D g_strdup(ifname); =20 - s->nc.info_str =3D g_strdup_printf("tap: ifname=3D%s", ifname); - s->handle =3D handle; =20 qemu_add_wait_object(s->handle->tap_semaphore, tap_win32_send, s); diff --git a/net/tap.c b/net/tap.c index f864f434b2..12a08d54fe 100644 --- a/net/tap.c +++ b/net/tap.c @@ -625,8 +625,6 @@ int net_init_bridge(const Netdev *netdev, const char *n= ame, stored->helper =3D g_strdup(helper); } =20 - s->nc.info_str =3D g_strdup_printf("helper=3D%s,br=3D%s", helper, br); - return 0; } =20 @@ -712,8 +710,6 @@ static void net_init_tap_one(const NetdevTapOptions *ta= p, NetClientState *peer, stored->fds =3D g_strdup_printf("%s:%d", stored->fds, fd); g_free(tmp_s); } - - s->nc.info_str =3D g_strdup_printf("fd=3D%d", fd); } else if (tap->has_helper) { if (!stored->has_helper) { stored->has_helper =3D true; @@ -725,8 +721,6 @@ static void net_init_tap_one(const NetdevTapOptions *ta= p, NetClientState *peer, stored->br =3D tap->has_br ? g_strdup(tap->br) : g_strdup(DEFAULT_BRIDGE_INTERFACE); } - - s->nc.info_str =3D g_strdup_printf("helper=3D%s", tap->helper); } else { if (ifname && !stored->has_ifname) { stored->has_ifname =3D true; @@ -743,9 +737,6 @@ static void net_init_tap_one(const NetdevTapOptions *ta= p, NetClientState *peer, stored->downscript =3D g_strdup(downscript); } =20 - s->nc.info_str =3D g_strdup_printf("ifname=3D%s,script=3D%s,downsc= ript=3D%s", - ifname, script, downscript); - if (strcmp(downscript, "no") !=3D 0) { snprintf(s->down_script, sizeof(s->down_script), "%s", downscr= ipt); snprintf(s->down_script_arg, sizeof(s->down_script_arg), diff --git a/net/vde.c b/net/vde.c index 67de6eb0c5..64bdb937ca 100644 --- a/net/vde.c +++ b/net/vde.c @@ -100,8 +100,6 @@ static int net_vde_init(NetClientState *peer, const cha= r *model, =20 nc =3D qemu_new_net_client(&net_vde_info, peer, model, name); =20 - nc->info_str =3D g_strdup_printf("sock=3D%s,fd=3D%d", sock, vde_datafd= (vde)); - s =3D DO_UPCAST(VDEState, nc, nc); =20 s->vde =3D vde; diff --git a/net/vhost-user.c b/net/vhost-user.c index 49c9a740c2..e443c4b2b5 100644 --- a/net/vhost-user.c +++ b/net/vhost-user.c @@ -327,7 +327,6 @@ static int net_vhost_user_init(NetClientState *peer, co= nst char *device, user =3D g_new0(struct VhostUserState, 1); for (i =3D 0; i < queues; i++) { nc =3D qemu_new_net_client(&net_vhost_user_info, peer, device, nam= e); - nc->info_str =3D g_strdup_printf("vhost-user%d to %s", i, chr->lab= el); nc->queue_index =3D i; if (!nc0) { nc0 =3D nc; diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 423d71770d..5a28bbcd7b 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -200,7 +200,6 @@ static int net_vhost_vdpa_init(NetClientState *peer, co= nst char *device, stored->has_queues =3D true; stored->queues =3D 1; /* TODO: change when support multiqueue */ =20 - nc->info_str =3D g_strdup_printf(TYPE_VHOST_VDPA); nc->queue_index =3D 0; s =3D DO_UPCAST(VhostVDPAState, nc, nc); vdpa_device_fd =3D qemu_open_old(vhostdev, O_RDWR); --=20 2.25.1