From: Jason Wang <jasowang@redhat.com>
To: qemu-devel@nongnu.org, lekiravi@yandex-team.ru
Subject: Re: [PATCH 3/5] Revert "net: Move NetClientState.info_str to dynamic allocations"
Date: Fri, 2 Apr 2021 17:00:18 +0800 [thread overview]
Message-ID: <f2a48118-879d-ce0c-40a7-2a13a55fe7a8@redhat.com> (raw)
In-Reply-To: <20210402081519.78878-4-jasowang@redhat.com>
在 2021/4/2 下午4:15, Jason Wang 写道:
> Several issues has been reported for query-netdev info
> series. Consider it's late in the rc, this reverts commitThis reverts
copy and paste error :(.
Will fix this when applying the series.
Thanks
> commit 59b5437eb732d6b103a9bc279c3482c834d1eff9.
>
> Signed-off-by: Jason Wang <jasowang@redhat.com>
> ---
> 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, 49 insertions(+), 47 deletions(-)
>
> diff --git a/hw/net/xen_nic.c b/hw/net/xen_nic.c
> index 8431808ea0..5c815b4f0c 100644
> --- a/hw/net/xen_nic.c
> +++ b/hw/net/xen_nic.c
> @@ -296,8 +296,9 @@ static int net_init(struct XenLegacyDevice *xendev)
> netdev->nic = qemu_new_nic(&net_xen_info, &netdev->conf,
> "xen", NULL, netdev);
>
> - qemu_get_queue(netdev->nic)->info_str = g_strdup_printf(
> - "nic: xenbus vif macaddr=%s", netdev->mac);
> + snprintf(qemu_get_queue(netdev->nic)->info_str,
> + sizeof(qemu_get_queue(netdev->nic)->info_str),
> + "nic: xenbus vif macaddr=%s", netdev->mac);
>
> /* 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 3559f3ca19..e5ba61cf8d 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;
> + char info_str[256];
> NetdevInfo *stored_config;
> unsigned receive_disabled : 1;
> NetClientDestructor *destructor;
> diff --git a/net/l2tpv3.c b/net/l2tpv3.c
> index 96611cb4af..8aa0a3e1a0 100644
> --- a/net/l2tpv3.c
> +++ b/net/l2tpv3.c
> @@ -730,7 +730,8 @@ int net_init_l2tpv3(const Netdev *netdev,
> QAPI_CLONE_MEMBERS(NetdevL2TPv3Options,
> &nc->stored_config->u.l2tpv3, l2tpv3);
>
> - s->nc.info_str = g_strdup_printf("l2tpv3: connected");
> + snprintf(s->nc.info_str, sizeof(s->nc.info_str),
> + "l2tpv3: connected");
> return 0;
> outerr:
> qemu_del_net_client(nc);
> diff --git a/net/net.c b/net/net.c
> index 277da712eb..9a2a6ab155 100644
> --- a/net/net.c
> +++ b/net/net.c
> @@ -129,12 +129,11 @@ char *qemu_mac_strdup_printf(const uint8_t *macaddr)
>
> void qemu_format_nic_info_str(NetClientState *nc, uint8_t macaddr[6])
> {
> - g_free(nc->info_str);
> - nc->info_str = g_strdup_printf(
> - "model=%s,macaddr=%02x:%02x:%02x:%02x:%02x:%02x",
> - nc->model,
> - macaddr[0], macaddr[1], macaddr[2],
> - macaddr[3], macaddr[4], macaddr[5]);
> + snprintf(nc->info_str, sizeof(nc->info_str),
> + "model=%s,macaddr=%02x:%02x:%02x:%02x:%02x:%02x",
> + nc->model,
> + macaddr[0], macaddr[1], macaddr[2],
> + macaddr[3], macaddr[4], macaddr[5]);
> }
>
> static int mac_table[256] = {0};
> @@ -353,7 +352,6 @@ 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);
> @@ -1228,7 +1226,7 @@ void print_net_client(Monitor *mon, NetClientState *nc)
> monitor_printf(mon, "%s: index=%d,type=%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 67f0f1d925..b3b979845e 100644
> --- a/net/slirp.c
> +++ b/net/slirp.c
> @@ -674,8 +674,9 @@ static int net_slirp_init(NetClientState *peer, const char *model,
> stored->tftp_server_name = g_strdup(tftp_server_name);
> }
>
> - nc->info_str = g_strdup_printf("net=%s,restrict=%s", inet_ntoa(net),
> - restricted ? "on" : "off");
> + snprintf(nc->info_str, sizeof(nc->info_str),
> + "net=%s,restrict=%s", inet_ntoa(net),
> + restricted ? "on" : "off");
>
> s = DO_UPCAST(SlirpState, nc, nc);
>
> diff --git a/net/socket.c b/net/socket.c
> index 98172347d7..1614523b82 100644
> --- a/net/socket.c
> +++ b/net/socket.c
> @@ -180,8 +180,7 @@ static void net_socket_send(void *opaque)
> s->fd = -1;
> net_socket_rs_init(&s->rs, net_socket_rs_finalize, false);
> s->nc.link_down = true;
> - g_free(s->nc.info_str);
> - s->nc.info_str = g_new0(char, 1);
> + memset(s->nc.info_str, 0, sizeof(s->nc.info_str));
>
> return;
> }
> @@ -401,16 +400,16 @@ static NetSocketState *net_socket_fd_init_dgram(NetClientState *peer,
> stored->mcast = g_strdup(mcast);
>
> s->dgram_dst = saddr;
> - nc->info_str = g_strdup_printf("socket: fd=%d (cloned mcast=%s:%d)",
> - fd, inet_ntoa(saddr.sin_addr),
> - ntohs(saddr.sin_port));
> + snprintf(nc->info_str, sizeof(nc->info_str),
> + "socket: fd=%d (cloned mcast=%s:%d)",
> + fd, inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
> } else {
> if (sa_type == SOCKET_ADDRESS_TYPE_UNIX) {
> s->dgram_dst.sin_family = AF_UNIX;
> }
>
> - nc->info_str = g_strdup_printf("socket: fd=%d %s",
> - fd, SocketAddressType_str(sa_type));
> + snprintf(nc->info_str, sizeof(nc->info_str),
> + "socket: fd=%d %s", fd, SocketAddressType_str(sa_type));
> }
>
> return s;
> @@ -445,7 +444,7 @@ static NetSocketState *net_socket_fd_init_stream(NetClientState *peer,
>
> nc = qemu_new_net_client(&net_socket_info, peer, model, name);
>
> - nc->info_str = g_strdup_printf("socket: fd=%d", fd);
> + snprintf(nc->info_str, sizeof(nc->info_str), "socket: fd=%d", fd);
>
> s = DO_UPCAST(NetSocketState, nc, nc);
>
> @@ -529,10 +528,9 @@ static void net_socket_accept(void *opaque)
> stored->has_fd = true;
> stored->fd = g_strdup_printf("%d", fd);
>
> - g_free(s->nc.info_str);
> - s->nc.info_str = g_strdup_printf("socket: connection from %s:%d",
> - inet_ntoa(saddr.sin_addr),
> - ntohs(saddr.sin_port));
> + snprintf(s->nc.info_str, sizeof(s->nc.info_str),
> + "socket: connection from %s:%d",
> + inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
> }
>
> static int net_socket_listen_init(NetClientState *peer,
> @@ -647,10 +645,9 @@ static int net_socket_connect_init(NetClientState *peer,
> stored->has_connect = true;
> stored->connect = g_strdup(host_str);
>
> - g_free(s->nc.info_str);
> - s->nc.info_str = g_strdup_printf("socket: connect to %s:%d",
> - inet_ntoa(saddr.sin_addr),
> - ntohs(saddr.sin_port));
> + snprintf(s->nc.info_str, sizeof(s->nc.info_str),
> + "socket: connect to %s:%d",
> + inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
> return 0;
> }
>
> @@ -707,10 +704,9 @@ static int net_socket_mcast_init(NetClientState *peer,
> stored->localaddr = g_strdup(localaddr_str);
> }
>
> - g_free(s->nc.info_str);
> - s->nc.info_str = g_strdup_printf("socket: mcast=%s:%d",
> - inet_ntoa(saddr.sin_addr),
> - ntohs(saddr.sin_port));
> + snprintf(s->nc.info_str, sizeof(s->nc.info_str),
> + "socket: mcast=%s:%d",
> + inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
> return 0;
>
> }
> @@ -773,10 +769,9 @@ static int net_socket_udp_init(NetClientState *peer,
> stored->has_udp = true;
> stored->udp = g_strdup(rhost);
>
> - g_free(s->nc.info_str);
> - s->nc.info_str = g_strdup_printf("socket: udp=%s:%d",
> - inet_ntoa(raddr.sin_addr),
> - ntohs(raddr.sin_port));
> + snprintf(s->nc.info_str, sizeof(s->nc.info_str),
> + "socket: udp=%s:%d",
> + inet_ntoa(raddr.sin_addr), ntohs(raddr.sin_port));
> return 0;
> }
>
> diff --git a/net/tap-win32.c b/net/tap-win32.c
> index 959266c658..2a2ba4f527 100644
> --- a/net/tap-win32.c
> +++ b/net/tap-win32.c
> @@ -797,7 +797,8 @@ static int tap_win32_init(NetClientState *peer, const char *model,
> stored->has_ifname = true;
> stored->ifname = g_strdup(ifname);
>
> - s->nc.info_str = g_strdup_printf("tap: ifname=%s", ifname);
> + snprintf(s->nc.info_str, sizeof(s->nc.info_str),
> + "tap: ifname=%s", ifname);
>
> s->handle = handle;
>
> diff --git a/net/tap.c b/net/tap.c
> index 522ce7e487..35895192c5 100644
> --- a/net/tap.c
> +++ b/net/tap.c
> @@ -635,7 +635,8 @@ int net_init_bridge(const Netdev *netdev, const char *name,
> stored->helper = g_strdup(helper);
> }
>
> - s->nc.info_str = g_strdup_printf("helper=%s,br=%s", helper, br);
> + snprintf(s->nc.info_str, sizeof(s->nc.info_str), "helper=%s,br=%s", helper,
> + br);
>
> return 0;
> }
> @@ -723,7 +724,7 @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
> g_free(tmp_s);
> }
>
> - s->nc.info_str = g_strdup_printf("fd=%d", fd);
> + snprintf(s->nc.info_str, sizeof(s->nc.info_str), "fd=%d", fd);
> } else if (tap->has_helper) {
> if (!stored->has_helper) {
> stored->has_helper = true;
> @@ -736,7 +737,8 @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
> g_strdup(DEFAULT_BRIDGE_INTERFACE);
> }
>
> - s->nc.info_str = g_strdup_printf("helper=%s", tap->helper);
> + snprintf(s->nc.info_str, sizeof(s->nc.info_str), "helper=%s",
> + tap->helper);
> } else {
> if (ifname && !stored->has_ifname) {
> stored->has_ifname = true;
> @@ -753,8 +755,9 @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
> stored->downscript = g_strdup(downscript);
> }
>
> - s->nc.info_str = g_strdup_printf("ifname=%s,script=%s,downscript=%s",
> - ifname, script, downscript);
> + snprintf(s->nc.info_str, sizeof(s->nc.info_str),
> + "ifname=%s,script=%s,downscript=%s", ifname, script,
> + downscript);
>
> if (strcmp(downscript, "no") != 0) {
> snprintf(s->down_script, sizeof(s->down_script), "%s", downscript);
> diff --git a/net/vde.c b/net/vde.c
> index 67de6eb0c5..b0b8800571 100644
> --- a/net/vde.c
> +++ b/net/vde.c
> @@ -100,7 +100,8 @@ static int net_vde_init(NetClientState *peer, const char *model,
>
> nc = qemu_new_net_client(&net_vde_info, peer, model, name);
>
> - nc->info_str = g_strdup_printf("sock=%s,fd=%d", sock, vde_datafd(vde));
> + snprintf(nc->info_str, sizeof(nc->info_str), "sock=%s,fd=%d",
> + sock, vde_datafd(vde));
>
> s = DO_UPCAST(VDEState, nc, nc);
>
> diff --git a/net/vhost-user.c b/net/vhost-user.c
> index 49c9a740c2..5b7056be25 100644
> --- a/net/vhost-user.c
> +++ b/net/vhost-user.c
> @@ -327,7 +327,8 @@ static int net_vhost_user_init(NetClientState *peer, const char *device,
> user = g_new0(struct VhostUserState, 1);
> for (i = 0; i < queues; i++) {
> nc = qemu_new_net_client(&net_vhost_user_info, peer, device, name);
> - nc->info_str = g_strdup_printf("vhost-user%d to %s", i, chr->label);
> + snprintf(nc->info_str, sizeof(nc->info_str), "vhost-user%d to %s",
> + i, chr->label);
> nc->queue_index = i;
> if (!nc0) {
> nc0 = nc;
> diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
> index 423d71770d..8c27ea0142 100644
> --- a/net/vhost-vdpa.c
> +++ b/net/vhost-vdpa.c
> @@ -200,7 +200,7 @@ static int net_vhost_vdpa_init(NetClientState *peer, const char *device,
> stored->has_queues = true;
> stored->queues = 1; /* TODO: change when support multiqueue */
>
> - nc->info_str = g_strdup_printf(TYPE_VHOST_VDPA);
> + snprintf(nc->info_str, sizeof(nc->info_str), TYPE_VHOST_VDPA);
> nc->queue_index = 0;
> s = DO_UPCAST(VhostVDPAState, nc, nc);
> vdpa_device_fd = qemu_open_old(vhostdev, O_RDWR);
next prev parent reply other threads:[~2021-04-02 9:01 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-02 8:15 [PATCH 0/5] Revert query-netdev command for 6.0 Jason Wang
2021-04-02 8:15 ` [PATCH 1/5] Revert "net: Do not fill legacy info_str for backends" Jason Wang
2021-04-02 8:15 ` [PATCH 2/5] Revert "hmp: Use QAPI NetdevInfo in hmp_info_network" Jason Wang
2021-04-02 8:15 ` [PATCH 3/5] Revert "net: Move NetClientState.info_str to dynamic allocations" Jason Wang
2021-04-02 9:00 ` Jason Wang [this message]
2021-04-02 8:15 ` [PATCH 4/5] Revert "tests: Add tests for query-netdev command" Jason Wang
2021-04-02 8:15 ` [PATCH 5/5] Revert "qapi: net: Add " Jason Wang
2021-04-06 4:05 ` [PATCH 0/5] Revert query-netdev command for 6.0 Jason Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f2a48118-879d-ce0c-40a7-2a13a55fe7a8@redhat.com \
--to=jasowang@redhat.com \
--cc=lekiravi@yandex-team.ru \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).