From mboxrd@z Thu Jan 1 00:00:00 1970 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) From: Miguel Di Ciurcio Filho Date: Thu, 8 Apr 2010 17:16:22 -0300 Message-Id: <1270757799-31891-6-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 05/22] net: eepro100: 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 --- 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); -- 1.7.0.3