From nobody Sun Nov 16 07:20:40 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=1599088011; cv=none; d=zohomail.com; s=zohoarc; b=JmPrY6j0S6sVcZKv97OH14NUGrh+9i0fyuhWswg6U+f/MRu4DhvZvwOvyQhnlLVo4YTr/23dKduWKbTSHKbXN+6BYbk9+RzWtwO2leRmw3lq8wEa2odzbJbrTMyCRhu4gKLf0iM7ZcG3rM/zkgf3JuzK8j8a+RcZRnIen0ZR9Hg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599088011; 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=MBobJ7wbc5BT+RjpuF/DJunoPaAC6xsL1WWsMG5REsU=; b=OFw7wOIY4SN/QiyRFdwOa5cCu78yBBQUwtT2xkCS2sJSfy005fbkfRa+sNwPYpG6FeIMf4qsI0JuanS7OnsjetFMsysh5sk9COugeN2KG4xOj38BywkftOE9S21HX6vWPuITa4LHik0il2NuXVcOUqfcq49Cyu4tF+UdsGOVLyQ= 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 1599088011384693.7471188423654; Wed, 2 Sep 2020 16:06:51 -0700 (PDT) Received: from localhost ([::1]:37750 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDbq6-0005OP-Hd for importer@patchew.org; Wed, 02 Sep 2020 19:06:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35732) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDbVR-0005Cp-7F for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:45:29 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:35212 helo=us-smtp-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 1kDbVO-0000D7-EM for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:45:28 -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-235-hYVMiU-OMR2feh4p5s5J2w-1; Wed, 02 Sep 2020 18:45:22 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9A0A11DE00; Wed, 2 Sep 2020 22:45:20 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5C83619C59; Wed, 2 Sep 2020 22:45:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599086725; 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=MBobJ7wbc5BT+RjpuF/DJunoPaAC6xsL1WWsMG5REsU=; b=Axz4Zp88bnUg05B98ce2dqHNbp/JixLLJbJwKWUMr+PXjowxosu1MUmezM97osM8y5wSoS 2lDnU3t0n79xiI1E+AK75oFAbzioPtl4rEFThmyvLneVcvf9qqnwTiJ2Q8dQTyjHdxMMYW WJ1I5QUKgff4cOrSJqwnl//6GeKlQ+g= X-MC-Unique: hYVMiU-OMR2feh4p5s5J2w-1 From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 48/63] sabre: Rename SABRE_DEVICE to SABRE Date: Wed, 2 Sep 2020 18:42:56 -0400 Message-Id: <20200902224311.1321159-49-ehabkost@redhat.com> In-Reply-To: <20200902224311.1321159-1-ehabkost@redhat.com> References: <20200902224311.1321159-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 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=207.211.31.120; envelope-from=ehabkost@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 16:25:58 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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: Mark Cave-Ayland , berrange@redhat.com, Artyom Tarasenko 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" Make the type checking macro name consistent with the TYPE_* constant. Signed-off-by: Eduardo Habkost Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- Cc: Mark Cave-Ayland Cc: Artyom Tarasenko Cc: qemu-devel@nongnu.org --- include/hw/pci-host/sabre.h | 2 +- hw/pci-host/sabre.c | 8 ++++---- hw/sparc64/sun4u.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/hw/pci-host/sabre.h b/include/hw/pci-host/sabre.h index 597bf70d69..7a76de4b9e 100644 --- a/include/hw/pci-host/sabre.h +++ b/include/hw/pci-host/sabre.h @@ -51,7 +51,7 @@ struct SabreState { typedef struct SabreState SabreState; =20 #define TYPE_SABRE "sabre" -DECLARE_INSTANCE_CHECKER(SabreState, SABRE_DEVICE, +DECLARE_INSTANCE_CHECKER(SabreState, SABRE, TYPE_SABRE) =20 #endif diff --git a/hw/pci-host/sabre.c b/hw/pci-host/sabre.c index 0cc68585f8..5ac6283623 100644 --- a/hw/pci-host/sabre.c +++ b/hw/pci-host/sabre.c @@ -338,7 +338,7 @@ static void pci_sabre_set_irq(void *opaque, int irq_num= , int level) =20 static void sabre_reset(DeviceState *d) { - SabreState *s =3D SABRE_DEVICE(d); + SabreState *s =3D SABRE(d); PCIDevice *pci_dev; unsigned int i; uint16_t cmd; @@ -376,7 +376,7 @@ static const MemoryRegionOps pci_config_ops =3D { =20 static void sabre_realize(DeviceState *dev, Error **errp) { - SabreState *s =3D SABRE_DEVICE(dev); + SabreState *s =3D SABRE(dev); PCIHostState *phb =3D PCI_HOST_BRIDGE(dev); SysBusDevice *sbd =3D SYS_BUS_DEVICE(s); PCIDevice *pci_dev; @@ -421,7 +421,7 @@ static void sabre_realize(DeviceState *dev, Error **err= p) =20 static void sabre_init(Object *obj) { - SabreState *s =3D SABRE_DEVICE(obj); + SabreState *s =3D SABRE(obj); SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); unsigned int i; =20 @@ -502,7 +502,7 @@ static const TypeInfo sabre_pci_info =3D { =20 static char *sabre_ofw_unit_address(const SysBusDevice *dev) { - SabreState *s =3D SABRE_DEVICE(dev); + SabreState *s =3D SABRE(dev); =20 return g_strdup_printf("%x,%x", (uint32_t)((s->special_base >> 32) & 0xffffffff), diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index fe0d84bf6c..b746c3bf38 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -585,7 +585,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem, prom_init(hwdef->prom_addr, bios_name); =20 /* Init sabre (PCI host bridge) */ - sabre =3D SABRE_DEVICE(qdev_new(TYPE_SABRE)); + sabre =3D SABRE(qdev_new(TYPE_SABRE)); qdev_prop_set_uint64(DEVICE(sabre), "special-base", PBM_SPECIAL_BASE); qdev_prop_set_uint64(DEVICE(sabre), "mem-base", PBM_MEM_BASE); object_property_set_link(OBJECT(sabre), "iommu", OBJECT(iommu), --=20 2.26.2