From patchwork Thu Apr 8 20:16:35 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miguel Di Ciurcio Filho X-Patchwork-Id: 49762 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 09474B7D43 for ; Fri, 9 Apr 2010 06:48:17 +1000 (EST) Received: from localhost ([127.0.0.1]:57322 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nzye6-0003Q7-4e for incoming@patchwork.ozlabs.org; Thu, 08 Apr 2010 16:48:14 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=KwquCZFSxWU3vSY3pfRVg+SOL15+zWmmzVV4BnDr1BE=; b=vX7VfIYnBsoG2sF6KKtr05HMcuQtWjNq0/hqkaV07lupkjbw45Vjt8KbI/vknM0TAE vtkyFq4Yun71gYSikiuyGHKg1cvM8lqcoQyX70ZSymarq3um5HsxtdRn6KBY/nfTLl7W Lql5ghevtZJkSUL0qCbqBpEIE+uBkke5AMknM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=iHMEywxscZ4jBueMPTdl4XBf0MKSR4SEBtTe/hyt5B6u0mvgJXok9F+1WeL2ZI026F nJWGomBlTXr0+XjUavHoBoQvATFLrDAJM5Uths7Th7B6pLDzNFjVGt1rTJVtCLghs1dy ORZXDy6Hvw2fmsGDJQSvgnsMf65BJy0KODgyw= Received: by 10.229.222.82 with SMTP id if18mr960255qcb.65.1270757707753; Thu, 08 Apr 2010 13:15:07 -0700 (PDT) Received: from localhost.localdomain (quake.ic.unicamp.br [143.106.7.51]) by mx.google.com with ESMTPS id w30sm776636qce.4.2010.04.08.13.15.04 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 08 Apr 2010 13:15:07 -0700 (PDT) From: Miguel Di Ciurcio Filho To: qemu-devel@nongnu.org Date: Thu, 8 Apr 2010 17:16:35 -0300 Message-Id: <1270757799-31891-19-git-send-email-miguel.filho@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1270757799-31891-1-git-send-email-miguel.filho@gmail.com> References: <1270757799-31891-1-git-send-email-miguel.filho@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: armbru@redhat.com, lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH 18/22] net: slirp: replace qemu_format_nic_info_str by qemu_format_nic_info_dict X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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);