From patchwork Thu Apr 8 20:16:32 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: 49759 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 B8946B7C06 for ; Fri, 9 Apr 2010 06:42:03 +1000 (EST) Received: from localhost ([127.0.0.1]:42892 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NzyY2-0008Ta-K1 for incoming@patchwork.ozlabs.org; Thu, 08 Apr 2010 16:41:58 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nzy7r-0007yG-SE for qemu-devel@nongnu.org; Thu, 08 Apr 2010 16:14:55 -0400 Received: from [140.186.70.92] (port=44276 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nzy7q-0007vw-0U for qemu-devel@nongnu.org; Thu, 08 Apr 2010 16:14:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Nzy7o-0004A8-HU for qemu-devel@nongnu.org; Thu, 08 Apr 2010 16:14:53 -0400 Received: from qw-out-1920.google.com ([74.125.92.145]:15035) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Nzy7o-00046N-F0 for qemu-devel@nongnu.org; Thu, 08 Apr 2010 16:14:52 -0400 Received: by qw-out-1920.google.com with SMTP id 5so846226qwc.4 for ; Thu, 08 Apr 2010 13:14:52 -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=AAlEAUzceq3UTdr88USMGYVYo3D4HyjX1IbqUo6rZF4=; b=jCRzqoks9e1wRT8zTZlTpnMZxBnN3Myi+46PWr0rmj7Wvvh5GlJfqX4iLgS5oSQjj+ KZJf6q3Wdta3gvoyOqo+cgD+qmc/bFDcWDKXkZ9IeXPpmRHN69jp6KA1raaraDiEadCp hDLLXvjP8x6l96ODMLNglcDh578VUCgohRz3I= 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=KmDDXp1XThWd1f4Y35kmuEBMscjsXsHFGjTafuXpymXHvfNxS3LoWBlZnw5EtltXzy kkpgIvsm4YQdiMftlyzK42ztFAvnYVCmRIaA0otHyfUdl/DIRjkwMPCgrTVamnpL9owy otBXiChA2XYKKKK9pw5wVZ/5g22laNoncrSWs= Received: by 10.229.35.80 with SMTP id o16mr820290qcd.93.1270757691511; Thu, 08 Apr 2010 13:14:51 -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.49 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 08 Apr 2010 13:14:50 -0700 (PDT) From: Miguel Di Ciurcio Filho To: qemu-devel@nongnu.org Date: Thu, 8 Apr 2010 17:16:32 -0300 Message-Id: <1270757799-31891-16-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 15/22] net: virtio-net: 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/virtio-net.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/virtio-net.c b/hw/virtio-net.c index 970ba06..482a176 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -89,7 +89,7 @@ static void virtio_net_set_config(VirtIODevice *vdev, const uint8_t *config) if (memcmp(netcfg.mac, n->mac, ETH_ALEN)) { memcpy(n->mac, netcfg.mac, ETH_ALEN); - qemu_format_nic_info_str(&n->nic->nc, n->mac); + qemu_format_nic_info_dict(&n->nic->nc, n->mac); } } @@ -916,7 +916,7 @@ VirtIODevice *virtio_net_init(DeviceState *dev, NICConf *conf) n->nic = qemu_new_nic(&net_virtio_info, conf, dev->info->name, dev->id, n); - qemu_format_nic_info_str(&n->nic->nc, conf->macaddr.a); + qemu_format_nic_info_dict(&n->nic->nc, conf->macaddr.a); n->tx_timer = qemu_new_timer(vm_clock, virtio_net_tx_timer, n); n->tx_timer_active = 0;