mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 18:05:37 +00:00
netfilter: print filter info associate with the netdev
When execute "info network", print filter info also. add a info_str member to NetFilterState, store specific filters info. Signed-off-by: Yang Hongyang <yanghy@cn.fujitsu.com> Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
parent
7ef7bc8586
commit
a4960f52e7
|
@ -55,6 +55,7 @@ struct NetFilterState {
|
|||
char *netdev_id;
|
||||
NetClientState *netdev;
|
||||
NetFilterDirection direction;
|
||||
char info_str[256];
|
||||
QTAILQ_ENTRY(NetFilterState) next;
|
||||
};
|
||||
|
||||
|
|
20
net/filter.c
20
net/filter.c
|
@ -15,6 +15,7 @@
|
|||
#include "net/vhost_net.h"
|
||||
#include "qom/object_interfaces.h"
|
||||
#include "qemu/iov.h"
|
||||
#include "qapi/string-output-visitor.h"
|
||||
|
||||
ssize_t qemu_netfilter_receive(NetFilterState *nf,
|
||||
NetFilterDirection direction,
|
||||
|
@ -134,6 +135,9 @@ static void netfilter_complete(UserCreatable *uc, Error **errp)
|
|||
NetFilterClass *nfc = NETFILTER_GET_CLASS(uc);
|
||||
int queues;
|
||||
Error *local_err = NULL;
|
||||
char *str, *info;
|
||||
ObjectProperty *prop;
|
||||
StringOutputVisitor *ov;
|
||||
|
||||
if (!nf->netdev_id) {
|
||||
error_setg(errp, "Parameter 'netdev' is required");
|
||||
|
@ -167,6 +171,22 @@ static void netfilter_complete(UserCreatable *uc, Error **errp)
|
|||
}
|
||||
}
|
||||
QTAILQ_INSERT_TAIL(&nf->netdev->filters, nf, next);
|
||||
|
||||
/* generate info str */
|
||||
QTAILQ_FOREACH(prop, &OBJECT(nf)->properties, node) {
|
||||
if (!strcmp(prop->name, "type")) {
|
||||
continue;
|
||||
}
|
||||
ov = string_output_visitor_new(false);
|
||||
object_property_get(OBJECT(nf), string_output_get_visitor(ov),
|
||||
prop->name, errp);
|
||||
str = string_output_get_string(ov);
|
||||
string_output_visitor_cleanup(ov);
|
||||
info = g_strdup_printf(",%s=%s", prop->name, str);
|
||||
g_strlcat(nf->info_str, info, sizeof(nf->info_str));
|
||||
g_free(str);
|
||||
g_free(info);
|
||||
}
|
||||
}
|
||||
|
||||
static void netfilter_finalize(Object *obj)
|
||||
|
|
11
net/net.c
11
net/net.c
|
@ -1179,10 +1179,21 @@ void qmp_netdev_del(const char *id, Error **errp)
|
|||
|
||||
void print_net_client(Monitor *mon, NetClientState *nc)
|
||||
{
|
||||
NetFilterState *nf;
|
||||
|
||||
monitor_printf(mon, "%s: index=%d,type=%s,%s\n", nc->name,
|
||||
nc->queue_index,
|
||||
NetClientOptionsKind_lookup[nc->info->type],
|
||||
nc->info_str);
|
||||
if (!QTAILQ_EMPTY(&nc->filters)) {
|
||||
monitor_printf(mon, "filters:\n");
|
||||
}
|
||||
QTAILQ_FOREACH(nf, &nc->filters, next) {
|
||||
monitor_printf(mon, " - %s: type=%s%s\n",
|
||||
object_get_canonical_path_component(OBJECT(nf)),
|
||||
object_get_typename(OBJECT(nf)),
|
||||
nf->info_str);
|
||||
}
|
||||
}
|
||||
|
||||
RxFilterInfoList *qmp_query_rx_filter(bool has_name, const char *name,
|
||||
|
|
Loading…
Reference in a new issue