From nobody Sat Nov 15 01:04:33 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1592254587; cv=none; d=zohomail.com; s=zohoarc; b=IKw59OXG0XOLxHKfh3xUcnODtOGwdolbpvvS196dsiAP65jJObqZZujfDXLAq9ymDknVHfgqk1rzFXo1OEYDmMO99qViQmZybrlacDjKTOJSm9mi2nYZ2lFjaLZvzmFdREr44rwviUSOEU5DD1+FTWWhRv44rR+ffZEDoqRdLUU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592254587; 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=3Bnkp7AdoFSFRITeS3mze8v2TxIwBQ3KEpMKWVqht5w=; b=GmAqratXo1N+N7IVxy/e0ZXazCXi5FbXZ/BsUk2h4xCR/0cueeib8YlQCHKO2XMDamiseE9u0l2bQ9G7fblgsYjrHFZDXTqGTIKCnXAbqGeZGloJw9wCafmg5+zZcExmRlmh/aBTox7h/5eeAYSglceU4GesowKDd+lYOCMlBJ0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1592254587843829.8750989403748; Mon, 15 Jun 2020 13:56:27 -0700 (PDT) Received: from localhost ([::1]:37206 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jkw9a-0002UC-DP for importer@patchew.org; Mon, 15 Jun 2020 16:56:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33734) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkvuU-0003K2-Ck for qemu-devel@nongnu.org; Mon, 15 Jun 2020 16:40:50 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:40673 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 1jkvuP-0000bB-6Y for qemu-devel@nongnu.org; Mon, 15 Jun 2020 16:40:49 -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-294-UDxMOdV2NsSVWzBOkm7zwA-1; Mon, 15 Jun 2020 16:40:42 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7CC4A100CCCD; Mon, 15 Jun 2020 20:40:41 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-121.ams2.redhat.com [10.36.112.121]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 237789034B; Mon, 15 Jun 2020 20:40:41 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id B49B31132FDA; Mon, 15 Jun 2020 22:40:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592253644; 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=3Bnkp7AdoFSFRITeS3mze8v2TxIwBQ3KEpMKWVqht5w=; b=hHyG5oCk7RE0zLIpCrX+6buXpn1PwRzZNt61WnGdkNQmObaOZYE2PbCQgQhDpkwernv7um 6ChJdgWvMRRs9cUhyjOXmrYWD4zRKTNaZnlHof7Kl46p4sBXqTnpx9f5MxOQkqH4NfW0hN C7EEwAbNJtr3A6DbuknchIYk2TNeBIE= X-MC-Unique: UDxMOdV2NsSVWzBOkm7zwA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 42/84] pci: Convert uses of pci_create() etc. manually Date: Mon, 15 Jun 2020 22:39:26 +0200 Message-Id: <20200615204008.3069956-43-armbru@redhat.com> In-Reply-To: <20200615204008.3069956-1-armbru@redhat.com> References: <20200615204008.3069956-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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/06/15 15:33:00 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=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: Paolo Bonzini , "Michael S . Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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. Cc: Michael S. Tsirkin Cc: Marcel Apfelbaum Signed-off-by: Markus Armbruster Reviewed-by: Paolo Bonzini Message-Id: <20200610053247.1583243-17-armbru@redhat.com> Reviewed-by: Michael S. Tsirkin --- hw/sparc64/sun4u.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index 6f29a013ca..0b898d6e3d 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -635,24 +635,28 @@ static void sun4uv_init(MemoryRegion *address_space_m= em, memset(&macaddr, 0, sizeof(MACAddr)); onboard_nic =3D false; for (i =3D 0; i < nb_nics; i++) { + PCIBus *bus; nd =3D &nd_table[i]; =20 if (!nd->model || strcmp(nd->model, "sunhme") =3D=3D 0) { if (!onboard_nic) { - pci_dev =3D pci_create_multifunction(pci_busA, PCI_DEVFN(1= , 1), + pci_dev =3D pci_new_multifunction(PCI_DEVFN(1, 1), true, "sunhme"); + bus =3D pci_busA; memcpy(&macaddr, &nd->macaddr.a, sizeof(MACAddr)); onboard_nic =3D true; } else { - pci_dev =3D pci_create(pci_busB, -1, "sunhme"); + pci_dev =3D pci_new(-1, "sunhme"); + bus =3D pci_busB; } } else { - pci_dev =3D pci_create(pci_busB, -1, nd->model); + pci_dev =3D pci_new(-1, nd->model); + bus =3D pci_busB; } =20 dev =3D &pci_dev->qdev; qdev_set_nic_properties(dev, nd); - qdev_init_nofail(dev); + pci_realize_and_unref(pci_dev, bus, &error_fatal); } =20 /* If we don't have an onboard NIC, grab a default MAC address so that --=20 2.26.2