From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=32815 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OEQRb-0006PB-25 for qemu-devel@nongnu.org; Tue, 18 May 2010 13:19:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OEQHF-0005TD-9t for qemu-devel@nongnu.org; Tue, 18 May 2010 13:08:25 -0400 Received: from mail-gy0-f173.google.com ([209.85.160.173]:33501) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OEQHD-0005SX-Nm for qemu-devel@nongnu.org; Tue, 18 May 2010 13:08:21 -0400 Received: by gyd5 with SMTP id 5so2973216gyd.4 for ; Tue, 18 May 2010 10:08:19 -0700 (PDT) From: Miguel Di Ciurcio Filho Date: Tue, 18 May 2010 14:07:44 -0300 Message-Id: <1274202469-9332-6-git-send-email-miguel.filho@gmail.com> In-Reply-To: <1274202469-9332-1-git-send-email-miguel.filho@gmail.com> References: <1274202469-9332-1-git-send-email-miguel.filho@gmail.com> Subject: [Qemu-devel] [PATCH v4 05/10] net: tap/tap-win32: introduce info_dict List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: armbru@redhat.com, lcapitulino@redhat.com Signed-off-by: Miguel Di Ciurcio Filho --- net/tap-win32.c | 9 ++++++++- net/tap.c | 18 +++++++++++++++++- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/net/tap-win32.c b/net/tap-win32.c index 74348da..54c6725 100644 --- a/net/tap-win32.c +++ b/net/tap-win32.c @@ -32,6 +32,8 @@ #include "net.h" #include "sysemu.h" #include "qemu-error.h" +#include "qdict.h" +#include "qstring.h" #include #include #include @@ -691,7 +693,12 @@ static int tap_win32_init(VLANState *vlan, const char *model, s = DO_UPCAST(TAPState, nc, nc); snprintf(s->nc.info_str, sizeof(s->nc.info_str), - "tap: ifname=%s", ifname); + "tap: ifname=%s", ifname); + + nc->info_dict = qdict_new() + + qdict_put(nc->info_dict, "ifname", qstring_from_str(ifname)); + qdict_put(nc->info_dict, "model", qstring_from_str("tap")); s->handle = handle; diff --git a/net/tap.c b/net/tap.c index 0147dab..d71f312 100644 --- a/net/tap.c +++ b/net/tap.c @@ -39,6 +39,9 @@ #include "qemu-char.h" #include "qemu-common.h" #include "qemu-error.h" +#include "qjson.h" +#include "qdict.h" +#include "qint.h" #include "net/tap-linux.h" @@ -448,17 +451,30 @@ 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; + QObject *obj; ifname = qemu_opt_get(opts, "ifname"); script = qemu_opt_get(opts, "script"); downscript = qemu_opt_get(opts, "downscript"); snprintf(s->nc.info_str, sizeof(s->nc.info_str), - "ifname=%s,script=%s,downscript=%s", + "ifname=%s,script=%s,downscript=%s", ifname, script, downscript); + obj = qobject_from_jsonf("{ 'model': 'tap', 'ifname': %s, \ + 'script': %s,'downscript': %s }", + ifname, script, downscript); + + assert(s->nc.info_dict == NULL); + s->nc.info_dict = qobject_to_qdict(obj); + if (strcmp(downscript, "no") != 0) { snprintf(s->down_script, sizeof(s->down_script), "%s", downscript); snprintf(s->down_script_arg, sizeof(s->down_script_arg), "%s", ifname); -- 1.7.1