From patchwork Wed Jun 13 04:46:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peter A. G. Crosthwaite" X-Patchwork-Id: 164532 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 994EFB6FCC for ; Wed, 13 Jun 2012 14:55:44 +1000 (EST) Received: from localhost ([::1]:46529 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SefLp-0007ay-NG for incoming@patchwork.ozlabs.org; Wed, 13 Jun 2012 00:38:37 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35580) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SefLd-0007Mv-Aw for qemu-devel@nongnu.org; Wed, 13 Jun 2012 00:38:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SefLa-00082r-QB for qemu-devel@nongnu.org; Wed, 13 Jun 2012 00:38:24 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:42162) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SefLa-0007uz-KF for qemu-devel@nongnu.org; Wed, 13 Jun 2012 00:38:22 -0400 Received: by mail-pb0-f45.google.com with SMTP id ro12so1836767pbb.4 for ; Tue, 12 Jun 2012 21:38:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to:references:x-gm-message-state; bh=vd8zN0Tsice1Yiux7LhaiMq/ulP9JISKOr8EfLsoNI4=; b=YcxvX3SqxISLPadvbHjRGLETEjIp76yIAPg9MZHWWaeaKBzI/8GFiGwD5KtIoa/SX6 61fw1Mh3B1fPAGtoSoCiw3nlm/PL0M1KxnEA15usaoOaNeSnTnCHN9EhHDRA2c0P8+S0 vkNKNzYCtCHt+5cCCJj2kuL+n0qPrl0oM0ykQSPSI6s2k/URQgrwvdMVr/GAj58VkJ3z bHVJI+67gXd/EJkrMnvwxv9uLsEFL7vw2KpCiAF49VM1A+vhH11TlmtmCzDV2LBI4Iqq hg+RXHCOSXQv59UhYpszZUfMbR5QmIkiNu+M3zdwy408B5hyiMy2kVc5J3Z5FkBs4FEM dqGA== Received: by 10.68.192.39 with SMTP id hd7mr43015864pbc.97.1339562301470; Tue, 12 Jun 2012 21:38:21 -0700 (PDT) Received: from localhost ([124.148.20.9]) by mx.google.com with ESMTPS id ns5sm4375637pbb.26.2012.06.12.21.38.17 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 12 Jun 2012 21:38:19 -0700 (PDT) From: "Peter A. G. Crosthwaite" To: edgar.iglesias@gmail.com, qemu-devel@nongnu.org Date: Wed, 13 Jun 2012 14:46:47 +1000 Message-Id: <1e8bce22b5f82b7cdf3d1f65a4eb2988021e6312.1339562634.git.peter.crosthwaite@petalogix.com> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQlYe8v1AKzC428Bxcygljp+dUK3Bz5uD+AlwQFLzIBCrbvOjTBeDJtDnHkSKajjBFUcoqwf X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: peter.crosthwaite@petalogix.com, monstr@monstr.eu, john.williams@petalogix.com Subject: [Qemu-devel] [PATCH v2 07/11] xilinx_ethlite: changed device name X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Changed device name to xlnx,xps-ethernetlite. This is the exact name of the device in the xilinx EDK development tools. Signed-off-by: Peter A. G. Crosthwaite --- hw/xilinx.h | 4 ++-- hw/xilinx_ethlite.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/xilinx.h b/hw/xilinx.h index 7776e1b..5f7c5e9 100644 --- a/hw/xilinx.h +++ b/hw/xilinx.h @@ -36,9 +36,9 @@ xilinx_ethlite_create(NICInfo *nd, target_phys_addr_t base, qemu_irq irq, { DeviceState *dev; - qemu_check_nic_model(nd, "xilinx-ethlite"); + qemu_check_nic_model(nd, "xlnx.xps-ethernetlite"); - dev = qdev_create(NULL, "xilinx,ethlite"); + dev = qdev_create(NULL, "xlnx.xps-ethernetlite"); qdev_set_nic_properties(dev, nd); qdev_prop_set_uint32(dev, "tx-ping-pong", txpingpong); qdev_prop_set_uint32(dev, "rx-ping-pong", rxpingpong); diff --git a/hw/xilinx_ethlite.c b/hw/xilinx_ethlite.c index aa02715..affbb8b 100644 --- a/hw/xilinx_ethlite.c +++ b/hw/xilinx_ethlite.c @@ -216,7 +216,8 @@ static int xilinx_ethlite_init(SysBusDevice *dev) sysbus_init_irq(dev, &s->irq); s->rxbuf = 0; - memory_region_init_io(&s->mmio, ð_ops, s, "xilinx-ethlite", R_MAX * 4); + memory_region_init_io(&s->mmio, ð_ops, s, "xlnx.xps-ethernetlite", + R_MAX * 4); sysbus_init_mmio(dev, &s->mmio); qemu_macaddr_default_if_unset(&s->conf.macaddr); @@ -243,7 +244,7 @@ static void xilinx_ethlite_class_init(ObjectClass *klass, void *data) } static TypeInfo xilinx_ethlite_info = { - .name = "xilinx,ethlite", + .name = "xlnx.xps-ethernetlite", .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(struct xlx_ethlite), .class_init = xilinx_ethlite_class_init,