From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O5Q5Q-0001Fl-M4 for qemu-devel@nongnu.org; Fri, 23 Apr 2010 17:06:56 -0400 Received: from [140.186.70.92] (port=42864 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O5Q5P-0001FS-FK for qemu-devel@nongnu.org; Fri, 23 Apr 2010 17:06:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O5Q5N-0004uP-Qk for qemu-devel@nongnu.org; Fri, 23 Apr 2010 17:06:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26204) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O5Q5N-0004uE-J6 for qemu-devel@nongnu.org; Fri, 23 Apr 2010 17:06:53 -0400 Date: Fri, 23 Apr 2010 18:06:43 -0300 From: Luiz Capitulino Message-ID: <20100423180643.0d7003cc@redhat.com> In-Reply-To: <1271340427-12579-6-git-send-email-miguel.filho@gmail.com> References: <1271340427-12579-1-git-send-email-miguel.filho@gmail.com> <1271340427-12579-6-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 v3 05/12] net: slirp: use info_dict instead of info_str 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, 15 Apr 2010 11:07:00 -0300 Miguel Di Ciurcio Filho wrote: > Signed-off-by: Miguel Di Ciurcio Filho > --- > net/slirp.c | 8 ++++++-- > 1 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/net/slirp.c b/net/slirp.c > index b41c60a..eb9d261 100644 > --- a/net/slirp.c > +++ b/net/slirp.c > @@ -32,6 +32,9 @@ > #include "monitor.h" > #include "sysemu.h" > #include "qemu_socket.h" > +#include "qdict.h" > +#include "qbool.h" > +#include "qstring.h" > #include "slirp/libslirp.h" > > static int get_str_sep(char *buf, int buf_size, const char **pp, int sep) > @@ -240,8 +243,9 @@ static int net_slirp_init(VLANState *vlan, const char *model, > > nc = qemu_new_net_client(&net_slirp_info, vlan, NULL, model, name); > > - snprintf(nc->info_str, sizeof(nc->info_str), > - "net=%s, restricted=%c", inet_ntoa(net), restricted ? 'y' : 'n'); > + nc->info_dict = qdict_new(); > + qdict_put(nc->info_dict, "net", qstring_from_str(inet_ntoa(net))); > + qdict_put(nc->info_dict, "restricted", qbool_from_int(restricted)); This is going to be freed by qemu_del_vlan_client(), right? > > s = DO_UPCAST(SlirpState, nc, nc); >