From nobody Mon May 6 05:10:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1491662304291774.1232164986291; Sat, 8 Apr 2017 07:38:24 -0700 (PDT) Received: from localhost ([::1]:55047 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cwrVO-0004S0-AJ for importer@patchew.org; Sat, 08 Apr 2017 10:38:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42729) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cwrUX-00047N-CH for qemu-devel@nongnu.org; Sat, 08 Apr 2017 10:37:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cwrUU-0001pi-6I for qemu-devel@nongnu.org; Sat, 08 Apr 2017 10:37:29 -0400 Received: from mail-pg0-x243.google.com ([2607:f8b0:400e:c05::243]:34474) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cwrUT-0001pe-Vd for qemu-devel@nongnu.org; Sat, 08 Apr 2017 10:37:26 -0400 Received: by mail-pg0-x243.google.com with SMTP id o123so20390293pga.1 for ; Sat, 08 Apr 2017 07:37:25 -0700 (PDT) Received: from localhost.localdomain.com ([117.224.127.213]) by smtp.gmail.com with ESMTPSA id s3sm15521003pgn.29.2017.04.08.07.37.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Apr 2017 07:37:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=vr+pGkYw446ifoT1NbNJdMNtW4ROUyiQdWFvi99uOC0=; b=QJ9eAa14MFpaNBHOV8IDLMFiDAP81dEPEA+RoKVYMWbol943vXkSap+SXpVGHw0+8k Zlr4GmEXifqGzH5NB9MbHtXtdv2Yv6qj7EikGFBrV9/YkQLC26Q1HyiHk/BL+Z3gMZtt bmkbAejIWQrj1XemcRdO88t6NXMDHfg5n3H+gWYfNAp13cm9l5Q+sZMRX3DewAZ2arTC bcz/xxL+584HlpGwG6yxJJxpUkrRWSvefj0nA83LBbmBbnBkXFujVLGAiS38LwbAO17Q Sfs9A3P1BGTetKhNl3oFwvN4WA+wdlBovPcOSMI12hAPGiPkBFb/cAh/xmjKmM49KevZ A1Cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=vr+pGkYw446ifoT1NbNJdMNtW4ROUyiQdWFvi99uOC0=; b=kHHgjbfDIfnXqZMJSQBPs5JgDlxhZ7TAGOZeu4YAIoENRJDbQT2BPptVnJ7NAudzGV elilBxuiJrsi0kqHQ6xJNzqmdT6xqHuqZJFsmp7m/dLQN8nYXhhoqbBMTVkXn+IEo3De mB5XJMK2iVdDDgPQH/2+QPXbxDy1vHuab80fKeVwRvxAphx3o0bVfcIBC8l5WEVyd/j9 Yz5ev/TrCHMhp8IaqUhzL4lo29vbQQkO56J0AW9HcriWH//une93jeMs2wK0yi5wXQmZ p6W5jOkFxZEjGUtc45qnc2LtTk8DTRUcpezRq06ORVPr9YVFt/VjaWj7aZQa1dLtvnan zjyQ== X-Gm-Message-State: AN3rC/7lri5gLdcchM6fYi4G/BsGHcD8Kkoc8qH292ihE4icI9SSKzdmHTaDoPDJR50QIg== X-Received: by 10.84.232.68 with SMTP id f4mr4217430pln.90.1491662244796; Sat, 08 Apr 2017 07:37:24 -0700 (PDT) From: Suramya Shah To: qemu-devel@nongnu.org Date: Sat, 8 Apr 2017 20:06:39 +0530 Message-Id: <20170408143639.2524-1-shah.suramya@gmail.com> X-Mailer: git-send-email 2.9.3 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c05::243 Subject: [Qemu-devel] [PATCH v2] hw/net: convert "dma" property type from ptr to link X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jasowang@redhat.com, Suramya Shah Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The lance device needs pointer to ISA DMA device to operate. But according = to qdev-properties.h, properties of pointer type should be avoided. A link type property is a good substitution. Changes since v1 -changed the code in hw/sparc/sun4m.c which uses the device. Signed-off-by: Suramya Shah --- hw/net/lance.c | 8 ++++++-- hw/sparc/sun4m.c | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/hw/net/lance.c b/hw/net/lance.c index 573d724..3996b9c 100644 --- a/hw/net/lance.c +++ b/hw/net/lance.c @@ -44,6 +44,7 @@ #include "pcnet.h" #include "trace.h" #include "sysemu/sysemu.h" +#include "qapi/error.h" =20 #define TYPE_LANCE "lance" #define SYSBUS_PCNET(obj) \ @@ -145,10 +146,14 @@ static void lance_instance_init(Object *obj) device_add_bootindex_property(obj, &s->conf.bootindex, "bootindex", "/ethernet-phy@0", DEVICE(obj), NULL); + + object_property_add_link(obj, "dma", TYPE_LANCE, + (Object **)&d->state.dma_opaque, + qdev_prop_allow_set_link_before_realize, + 0, &error_abort); } =20 static Property lance_properties[] =3D { - DEFINE_PROP_PTR("dma", SysBusPCNetState, state.dma_opaque), DEFINE_NIC_PROPERTIES(SysBusPCNetState, state.conf), DEFINE_PROP_END_OF_LIST(), }; @@ -164,7 +169,6 @@ static void lance_class_init(ObjectClass *klass, void *= data) dc->reset =3D lance_reset; dc->vmsd =3D &vmstate_lance; dc->props =3D lance_properties; - /* Reason: pointer property "dma" */ dc->cannot_instantiate_with_device_add_yet =3D true; } =20 diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 873cd7d..9b3f5a5 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -336,7 +336,7 @@ static void lance_init(NICInfo *nd, hwaddr leaddr, =20 dev =3D qdev_create(NULL, "lance"); qdev_set_nic_properties(dev, nd); - qdev_prop_set_ptr(dev, "dma", dma_opaque); + object_property_set_link(OBJECT(dev), OBJECT(dma_opaque), "dma", NULL); qdev_init_nofail(dev); s =3D SYS_BUS_DEVICE(dev); sysbus_mmio_map(s, 0, leaddr); --=20 2.9.3