From patchwork Thu Apr 15 14:06:58 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: 50273 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 C8CD8B6EEB for ; Fri, 16 Apr 2010 01:28:29 +1000 (EST) Received: from localhost ([127.0.0.1]:57113 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O2Qz6-00027t-NI for incoming@patchwork.ozlabs.org; Thu, 15 Apr 2010 11:28:04 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O2Ptr-0003kV-FM for qemu-devel@nongnu.org; Thu, 15 Apr 2010 10:18:35 -0400 Received: from [140.186.70.92] (port=50377 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O2Ptp-0003H8-O1 for qemu-devel@nongnu.org; Thu, 15 Apr 2010 10:18:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O2PiG-0007WK-RH for qemu-devel@nongnu.org; Thu, 15 Apr 2010 10:06:38 -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 1O2PiG-0007Vy-Al for qemu-devel@nongnu.org; Thu, 15 Apr 2010 10:06:36 -0400 Received: by yxe10 with SMTP id 10so693532yxe.18 for ; Thu, 15 Apr 2010 07:06:35 -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=JB+z+2iZQkv9L/mIgpamflGFtD3UnQ/5P84h1/mQEvQ=; b=VD9d+rwTG1svI+zEsy8BExWUtWNiGNsbwhWncgpab9YqvhHdcBe9lKb/GvDyVDoaER L+QzJQXCq5QPkCGG60yVJO5sZxdWanOQrcKXKvdNEjVx2wJVbj8obvMgaDzbdJnHpJ4f QqSXT1VPXcODyqgoAfDLOSh59TDUpjw/cPKr8= 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=lLo77HjNRkWSkr/N5YcojfEU9npmUaENy8lbJb0ihWv3mAAnDobwLvdR2/nrdYqHOx /Y5RYFISPg9l6iExIKGkf3R09mE9N4jHpPCIsJv5p510Um6iZqIDnmHSCArwGaBan6zO ubn7W5T2XIvdJewEZYOwMZ3FIvL7y476Hoqi8= Received: by 10.101.185.6 with SMTP id m6mr296881anp.105.1271340393382; Thu, 15 Apr 2010 07:06:33 -0700 (PDT) Received: from localhost.localdomain (quake.ic.unicamp.br [143.106.7.51]) by mx.google.com with ESMTPS id y2sm1240378ani.4.2010.04.15.07.06.30 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 15 Apr 2010 07:06:32 -0700 (PDT) From: Miguel Di Ciurcio Filho To: qemu-devel@nongnu.org Date: Thu, 15 Apr 2010 11:06:58 -0300 Message-Id: <1271340427-12579-4-git-send-email-miguel.filho@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1271340427-12579-1-git-send-email-miguel.filho@gmail.com> References: <1271340427-12579-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 v3 03/12] 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 | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/hw/eepro100.c b/hw/eepro100.c index 7db6fb5..457bda8 100644 --- a/hw/eepro100.c +++ b/hw/eepro100.c @@ -1978,8 +1978,14 @@ 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); + +#ifdef DEBUG_EEPRO100 + QString *qstring; + qstring = qdict_to_qstring(s->nic->nc.info_dict); + TRACE(OTHER, logout("%s\n", qstring_get_str(qstring))); + QDECREF(qstring); +#endif qemu_register_reset(nic_reset, s);