From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O2Pts-0003lk-RM for qemu-devel@nongnu.org; Thu, 15 Apr 2010 10:18:37 -0400 Received: from [140.186.70.92] (port=50469 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O2Pti-0003Ny-7F for qemu-devel@nongnu.org; Thu, 15 Apr 2010 10:18:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O2PiP-0007YO-Pc for qemu-devel@nongnu.org; Thu, 15 Apr 2010 10:06:50 -0400 Received: from mail-yx0-f180.google.com ([209.85.210.180]:46679) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O2PiP-0007Vy-7H for qemu-devel@nongnu.org; Thu, 15 Apr 2010 10:06:45 -0400 Received: by mail-yx0-f180.google.com with SMTP id 10so693532yxe.18 for ; Thu, 15 Apr 2010 07:06:45 -0700 (PDT) From: Miguel Di Ciurcio Filho Date: Thu, 15 Apr 2010 11:07:00 -0300 Message-Id: <1271340427-12579-6-git-send-email-miguel.filho@gmail.com> In-Reply-To: <1271340427-12579-1-git-send-email-miguel.filho@gmail.com> References: <1271340427-12579-1-git-send-email-miguel.filho@gmail.com> Subject: [Qemu-devel] [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: qemu-devel@nongnu.org Cc: armbru@redhat.com, lcapitulino@redhat.com 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)); s = DO_UPCAST(SlirpState, nc, nc); -- 1.7.0.4