From nobody Fri Nov 14 20:41:11 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1589900331; cv=none; d=zohomail.com; s=zohoarc; b=HURcXXal02Q0P65CeUsgRXrAGHd7UmUkJhocplcCZ1+5FVajO8YAsOQ7uaz+kKykncJsNQGtl4/Ro/bzPMvtEdEeQ91PlYJaUjCO4tb5HNAW2NgZPgJmzyosHZe1X5fF2pNkL+ZxBqMplhWLejPM/lbmWwzhVDI+1327en3brN4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589900331; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bvbipkYu05v0g5KMKrHpWYszU+I/zMGoEwJ4O/xE5Ik=; b=PhGTxZo6fu4w+3RMuG1HQTwBn0vly7L+1EXua+3PtriVT5/KBdQvHbR4E7CymB/SID4OUtAaJvSBisjrNIOz2xACUlD6glSvd2UHcggnDXQyIboemd9rmdcJPJ8Sn3AxeMSeWiCB7ClDEB/Z7nnWax3jlVZdCgEFuyZ6QEV5eKg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1589900331017536.9752023987984; Tue, 19 May 2020 07:58:51 -0700 (PDT) Received: from localhost ([::1]:58044 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jb3hh-00071j-N1 for importer@patchew.org; Tue, 19 May 2020 10:58:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44938) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jb3ez-00016z-PD for qemu-devel@nongnu.org; Tue, 19 May 2020 10:56:01 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:20761 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jb3ey-0003UW-93 for qemu-devel@nongnu.org; Tue, 19 May 2020 10:56:01 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-382-tK_BQwp9PPWf5A-fXOujYQ-1; Tue, 19 May 2020 10:55:58 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DC0FF1009600 for ; Tue, 19 May 2020 14:55:56 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-32.ams2.redhat.com [10.36.112.32]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AA2DA60BEC; Tue, 19 May 2020 14:55:56 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 006D511358D0; Tue, 19 May 2020 16:55:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589900159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bvbipkYu05v0g5KMKrHpWYszU+I/zMGoEwJ4O/xE5Ik=; b=YInCG51nhYj/+SfmGPYWIud8SgLbsMEsKyRjI0FwE3Rvv1BodOOJ1fYutpgV1IbxmUKEbP G874o37KQGf4srOloOyhK8jqh2++j2Ywq4wpXEUuK2H2kCc9ydpYc4CwOciyizz4Z/Fh4P EBSNrhSwkuuwcDqvjCm4G6wCW+P7/iw= X-MC-Unique: tK_BQwp9PPWf5A-fXOujYQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 19/55] isa: Convert uses of isa_create(), isa_try_create() manually Date: Tue, 19 May 2020 16:55:15 +0200 Message-Id: <20200519145551.22836-20-armbru@redhat.com> In-Reply-To: <20200519145551.22836-1-armbru@redhat.com> References: <20200519145551.22836-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.61; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/18 23:19:13 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, berrange@redhat.com, ehabkost@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Same transformation as in the previous commit. Manual, because convincing Coccinelle to transform these cases is not worthwhile. Signed-off-by: Markus Armbruster --- include/hw/net/ne2000-isa.h | 5 +++-- hw/block/fdc.c | 4 ++-- hw/i386/pc.c | 4 ++-- hw/ppc/pnv.c | 9 ++++----- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/hw/net/ne2000-isa.h b/include/hw/net/ne2000-isa.h index eef17a680d..af59ee0b02 100644 --- a/include/hw/net/ne2000-isa.h +++ b/include/hw/net/ne2000-isa.h @@ -13,6 +13,7 @@ #include "hw/isa/isa.h" #include "hw/qdev-properties.h" #include "net/net.h" +#include "qapi/error.h" =20 #define TYPE_ISA_NE2000 "ne2k_isa" =20 @@ -23,14 +24,14 @@ static inline ISADevice *isa_ne2000_init(ISABus *bus, i= nt base, int irq, =20 qemu_check_nic_model(nd, "ne2k_isa"); =20 - d =3D isa_try_create(bus, TYPE_ISA_NE2000); + d =3D isa_try_new(TYPE_ISA_NE2000); if (d) { DeviceState *dev =3D DEVICE(d); =20 qdev_prop_set_uint32(dev, "iobase", base); qdev_prop_set_uint32(dev, "irq", irq); qdev_set_nic_properties(dev, nd); - qdev_init_nofail(dev); + isa_realize_and_unref(d, bus, &error_fatal); } return d; } diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 5220ca61e4..da68d2ff58 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -2546,7 +2546,7 @@ ISADevice *fdctrl_init_isa(ISABus *bus, DriveInfo **f= ds) DeviceState *dev; ISADevice *isadev; =20 - isadev =3D isa_try_create(bus, TYPE_ISA_FDC); + isadev =3D isa_try_new(TYPE_ISA_FDC); if (!isadev) { return NULL; } @@ -2560,7 +2560,7 @@ ISADevice *fdctrl_init_isa(ISABus *bus, DriveInfo **f= ds) qdev_prop_set_drive(dev, "driveB", blk_by_legacy_dinfo(fds[1]), &error_fatal); } - qdev_init_nofail(dev); + isa_realize_and_unref(isadev, bus, &error_fatal); =20 return isadev; } diff --git a/hw/i386/pc.c b/hw/i386/pc.c index b549d0bbfc..280560f790 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1157,14 +1157,14 @@ static void pc_superio_init(ISABus *isa_bus, bool c= reate_fdctrl, bool no_vmport) i8042 =3D isa_create_simple(isa_bus, "i8042"); if (!no_vmport) { isa_create_simple(isa_bus, TYPE_VMPORT); - vmmouse =3D isa_try_create(isa_bus, "vmmouse"); + vmmouse =3D isa_try_new("vmmouse"); } else { vmmouse =3D NULL; } if (vmmouse) { object_property_set_link(OBJECT(vmmouse), OBJECT(i8042), "i8042", &error_abort); - qdev_init_nofail(DEVICE(vmmouse)); + isa_realize_and_unref(vmmouse, isa_bus, &error_fatal); } port92 =3D isa_create_simple(isa_bus, TYPE_PORT92); =20 diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index e7bf589ef5..7a995111df 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -694,12 +694,11 @@ static bool pnv_match_cpu(const char *default_type, c= onst char *cpu_type) =20 static void pnv_ipmi_bt_init(ISABus *bus, IPMIBmc *bmc, uint32_t irq) { - Object *obj; + ISADevice *dev =3D isa_new("isa-ipmi-bt"); =20 - obj =3D OBJECT(isa_create(bus, "isa-ipmi-bt")); - object_property_set_link(obj, OBJECT(bmc), "bmc", &error_fatal); - object_property_set_int(obj, irq, "irq", &error_fatal); - object_property_set_bool(obj, true, "realized", &error_fatal); + object_property_set_link(OBJECT(dev), OBJECT(bmc), "bmc", &error_fatal= ); + object_property_set_int(OBJECT(dev), irq, "irq", &error_fatal); + isa_realize_and_unref(dev, bus, &error_fatal); } =20 static void pnv_chip_power10_pic_print_info(PnvChip *chip, Monitor *mon) --=20 2.21.1