From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O0IO3-0001t7-K7 for qemu-devel@nongnu.org; Fri, 09 Apr 2010 13:52:59 -0400 Received: from [140.186.70.92] (port=48355 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O0IO1-0001sH-M0 for qemu-devel@nongnu.org; Fri, 09 Apr 2010 13:52:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O0INz-0005gb-VB for qemu-devel@nongnu.org; Fri, 09 Apr 2010 13:52:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:16179) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O0INz-0005gM-ML for qemu-devel@nongnu.org; Fri, 09 Apr 2010 13:52:55 -0400 Date: Fri, 9 Apr 2010 14:48:55 -0300 From: Luiz Capitulino Message-ID: <20100409144855.62cc7249@redhat.com> In-Reply-To: <1270757799-31891-21-git-send-email-miguel.filho@gmail.com> References: <1270757799-31891-1-git-send-email-miguel.filho@gmail.com> <1270757799-31891-21-git-send-email-miguel.filho@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] Re: [PATCH 20/22] net: tap: replace qemu_format_nic_info_str by info_dict List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Miguel Di Ciurcio Filho Cc: qemu-devel@nongnu.org, armbru@redhat.com On Thu, 8 Apr 2010 17:16:37 -0300 Miguel Di Ciurcio Filho wrote: > Signed-off-by: Miguel Di Ciurcio Filho > --- > net/tap-win32.c | 9 ++++++--- > net/tap.c | 18 +++++++++++++----- > 2 files changed, 19 insertions(+), 8 deletions(-) > > diff --git a/net/tap-win32.c b/net/tap-win32.c > index 74348da..8e0ad2d 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 > @@ -688,10 +690,11 @@ static int tap_win32_init(VLANState *vlan, const char *model, > > nc = qemu_new_net_client(&net_tap_win32_info, vlan, NULL, model, name); > > - s = DO_UPCAST(TAPState, nc, nc); > + nc->info_dict = qdict_new(); > > - snprintf(s->nc.info_str, sizeof(s->nc.info_str), > - "tap: ifname=%s", ifname); > + qdict_put(nc->info_dict, "ifname", qstring_to_str(ifname)); qstring_from_str() is better. > + > + s = DO_UPCAST(TAPState, nc, nc); > > s->handle = handle; > > diff --git a/net/tap.c b/net/tap.c > index 303d69f..8ba7eed 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 "qdict.h" > +#include "qint.h" > +#include "qstring.h" > > #include "net/tap-linux.h" > > @@ -447,18 +450,23 @@ 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); > + if (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; > + if (s->nc.info_dict == NULL) > + s->nc.info_dict = qdict_new(); > > 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, script, downscript); > - > + qdict_put(s->nc.info_dict, "ifname", qstring_from_str(ifname)); > + qdict_put(s->nc.info_dict, "script", qstring_from_str(script)); > + qdict_put(s->nc.info_dict, "downscript", qstring_from_str(downscript)); > + > 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);