@@ -32,6 +32,8 @@
#include "net.h"
#include "sysemu.h"
#include "qemu-error.h"
+#include "qdict.h"
+#include "qstring.h"
#include <stdio.h>
#include <windows.h>
#include <winioctl.h>
@@ -693,6 +695,11 @@ static int tap_win32_init(VLANState *vlan, const char *model,
snprintf(s->nc.info_str, sizeof(s->nc.info_str),
"tap: ifname=%s", ifname);
+ nc->info_dict = qdict_new()
+ qdict_put(nc->info_dict, "ifname", qstring_from_str(ifname));
+ qdict_put(nc->info_dict, "vhost", qbool_from_int(0));
+ qdict_put(nc->info_dict, "vnet_hdr", qbool_from_int(0));
+
s->handle = handle;
qemu_add_wait_object(s->handle->tap_semaphore, tap_win32_send, s);
@@ -39,6 +39,8 @@
#include "qemu-char.h"
#include "qemu-common.h"
#include "qemu-error.h"
+#include "qint.h"
+#include "qbool.h"
#include "net/tap-linux.h"
@@ -448,6 +450,11 @@ int net_init_tap(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan
if (qemu_opt_get(opts, "fd")) {
snprintf(s->nc.info_str, sizeof(s->nc.info_str), "fd=%d", fd);
+
+ assert(s->nc.info_dict == NULL);
+ s->nc.info_dict = qdict_new();
+ qdict_put(s->nc.info_dict, "fd", qint_from_int(fd));
+
} else {
const char *ifname, *script, *downscript;
@@ -459,12 +466,23 @@ int net_init_tap(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan
"ifname=%s,script=%s,downscript=%s",
ifname, script, downscript);
- if (strcmp(downscript, "no") != 0) {
+ assert(s->nc.info_dict == NULL);
+ s->nc.info_dict = qdict_new();
+ qdict_put(s->nc.info_dict, "ifname", qstring_from_str(ifname));
+
+ if (strcmp(downscript, "no") != 0 && downscript[0] != '\0') {
snprintf(s->down_script, sizeof(s->down_script), "%s", downscript);
snprintf(s->down_script_arg, sizeof(s->down_script_arg), "%s", ifname);
+ qdict_put(s->nc.info_dict, "downscript", qstring_from_str(downscript));
+ }
+
+ if (strcmp(script, "no") != 0 && script[0] != '\0') {
+ qdict_put(s->nc.info_dict, "script", qstring_from_str(script));
}
}
+ qdict_put(s->nc.info_dict, "vnet_hdr", qbool_from_int(s->has_vnet_hdr));
+
if (qemu_opt_get_bool(opts, "vhost", !!qemu_opt_get(opts, "vhostfd"))) {
int vhostfd, r;
if (qemu_opt_get(opts, "vhostfd")) {
@@ -473,6 +491,7 @@ int net_init_tap(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan
return -1;
}
vhostfd = r;
+ qdict_put(s->nc.info_dict, "vhostfd", qint_from_int(vhostfd));
} else {
vhostfd = -1;
}
@@ -486,6 +505,7 @@ int net_init_tap(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan
return -1;
}
+ qdict_put(s->nc.info_dict, "vhost", qbool_from_int(s->vhost_net ? 1 : 0));
return 0;
}
Signed-off-by: Miguel Di Ciurcio Filho <miguel.filho@gmail.com> --- net/tap-win32.c | 7 +++++++ net/tap.c | 22 +++++++++++++++++++++- 2 files changed, 28 insertions(+), 1 deletions(-)