From nobody Mon Feb 9 20:59:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1586725836; cv=none; d=zohomail.com; s=zohoarc; b=gRhPvnfv+AQOiTTUwcMcxbCgxmWIhGE1m58Qvjqupn3xGAvj44/+yjahP05eDGbTCd8g8bPG+gGyA29b0dhkNEtBFNxHT2LZbdxp3iHt7B2G7NbDTMDJby5AmDZ+uJHIOySKFvHSMqDUYiMkoCGnpmMVv7dVoaPZ23DmGklfTuk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586725836; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gsYbEjd4TD9Bp8EbfBEbuZbEWy++c7aKNJLdJ3YG81s=; b=Ye5jxPvxfbkzJXuwvS9TXHOS+RUOV5dqOHzPQ9ThC8rh7wDdq3LYhcz9sRWYULP8hcKUMOxralNzwrB5fxHapV8IR6Gw8q60lCgZ5ynP68IoWvWxkMkuGcewADDKyBT1t5gqPte15+bTP/Uk5+3zM1YkQ+kGvLOs8bfg4uXyJwA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1586725836700158.53159131889993; Sun, 12 Apr 2020 14:10:36 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jNjro-0007Jb-Ex; Sun, 12 Apr 2020 21:10:12 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jNjrm-0007JW-Q3 for xen-devel@lists.xenproject.org; Sun, 12 Apr 2020 21:10:10 +0000 Received: from mail-wr1-x442.google.com (unknown [2a00:1450:4864:20::442]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id fc3c0584-7d01-11ea-b4f4-bc764e2007e4; Sun, 12 Apr 2020 21:10:07 +0000 (UTC) Received: by mail-wr1-x442.google.com with SMTP id i10so8378368wrv.10 for ; Sun, 12 Apr 2020 14:10:07 -0700 (PDT) Received: from localhost.localdomain (116.red-83-42-57.dynamicip.rima-tde.net. [83.42.57.116]) by smtp.gmail.com with ESMTPSA id o16sm12553602wrs.44.2020.04.12.14.10.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Apr 2020 14:10:05 -0700 (PDT) X-Inumbo-ID: fc3c0584-7d01-11ea-b4f4-bc764e2007e4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gsYbEjd4TD9Bp8EbfBEbuZbEWy++c7aKNJLdJ3YG81s=; b=F6MwD2LXNz5qSiQ9U7sN6titbvBTVPwW+WPnxAgReHxGMCEM+dPMLI2rDyI1SBuexA 8X4en7LsPicU3CvVdJfUwpaYkWQJx/9JDE36m/vCG9tt4oNnclZvSGLtxDh9g2nqvVen egUlGG7jm5W4bkUTTQyk2IrVD5095MR2BaBB1nrA2tWvi4Uo2j7P5Aid8G1fMkGhrHgp 3JcUjkFFHKzGHqOa5WPhvPjQa5uJtWQqbZ7u6YajqffuNp4Y4eS18QQqe3TejYDaLL/v NSSfd4k/Trj0zKPV1XsX0isvHEDohvQeLjdKEdbJp37tNHLfgAKiMGDBvJ9cRKFn6wia 3pRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=gsYbEjd4TD9Bp8EbfBEbuZbEWy++c7aKNJLdJ3YG81s=; b=WRmDogn4LuWT0Xz02wTwnftnBgR3gI9W+VKWKb7W3oeV44FyjB3lHHWIfKb3KB2oAF OgvHcz9JMHP3yPHvXflG+Eo+0lcGoCP7eXf0RcrAnL86mqTc05St65n9n38w+9BFrn0d spcp9c/TmxHMTbuqCRULftW/zky8YtjK/uwCdrfs/HPhSLTVwOPdx6XOankDE4/7cBJ1 9BJ5oESubbdIwInQHVXdekhdPyBq+sAsvpobVoML7FxHbginFxii6vS6SEh0Nk6ZHHd4 gdXAUzfQ2JzcMSpOtGSQ0+D841syz2yOx+CDMT2UmQkfD36pwkGInQoah14BfJKwL7rY 4uwA== X-Gm-Message-State: AGi0PubCGJzTPiDng7EvtoeeC/eyA7no0wvbH/ylwI1EYjoPXt4jyESp RBJsQjTnKgFgbvCzp+9sd24= X-Google-Smtp-Source: APiQypIWuuzEDhgrL5dFuOMcEExPN7XGYetuwcVi65TL0H1PSMXhw1g00339hVtTvTn98WKI8byMwQ== X-Received: by 2002:a5d:69c9:: with SMTP id s9mr15764392wrw.307.1586725806483; Sun, 12 Apr 2020 14:10:06 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-5.1 2/3] various: Remove unnecessary OBJECT() cast Date: Sun, 12 Apr 2020 23:09:53 +0200 Message-Id: <20200412210954.32313-3-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200412210954.32313-1-f4bug@amsat.org> References: <20200412210954.32313-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , David Hildenbrand , Jason Wang , Mark Cave-Ayland , BALATON Zoltan , Gerd Hoffmann , "Edgar E. Iglesias" , Stefano Stabellini , qemu-block@nongnu.org, Paul Durrant , Markus Armbruster , Halil Pasic , Christian Borntraeger , Aleksandar Markovic , Joel Stanley , Anthony Perard , xen-devel@lists.xenproject.org, David Gibson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , Corey Minyard , "Dr. David Alan Gilbert" , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, Peter Chubb , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , John Snow , Richard Henderson , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Andrew Jeffery , Cornelia Huck , Laurent Vivier , qemu-ppc@nongnu.org, Paolo Bonzini , Aurelien Jarno , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The OBJECT() macro is defined as: #define OBJECT(obj) ((Object *)(obj)) Remove unnecessary OBJECT() casts. Patch created mechanically using spatch with this script: @@ typedef Object; Object *o; @@ - OBJECT(o) + o Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Corey Minyard Acked-by: Cornelia Huck Acked-by: John Snow --- hw/core/bus.c | 2 +- hw/ide/ahci-allwinner.c | 2 +- hw/ipmi/smbus_ipmi.c | 2 +- hw/microblaze/petalogix_ml605_mmu.c | 8 ++++---- hw/s390x/sclp.c | 2 +- monitor/misc.c | 3 +-- qom/object.c | 4 ++-- 7 files changed, 11 insertions(+), 12 deletions(-) diff --git a/hw/core/bus.c b/hw/core/bus.c index 3dc0a825f0..4ea5870de8 100644 --- a/hw/core/bus.c +++ b/hw/core/bus.c @@ -25,7 +25,7 @@ =20 void qbus_set_hotplug_handler(BusState *bus, Object *handler, Error **errp) { - object_property_set_link(OBJECT(bus), OBJECT(handler), + object_property_set_link(OBJECT(bus), handler, QDEV_HOTPLUG_HANDLER_PROPERTY, errp); } =20 diff --git a/hw/ide/ahci-allwinner.c b/hw/ide/ahci-allwinner.c index bb8393d2b6..8536b9eb5a 100644 --- a/hw/ide/ahci-allwinner.c +++ b/hw/ide/ahci-allwinner.c @@ -90,7 +90,7 @@ static void allwinner_ahci_init(Object *obj) SysbusAHCIState *s =3D SYSBUS_AHCI(obj); AllwinnerAHCIState *a =3D ALLWINNER_AHCI(obj); =20 - memory_region_init_io(&a->mmio, OBJECT(obj), &allwinner_ahci_mem_ops, = a, + memory_region_init_io(&a->mmio, obj, &allwinner_ahci_mem_ops, a, "allwinner-ahci", ALLWINNER_AHCI_MMIO_SIZE); memory_region_add_subregion(&s->ahci.mem, ALLWINNER_AHCI_MMIO_OFF, &a->mmio); diff --git a/hw/ipmi/smbus_ipmi.c b/hw/ipmi/smbus_ipmi.c index 2a9470d9df..f1a0148755 100644 --- a/hw/ipmi/smbus_ipmi.c +++ b/hw/ipmi/smbus_ipmi.c @@ -329,7 +329,7 @@ static void smbus_ipmi_init(Object *obj) { SMBusIPMIDevice *sid =3D SMBUS_IPMI(obj); =20 - ipmi_bmc_find_and_link(OBJECT(obj), (Object **) &sid->bmc); + ipmi_bmc_find_and_link(obj, (Object **) &sid->bmc); } =20 static void smbus_ipmi_get_fwinfo(struct IPMIInterface *ii, IPMIFwInfo *in= fo) diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_= ml605_mmu.c index 0a2640c40b..52dcea9abd 100644 --- a/hw/microblaze/petalogix_ml605_mmu.c +++ b/hw/microblaze/petalogix_ml605_mmu.c @@ -150,9 +150,9 @@ petalogix_ml605_init(MachineState *machine) qdev_set_nic_properties(eth0, &nd_table[0]); qdev_prop_set_uint32(eth0, "rxmem", 0x1000); qdev_prop_set_uint32(eth0, "txmem", 0x1000); - object_property_set_link(OBJECT(eth0), OBJECT(ds), + object_property_set_link(OBJECT(eth0), ds, "axistream-connected", &error_abort); - object_property_set_link(OBJECT(eth0), OBJECT(cs), + object_property_set_link(OBJECT(eth0), cs, "axistream-control-connected", &error_abort); qdev_init_nofail(eth0); sysbus_mmio_map(SYS_BUS_DEVICE(eth0), 0, AXIENET_BASEADDR); @@ -163,9 +163,9 @@ petalogix_ml605_init(MachineState *machine) cs =3D object_property_get_link(OBJECT(eth0), "axistream-control-connected-target", NU= LL); qdev_prop_set_uint32(dma, "freqhz", 100 * 1000000); - object_property_set_link(OBJECT(dma), OBJECT(ds), + object_property_set_link(OBJECT(dma), ds, "axistream-connected", &error_abort); - object_property_set_link(OBJECT(dma), OBJECT(cs), + object_property_set_link(OBJECT(dma), cs, "axistream-control-connected", &error_abort); qdev_init_nofail(dma); sysbus_mmio_map(SYS_BUS_DEVICE(dma), 0, AXIDMA_BASEADDR); diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c index f0c35aa57a..bae9d2350f 100644 --- a/hw/s390x/sclp.c +++ b/hw/s390x/sclp.c @@ -288,7 +288,7 @@ void s390_sclp_init(void) =20 object_property_add_child(qdev_get_machine(), TYPE_SCLP, new, NULL); - object_unref(OBJECT(new)); + object_unref(new); qdev_init_nofail(DEVICE(new)); } =20 diff --git a/monitor/misc.c b/monitor/misc.c index 6c45fa490f..57af5fa5a4 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -1839,8 +1839,7 @@ void object_add_completion(ReadLineState *rs, int nb_= args, const char *str) static int qdev_add_hotpluggable_device(Object *obj, void *opaque) { GSList **list =3D opaque; - DeviceState *dev =3D (DeviceState *)object_dynamic_cast(OBJECT(obj), - TYPE_DEVICE); + DeviceState *dev =3D (DeviceState *)object_dynamic_cast(obj, TYPE_DEVI= CE); =20 if (dev =3D=3D NULL) { return 0; diff --git a/qom/object.c b/qom/object.c index 1812f79224..9893cc5459 100644 --- a/qom/object.c +++ b/qom/object.c @@ -762,7 +762,7 @@ Object *object_new_with_propv(const char *typename, } } =20 - object_unref(OBJECT(obj)); + object_unref(obj); return obj; =20 error: @@ -1689,7 +1689,7 @@ void object_property_add_child(Object *obj, const cha= r *name, return; } =20 - type =3D g_strdup_printf("child<%s>", object_get_typename(OBJECT(child= ))); + type =3D g_strdup_printf("child<%s>", object_get_typename(child)); =20 op =3D object_property_add(obj, name, type, object_get_child_property,= NULL, object_finalize_child_property, child, &local= _err); --=20 2.21.1