From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nzy89-0008Hq-PJ for qemu-devel@nongnu.org; Thu, 08 Apr 2010 16:15:13 -0400 Received: from [140.186.70.92] (port=44350 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nzy86-0008EK-Kr for qemu-devel@nongnu.org; Thu, 08 Apr 2010 16:15:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Nzy84-0004CR-4P for qemu-devel@nongnu.org; Thu, 08 Apr 2010 16:15:10 -0400 Received: from mail-qy0-f188.google.com ([209.85.221.188]:37069) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Nzy83-0003y4-VZ for qemu-devel@nongnu.org; Thu, 08 Apr 2010 16:15:08 -0400 Received: by mail-qy0-f188.google.com with SMTP id 26so2709084qyk.19 for ; Thu, 08 Apr 2010 13:15:07 -0700 (PDT) From: Miguel Di Ciurcio Filho Date: Thu, 8 Apr 2010 17:16:35 -0300 Message-Id: <1270757799-31891-19-git-send-email-miguel.filho@gmail.com> In-Reply-To: <1270757799-31891-1-git-send-email-miguel.filho@gmail.com> References: <1270757799-31891-1-git-send-email-miguel.filho@gmail.com> Subject: [Qemu-devel] [PATCH 18/22] net: slirp: replace qemu_format_nic_info_str by qemu_format_nic_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/slirp.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/net/slirp.c b/net/slirp.c index b41c60a..4036b92 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -32,6 +32,8 @@ #include "monitor.h" #include "sysemu.h" #include "qemu_socket.h" +#include "qdict.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 +242,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", qstring_from_str( restricted ? "y" : "n")); s = DO_UPCAST(SlirpState, nc, nc); -- 1.7.0.3