motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-02 23:33:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "net: Move NetClientState.info_str to dynamic allocations"

Browse source 
Several issues has been reported for query-netdev info
series. Consider it's late in the rc, this reverts commit
commit 59b5437eb7.

Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
Jason Wang 2021-04-02 11:03:33 +08:00
parent 603f2f7c6c
commit 56e6f594bf
11 changed files with 49 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

13
net/tap.c
View file

@ -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);