From patchwork Wed Jun 13 04:46:46 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: 164536 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 9F078B7412 for ; Wed, 13 Jun 2012 15:27:01 +1000 (EST) Received: from localhost ([::1]:46125 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SefLl-0007OW-AB for incoming@patchwork.ozlabs.org; Wed, 13 Jun 2012 00:38:33 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35538) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SefLU-00077B-Ur for qemu-devel@nongnu.org; Wed, 13 Jun 2012 00:38:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SefLT-00081M-8B for qemu-devel@nongnu.org; Wed, 13 Jun 2012 00:38:16 -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 1SefLT-0007uz-1W for qemu-devel@nongnu.org; Wed, 13 Jun 2012 00:38:15 -0400 Received: by mail-pb0-f45.google.com with SMTP id ro12so1836767pbb.4 for ; Tue, 12 Jun 2012 21:38:14 -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=W7iKNmXmlIaUnTbtNxXLhBUCpTymsw2K+8MtnTCZh9U=; b=i4YxTTlLXh8KP+2xQf3G71ymEml+Zze75e8e5DdFC1pIuGwGTKRI7mKhrnRSVe2Mdw +RA+QRK4etFAjUmr+uhdwQgGccCxJJaanKaWLs/9rAI6g3P5nIOmqmyme4TT2kgJ/Zwl 3axlxtFBhcASXJlvGpnbpmy7fGSWs1J3B66nDJlDZobn7FiNdV3nYnM9SPGPS8ZHDPuk XI17yd6mYdubhD/RNy8n6M2NQrn19b7T8VdGpIylmI6rbiaLdmWym4BbXtg/onF3qWDn khqS0Ra+NlXRoaUCHbq3GB3vwL9cPBJDBRhsdnwp6xtNnrcgCv8j6HoHR5CVrsl/+blG fYEg== Received: by 10.68.212.102 with SMTP id nj6mr47091621pbc.15.1339562294005; Tue, 12 Jun 2012 21:38:14 -0700 (PDT) Received: from localhost ([124.148.20.9]) by mx.google.com with ESMTPS id of1sm4380701pbb.15.2012.06.12.21.38.10 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 12 Jun 2012 21:38:12 -0700 (PDT) From: "Peter A. G. Crosthwaite" To: edgar.iglesias@gmail.com, qemu-devel@nongnu.org Date: Wed, 13 Jun 2012 14:46:46 +1000 Message-Id: <0ea8ff8afca7dd6120f6aa5f54110c82bdb6ca92.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: ALoCoQmjB+iiBNZizJREYnk99/gFnhuOKMob9gNG/DkF8lDLXM7KxLdBDSTfaCDZ8AjVnhUcGIX2 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 06/11] xilinx_ethlite: tweaked naming of ping-pong props 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 "txpingpong" prop to "tx-ping-pong". Same for rx. This is done to make the property name exactly match what is output by the xilinx tools for this IP. Signed-off-by: Peter A. G. Crosthwaite --- hw/xilinx.h | 4 ++-- hw/xilinx_ethlite.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/xilinx.h b/hw/xilinx.h index c183e2f..7776e1b 100644 --- a/hw/xilinx.h +++ b/hw/xilinx.h @@ -40,8 +40,8 @@ xilinx_ethlite_create(NICInfo *nd, target_phys_addr_t base, qemu_irq irq, dev = qdev_create(NULL, "xilinx,ethlite"); qdev_set_nic_properties(dev, nd); - qdev_prop_set_uint32(dev, "txpingpong", txpingpong); - qdev_prop_set_uint32(dev, "rxpingpong", rxpingpong); + qdev_prop_set_uint32(dev, "tx-ping-pong", txpingpong); + qdev_prop_set_uint32(dev, "rx-ping-pong", rxpingpong); qdev_init_nofail(dev); sysbus_mmio_map(sysbus_from_qdev(dev), 0, base); sysbus_connect_irq(sysbus_from_qdev(dev), 0, irq); diff --git a/hw/xilinx_ethlite.c b/hw/xilinx_ethlite.c index 857b33d..aa02715 100644 --- a/hw/xilinx_ethlite.c +++ b/hw/xilinx_ethlite.c @@ -227,8 +227,8 @@ static int xilinx_ethlite_init(SysBusDevice *dev) } static Property xilinx_ethlite_properties[] = { - DEFINE_PROP_UINT32("txpingpong", struct xlx_ethlite, c_tx_pingpong, 1), - DEFINE_PROP_UINT32("rxpingpong", struct xlx_ethlite, c_rx_pingpong, 1), + DEFINE_PROP_UINT32("tx-ping-pong", struct xlx_ethlite, c_tx_pingpong, 1), + DEFINE_PROP_UINT32("rx-ping-pong", struct xlx_ethlite, c_rx_pingpong, 1), DEFINE_NIC_PROPERTIES(struct xlx_ethlite, conf), DEFINE_PROP_END_OF_LIST(), };