motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-07-27 04:13:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "hmp: Use QAPI NetdevInfo in hmp_info_network"

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

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

31
net/net.c
View file

@ -55,7 +55,6 @@
#include "sysemu/sysemu.h"
#include "net/filter.h"
#include "qapi/string-output-visitor.h"
#include "qapi/hmp-output-visitor.h"
/* Net bridge is currently not supported for W32. */
#if !defined(_WIN32)
@ -1222,42 +1221,14 @@ static void netfilter_print_info(Monitor *mon, NetFilterState *nf)
monitor_printf(mon, "\n");
}
static char *generate_info_str(NetClientState *nc)
{
NetdevInfo *ni = nc->stored_config;
char *ret_out = NULL;
Visitor *v;
/* Use legacy field info_str for NIC and hubports */
if ((nc->info->type == NET_CLIENT_DRIVER_NIC) ||
(nc->info->type == NET_CLIENT_DRIVER_HUBPORT)) {
return g_strdup(nc->info_str ? nc->info_str : "");
}
if (!ni) {
return g_malloc0(1);
}
v = 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 = generate_info_str(nc);
monitor_printf(mon, "%s: index=%d,type=%s,%s\n", nc->name,
nc->queue_index,
NetClientDriver_str(nc->info->type),
info_str);
g_free(info_str);
nc->info_str ? nc->info_str : "");
if (!QTAILQ_EMPTY(&nc->filters)) {
monitor_printf(mon, "filters:\n");
}