From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O0IOF-0001xl-6M for qemu-devel@nongnu.org; Fri, 09 Apr 2010 13:53:11 -0400 Received: from [140.186.70.92] (port=48440 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O0IOD-0001xH-S7 for qemu-devel@nongnu.org; Fri, 09 Apr 2010 13:53:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O0IOC-0005jn-Bs for qemu-devel@nongnu.org; Fri, 09 Apr 2010 13:53:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1026) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O0IOC-0005jb-43 for qemu-devel@nongnu.org; Fri, 09 Apr 2010 13:53:08 -0400 Date: Fri, 9 Apr 2010 14:42:18 -0300 From: Luiz Capitulino Message-ID: <20100409144218.09ce27dd@redhat.com> In-Reply-To: <1270757799-31891-6-git-send-email-miguel.filho@gmail.com> References: <1270757799-31891-1-git-send-email-miguel.filho@gmail.com> <1270757799-31891-6-git-send-email-miguel.filho@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] Re: [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: Miguel Di Ciurcio Filho Cc: qemu-devel@nongnu.org, armbru@redhat.com On Thu, 8 Apr 2010 17:16:22 -0300 Miguel Di Ciurcio Filho wrote: > 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)))); You have to free the returned qstring. > > qemu_register_reset(nic_reset, s); >