From patchwork Thu Apr 8 20:16:22 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: 49749 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 9A1C8B6ED0 for ; Fri, 9 Apr 2010 06:23:24 +1000 (EST) Received: from localhost ([127.0.0.1]:51107 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NzyG1-000235-Q4 for incoming@patchwork.ozlabs.org; Thu, 08 Apr 2010 16:23:21 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nzy7N-0007WH-UJ for qemu-devel@nongnu.org; Thu, 08 Apr 2010 16:14:26 -0400 Received: from [140.186.70.92] (port=44036 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nzy7K-0007V0-Ki for qemu-devel@nongnu.org; Thu, 08 Apr 2010 16:14:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Nzy7J-00043M-99 for qemu-devel@nongnu.org; Thu, 08 Apr 2010 16:14:22 -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 1Nzy7J-0003y4-6j for qemu-devel@nongnu.org; Thu, 08 Apr 2010 16:14:21 -0400 Received: by mail-qy0-f188.google.com with SMTP id 26so2709084qyk.19 for ; Thu, 08 Apr 2010 13:14:21 -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=Rno6QYObSPHlu8h/h4P1fAhCXs19rthi/Z037yIpzGk=; b=ut3PNjrDOFUeV293KOQbDx0cKUSfn4V2fiBqv23/w91ZI8Yo/tsec0480qXniQozKj lK3X8JRuUHbRz7iO+TavfwdxZlnpHwF5ED+vzd9q5la4ssRiJ/905qGkoFFdYlTSB4DE Q4klqZHIRdTPCEafCWahMfcQKffD8irq/60So= 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=rtSLfOZM2zsJ69m6ScTcz1Lg3lkVye2KJGMIn6WbpvkUWiiYU7DOi5yO4hZHwsNlI5 KoNu+4Og5Mo44qBGCw85mxKarSaelfGLwGdWWg53jZe16jPwC8QDshAny+WqwOySRY5n 9Z4ZGsFF77quwheoS8tbiaoHWFjDk7ebpB5f8= Received: by 10.229.242.3 with SMTP id lg3mr790989qcb.102.1270757660729; Thu, 08 Apr 2010 13:14:20 -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.14.17 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 08 Apr 2010 13:14:20 -0700 (PDT) From: Miguel Di Ciurcio Filho To: qemu-devel@nongnu.org Date: Thu, 8 Apr 2010 17:16:22 -0300 Message-Id: <1270757799-31891-6-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 05/22] net: eepro100: 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 --- hw/eepro100.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/eepro100.c b/hw/eepro100.c index 7db6fb5..329fe15 100644 --- a/hw/eepro100.c +++ b/hw/eepro100.c @@ -47,6 +47,8 @@ #include "pci.h" #include "net.h" #include "eeprom93xx.h" +#include "qdict.h" +#include "qstring.h" #define KiB 1024 @@ -1978,8 +1980,9 @@ static int nic_init(PCIDevice *pci_dev, uint32_t device) s->nic = qemu_new_nic(&net_eepro100_info, &s->conf, pci_dev->qdev.info->name, pci_dev->qdev.id, s); - qemu_format_nic_info_str(&s->nic->nc, s->conf.macaddr.a); - TRACE(OTHER, logout("%s\n", s->nic->nc.info_str)); + qemu_format_nic_info_dict(&s->nic->nc, s->conf.macaddr.a); + TRACE(OTHER, logout("%s\n", + qstring_get_str(qdict_to_qstring(s->nic->nc.info_dic)))); qemu_register_reset(nic_reset, s);